dolibarr/htdocs/margin
Laurent Destailleur da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
..
admin Merge remote-tracking branch 'origin/3.8' into develop 2015-10-16 10:12:36 +02:00
lib Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into 2015-01-31 14:29:15 +01:00
tabs FIX #3606 2015-10-01 16:09:51 +02:00
agentMargins.php [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02: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