Laurent Destailleur 6f474c403c Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php		2015-12-27 19:15:20 +01:00
..
admin	[Qual] Uniformize code	2015-12-12 10:59:02 +01:00
lib	FIX #3997 Wrong permission key used for Margins > Read all	2015-11-16 13:16:54 +01:00
tabs	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-27 19:15:20 +01:00
agentMargins.php	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
customerMargins.php	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 15:21:38 +01:00
productMargins.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-11-02 19:31:42 +01:00