Merge pull request #102 from simnandez/develop

[ task #176 ] Allow to use ODT templates. Works with Orders
Dolibarr · Feb 1, 2012 · ec3f5d1 · ec3f5d1
2 parents f2df94b + 53cdb31
commit ec3f5d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -102,10 +102,11 @@ function get_substitutionarray_object($object,$outputlangs)
             'object_ref_ext'=>$object->ref_ext,
         	'object_ref_customer'=>$object->ref_client,
         	'object_date'=>dol_print_date($object->date,'day'),
-        	'object_fin_validite'=>dol_print_date($object->fin_validite,'dayhour'),
+        	'object_date_delivery'=>dol_print_date($object->date_livrasion,'dayhour'),
         	'object_date_creation'=>dol_print_date($object->date_creation,'day'),
             'object_date_modification'=>dol_print_date($object->date_modification,'day'),
             'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
+        	'object_date_close'=>dol_print_date($object->date_cloture,'dayhour'),
             'object_payment_mode'=>$object->mode_reglement,
             'object_payment_term'=>$object->cond_reglement,
         	'object_total_ht'=>price($object->total_ht,0,$outputlangs),

diff --git a/htdocs/install/doctemplates/orders/template_order.odt b/htdocs/install/doctemplates/orders/template_order.odt