Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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.

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

11
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

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

5
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

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