Laurent Destailleur ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php		2015-02-10 21:33:43 +01:00
..
action	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-10 21:33:43 +01:00
admin	Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now	2014-12-04 13:20:56 +01:00
mailing	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-10 21:33:43 +01:00
propal	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
prospect	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
address.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
card.php	Fixed approve during validation if user has permission	2015-01-25 00:59:46 +01:00
contact.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
index.php	Missing search table for interventions	2014-11-03 17:48:10 +01:00
list.php	Update /comm/list.php	2014-11-23 17:43:32 +01:00
multiprix.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
propal.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +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	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
remx.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00