Laurent Destailleur 8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/tpl/objectline_edit.tpl.php htdocs/fourn/class/fournisseur.product.class.php htdocs/fourn/facture/card.php htdocs/product/composition/card.php		2016-04-12 15:00:02 +02:00
..
admin	More complete description of margin rules calculation	2015-10-06 19:27:48 +02:00
lib	Merge remote-tracking branch 'origin/3.7' into 3.8	2016-04-12 15:00:02 +02:00
tabs	Fix hook implementation on some thirdparty pages	2015-12-23 14:31:42 +01:00
agentMargins.php	FIX #3997 Wrong permission key used for Margins > Read all	2015-11-16 13:16:54 +01:00
customerMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-09-03 10:44:40 +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 SQL Query	2015-10-29 13:43:07 +01:00