Laurent Destailleur 51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/compta/facture/stats/index.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/includes/tcpdf/tcpdf.php htdocs/langs/el_GR/other.lang htdocs/langs/en_US/cashdesk.lang htdocs/langs/en_US/main.lang htdocs/langs/es_ES/products.lang htdocs/main.inc.php test/phpunit/NumberingModulesTest.php		2013-06-09 16:49:47 +02:00
..
doc_generic_order_odt.modules.php	New: Add object_hour as substitution tag for opendocument generation.	2013-06-08 18:12:32 +02:00
pdf_einstein.modules.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-09 16:49:47 +02:00