Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags

Browse Source
This commit is contained in:
Marcos García de La Fuente
2014-03-06 08:55:04 +01:00
parent fa098adc78
commit 2c22c7707f
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@@ -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
);