Marcos García de La Fuente 87f97ed545 Merge branch 'develop' into units ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php		2015-04-18 23:38:14 +02:00
..
action	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
admin	NEW: Add module "Supplier commercial proposals" to requests	2015-03-04 17:54:43 +01:00
askpricesupplier	fix bug #2652	2015-04-18 22:59:20 +02:00
mailing	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-26 13:36:07 +01:00
propal	Merge branch 'develop' into units	2015-04-18 23:38:14 +02:00
prospect	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
address.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
card.php	Alert when oustanding amount excedeed	2015-04-18 19:08:44 +02:00
contact.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
index.php	Update index.php	2015-04-18 17:49:48 +02:00
list.php	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
multiprix.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
propal.php	Merge branch 'develop' into units	2015-04-18 23:38:14 +02: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