Laurent Destailleur 8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/paiement.php		2016-04-12 15:05:18 +02:00
..
admin	NEW: Add a new method for margin calculation. Added margin on "cost	2016-01-13 12:48:59 +01:00
lib	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-12 15:05:18 +02:00
tabs	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-27 19:15:20 +01:00
agentMargins.php	Fix bad translation	2016-03-30 23:35:43 +02:00
checkMargins.php	Fix bad translation	2016-03-30 23:35:43 +02:00
customerMargins.php	Fix bad translation	2016-03-30 23:35:43 +02:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 15:21:38 +01:00
productMargins.php	FIX Some records were lost into margin per product report	2016-04-01 12:28:15 +02:00