Laurent Destailleur 3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog build/debian/get-orig-source.sh build/debian/watch htdocs/fourn/ajax/getSupplierPrices.php		2013-09-19 01:02:53 +02:00
..
admin	Missing succes message in margin module config page	2013-05-19 12:19:31 +02:00
lib	Fix: Supplier price displayed on document lines and margin infos didnt take discount	2013-09-15 14:52:41 +02:00
tabs	standardize code	2013-06-20 09:18:12 +02:00
agentMargins.php	fix margin reports bugs (wrong group by + jquery syntax error)	2013-08-23 10:57:29 +02:00
customerMargins.php	fix margin reports bugs (wrong group by + jquery syntax error)	2013-08-23 10:57:29 +02:00
index.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
productMargins.php	fix margin reports bugs (wrong group by + jquery syntax error)	2013-08-23 10:57:29 +02:00