Laurent Destailleur 2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/prelevement/class/rejetprelevement.class.php htdocs/compta/sociales/class/paymentsocialcontribution.class.php htdocs/contact/exportimport.php htdocs/contact/ldap.php htdocs/contact/perso.php htdocs/contact/vcard.php htdocs/core/class/commonobject.class.php htdocs/product/reassort.php htdocs/projet/liste.php htdocs/societe/consumption.php htdocs/societe/info.php		2015-07-19 12:04:30 +02:00
..
admin	Better help	2015-01-28 20:04:18 +01:00
ajax	Better error management	2014-08-31 15:09:10 +02:00
canvas	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
checkvat	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-04-19 01:00:48 +02:00
notify	Fix: count of notification emails was wrong	2015-03-13 14:11:59 +01:00
tpl	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
agenda.php	Fixed approve during validation if user has permission	2015-01-25 00:59:46 +01:00
ajaxcompanies.php	Fix: use getpost	2014-10-21 20:02:16 +02:00
ajaxcountries.php	Renamed llx_c_pays to llx_c_country & field "libelle" to "label"	2014-08-10 13:37:39 +02:00
commerciaux.php	New: add context "globalcard" for declaring only once all cards	2014-10-06 07:20:58 +02:00
consumption.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-07-19 11:38:44 +02:00
document.php	Fixed: Translations	2014-12-07 18:24:45 +01:00
index.php	Update index.php	2014-12-02 19:53:54 +01:00
info.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
note.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
price.php	Merge	2014-09-07 12:22:04 +02:00
rib.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-04-12 12:03:59 +02:00
soc.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
societe.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-05-25 18:08:23 +02:00
societecontact.php	Fix: Solve some regressions	2014-10-18 01:32:38 +02:00