Laurent Destailleur 469dd03673 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/filefunc.inc.php htdocs/langs/nl_NL/margins.lang		2013-11-01 17:58:38 +01:00
..
admin	Missing succes message in margin module config page	2013-05-19 12:19:31 +02:00
lib	fix bad rounding on margin calculation and display	2013-10-30 18:17:37 +01:00
tabs	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-01 17:58:38 +01:00
agentMargins.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-01 17:58:38 +01:00
customerMargins.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-01 17:58:38 +01: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	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-01 17:58:38 +01:00