Merge branch 'upstream/develop'

htdocs/cashdesk/facturation.php

htdocs/cashdesk/tpl/facturation1.tpl.php

htdocs/cashdesk/tpl/validation1.tpl.php

htdocs/cashdesk/validation.php

htdocs/compta/bank/ligne.php

htdocs/compta/salaries/class/paymentsalary.class.php

htdocs/compta/salaries/fiche.php

htdocs/core/modules/modProduct.class.php

htdocs/core/modules/modService.class.php

htdocs/imports/import.php

htdocs/langs/en_US/products.lang