Laurent Destailleur 2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php		2015-11-21 12:48:41 +01:00
..
admin	Merge remote-tracking branch 'origin/3.8' into develop	2015-10-16 10:12:36 +02:00
lib	FIX #3997 Wrong permission key used for Margins > Read all	2015-11-16 13:16:54 +01:00
tabs	Minor fix	2015-11-13 00:30:10 +01:00
agentMargins.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-11-21 12:48:41 +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