Choose product for line only if module products is activated.
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
Merge branch 'develop' of github.com:symeos/speedealing-php into develop
SPEED-6
Upgrading modules Propal and Facture with new lines management.
Merge branch 'develop' of github.com:symeos/speedealing-php into develop

Conflicts:
	htdocs/core/class/abstractinvoice.class.php
Merge branch 'feature-lines' into develop

Conflicts:
	htdocs/core/class/abstractinvoice.class.php
Merge pull request #14 from dmoothen/develop

Develop