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
..
class	Fix: Codesniffer	2013-04-10 12:20:45 +02:00
stats	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2013-04-04 21:15:16 +02:00
tpl	Fix: [ bug #698 ] Bad calculation of totals of associated documents	2013-01-25 11:37:30 +01:00
apercu.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
contact.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
customer.php	english standardization	2013-02-22 16:21:30 +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	Fix: wrong amounts	2013-04-12 16:09:52 +02:00
index.php	Fix: Bad div closing	2013-03-30 19:40:52 +01:00
info.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
liste.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-03-16 17:07:35 +01:00
note.php	Qual: Reduce number of methods. Mutualize update_note code.	2013-04-10 10:58:38 +02:00
orderstoinvoice.php	Removed duplicated code and fixed a problem with orders2invoice	2013-04-07 21:58:24 +02:00