Laurent Destailleur 7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into ... atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql		2015-03-04 23:03:29 +01:00
..
action	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-04 01:14:27 +01:00
admin	NEW: Add module "Supplier commercial proposals" to requests	2015-03-04 17:54:43 +01:00
askpricesupplier	NEW: Add module "Supplier commercial proposals" to requests	2015-03-04 17:54:43 +01:00
mailing	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-26 13:36:07 +01:00
propal	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into	2015-03-04 23:03:29 +01:00
prospect	FIX; Unknown field 'sc.fk_soc' in field list	2015-02-20 17:33:58 +01:00
address.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
card.php	Merge branch 'develop' of https://github.com/mrsof/dolibarr into	2015-02-24 17:00:52 +01:00
contact.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
index.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-19 00:01:26 +01:00
list.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-26 04:57:55 +01:00
multiprix.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
propal.php	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into	2015-03-04 23:03:29 +01:00
recap-client.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
remise.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
remx.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-19 00:01:26 +01:00