dolibarr/htdocs/margin
Laurent Destailleur b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
2015-10-16 10:12:36 +02: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 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00