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
..
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-07-19 12:04:30 +02:00
account.php	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +01:00
annuel.php	Migrated old error notifications to the """new""" system	2014-07-20 01:09:43 +02:00
bankid_fr.php	Fixed: Bugs reported by scrutinizer	2014-11-22 16:57:08 +01:00
bilan.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
budget.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
card.php	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +01:00
categ.php	Moved dol_syslog query log to the database handler and decreased report level to DEBUG	2014-06-09 15:49:54 +02:00
graph.php	Migrated old error notifications to the """new""" system	2014-07-20 01:09:43 +02:00
index.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-04-12 12:03:59 +02:00
info.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
ligne.php	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +01:00
rappro.php	Merge remote-tracking branch 'Upstream/develop' into develop	2014-09-20 06:42:31 +02:00
releve.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
search.php	Fix missing /form	2014-12-02 19:55:10 +01:00
treso.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-11-18 19:01:01 +01:00
virement.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-06-14 17:11:36 +02:00