Laurent Destailleur 2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/paypal/lib/paypal.lib.php		2014-12-18 10:13:25 +01:00
..
admin	Removed closing php tag	2014-05-03 18:18:44 +02:00
lib	Removed closing php tag	2014-05-03 18:18:44 +02:00
tabs	Fix: use wrong css	2014-05-11 17:56:29 +02:00
agentMargins.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-12-18 10:13:25 +01:00
customerMargins.php	Merge pull request #2157 from altatof/fix_margin_jalon	2014-12-18 10:01:11 +01:00
index.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
productMargins.php	FIX: bad margin and buy_price calculation when total_ht = 0 (discount	2014-11-19 18:19:27 +01:00