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
..
doc_generic_proposal_odt.modules.php	Move substitution function for propal to common class & add extrafields display	2013-03-05 08:38:41 +01:00
pdf_azur.modules.php	Fix: Several problem with localtax into PDF generation	2013-03-07 12:04:12 +01:00