diff --git a/ChangeLog b/ChangeLog index 606a5577e80..1485ec14b1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ For users: - New: Add filter on text and status into survey list. Can also sorter on id, text and date end. - New: Add option MAIN_FAVICON_URL - Fix: Project Task numbering rule customs rule works +- New: Created {line_price_ht_locale}, {line_price_vat_locale} and {line_price_ttc_locale} ODT tags TODO - New: Predefined product and free product use same form. 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 index e3ca8814a70..549914fe8d8 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -93,7 +93,7 @@ class doc_generic_order_odt extends ModelePDFCommandes * @param Translate $outputlangs Lang object to use for output * @return array Array of substitution */ - function get_substitutionarray_object($object,$outputlangs) + function get_substitutionarray_object($object, Translate $outputlangs) { global $conf; @@ -176,6 +176,9 @@ class doc_generic_order_odt extends ModelePDFCommandes 'line_price_ht'=>price($line->total_ht, 0, $outputlangs), 'line_price_ttc'=>price($line->total_ttc, 0, $outputlangs), 'line_price_vat'=>price($line->total_tva, 0, $outputlangs), + 'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs), + 'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs), + 'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs), 'line_date_start'=>$line->date_start, 'line_date_end'=>$line->date_end ); diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index 4b1433ddd77..786ebec65e4 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -150,7 +150,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition * @param Translate $outputlangs Lang object to use for output * @return array Return a substitution array */ - function get_substitutionarray_lines($line,$outputlangs) + function get_substitutionarray_lines($line, Translate $outputlangs) { global $conf; @@ -163,9 +163,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition 'line_up'=>price($line->subprice, 0, $outputlangs), 'line_qty'=>$line->qty, 'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''), - 'line_price_ht'=>price($line->total_ht, 0, $outputlangs), - 'line_price_ttc'=>price($line->total_ttc, 0, $outputlangs), - 'line_price_vat'=>price($line->total_tva, 0, $outputlangs), + 'line_price_ht'=>price2num($line->total_ht), + 'line_price_ttc'=>price2num($line->total_ttc), + 'line_price_vat'=>price2num($line->total_tva), + 'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs), + 'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs), + 'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs), 'line_date_start'=>$line->date_start, 'line_date_end'=>$line->date_end ); diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index d1642023c24..9f31c3743b2 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -175,7 +175,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures * @param Translate $outputlangs Lang object to use for output * @return array Return substitution array */ - function get_substitutionarray_lines($line,$outputlangs) + function get_substitutionarray_lines($line, Translate $outputlangs) { global $conf; @@ -191,6 +191,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures 'line_price_ht'=>price2num($line->total_ht), 'line_price_ttc'=>price2num($line->total_ttc), 'line_price_vat'=>price2num($line->total_tva), + 'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs), + 'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs), + 'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs), 'line_date_start'=>dol_print_date($line->date_start, 'day', false, $outputlangs), 'line_date_end'=>dol_print_date($line->date_end, 'day', false, $outputlangs), );