Laurent Destailleur 8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/commande/list.php htdocs/core/class/notify.class.php htdocs/core/login/functions_dolibarr.php htdocs/exports/export.php htdocs/langs/en_US/admin.lang		2015-04-01 16:33:39 +02:00
..
action	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-01 16:33:39 +02:00
admin	NEW: Add module "Supplier commercial proposals" to requests	2015-03-04 17:54:43 +01:00
askpricesupplier	NEW: Enhancement of module 'Notification by Email'. Show nb of	2015-03-18 21:44:57 +01:00
mailing	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-26 13:36:07 +01:00
propal	Revert "Revert "Refactor 1""	2015-03-23 01:39:12 +01:00
prospect	Finished prototype to use hook to add a column by a module.	2015-03-18 14:08:37 +01:00
address.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
card.php	Add last shipments to company card	2015-03-25 16:38:18 +01:00
contact.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
index.php	NEW: Add search box for supplier order search.	2015-03-10 13:25:25 +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	NEW: Enhancement of module 'Notification by Email'. Show nb of	2015-03-18 21:44:57 +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