Fix: Translation of payment term/cond

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

@@ -108,8 +108,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
             '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->mode_reglement:''),
-            'object_payment_term'=>$object->cond_reglement,
+            'object_payment_mode_code'=>$object->mode_reglement_code,
+           	'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+           	'object_payment_term_code'=>$object->cond_reglement_code,
+           	'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
         	'object_total_ht'=>price($object->total_ht,0,$outputlangs),
             'object_total_vat'=>price($object->total_tva,0,$outputlangs),
             'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

@@ -115,8 +115,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures
         	'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_payment_mode'=>($object->mode_reglement!='-'?$object->mode_reglement:''),
-            'object_payment_term'=>$object->cond_reglement,
+            'object_payment_mode_code'=>$object->mode_reglement_code,
+        	'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+        	'object_payment_term_code'=>$object->cond_reglement_code,
+        	'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
         	'object_total_ht'=>price($object->total_ht,0,$outputlangs),
             'object_total_vat'=>price($object->total_tva,0,$outputlangs),
             'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),

htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

@@ -107,8 +107,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
         	'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_payment_mode'=>($object->mode_reglement!='-'?$object->mode_reglement:''),
-            'object_payment_term'=>$object->cond_reglement,
+            'object_payment_mode_code'=>$object->mode_reglement_code,
+        	'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+        	'object_payment_term_code'=>$object->cond_reglement_code,
+        	'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
         	'object_total_ht'=>price($object->total_ht,0,$outputlangs),
             'object_total_vat'=>price($object->total_tva,0,$outputlangs),
             'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),