Laurent Destailleur b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/action/fiche.php htdocs/core/class/conf.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/company.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/facture/fiche.php htdocs/langs/en_US/admin.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/projet/tasks/task.php		2014-03-31 00:44:45 +02:00
..
admin	Missing succes message in margin module config page	2013-05-19 12:19:31 +02:00
lib	Fix: Removed duplicate translation	2014-03-20 00:21:52 +01:00
tabs	Fix: Bug into sql request because of incomplete group by	2014-03-10 23:57:19 +01:00
agentMargins.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-31 00:44:45 +02:00
customerMargins.php	Fix: fields into group by of sql requests for module margins must be	2014-03-30 16:08:30 +02:00
index.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
productMargins.php	Fix: fields into group by of sql requests for module margins must be	2014-03-30 16:08:30 +02:00