Files
dolibarr/htdocs/core/modules/facture
jfefe ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
..