Laurent Destailleur e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: ChangeLog htdocs/admin/propal.php htdocs/compta/journal/purchasesjournal.php htdocs/compta/journal/sellsjournal.php htdocs/core/class/conf.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/core/modules/mailings/contacts2.modules.php htdocs/langs/ca_ES/admin.lang htdocs/langs/en_US/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/fr_FR/admin.lang htdocs/public/demo/index.php		2013-04-14 01:46:33 +02:00
..
tpl	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
contact.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-16 15:45:17 +01:00
document.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
fiche.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-04-14 01:46:33 +02:00
impayees.php	try to fix :supplier invoice numbering	2013-04-01 16:04:15 +02:00
index.php	Fix: another not complete change for adding ref for supplier invoices.	2013-04-12 00:22:53 +02:00
info.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
note.php	Qual: Reduce number of methods. Mutualize update_note code.	2013-04-10 10:58:38 +02:00
paiement.php	try to fix :supplier invoice numbering	2013-04-01 16:04:15 +02:00