Merge pull request #120 from timschofield/develop

Updates from webERP
Merge pull request #121 from timschofield/develop

Develop
Clean up the code, and make it conform to guidelines
Merge pull request #122 from MarthaMadjack/develop

Clean up the code, and make it conform to guidelines
Merge pull request #123 from timschofield/develop

Phil: Set completed flag for all lines when an order is finished or canc...