From 9ce7e44f006bbe5e1c3c119b3f29dd6df66ef42c Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Wed, 24 Apr 2013 16:47:15 +0200
Subject: [PATCH] use price method rather than price2num. price are use in all
PDF, so it should be the same on ODT
---
htdocs/core/class/commondocgenerator.class.php | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 0f4264b223f..c56516257f7 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -245,10 +245,10 @@ abstract class CommonDocGenerator
$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
$array_key.'_payment_term_code'=>$object->cond_reglement_code,
$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
- $array_key.'_total_ht'=>price2num($object->total_ht2,2),
- $array_key.'_total_vat'=>price2num($object->total_tva,2),
- $array_key.'_total_ttc'=>price2num($object->total_ttc,2),
- $array_key.'_total_discount_ht' => price2num($object->getTotalDiscount(),2),
+ $array_key.'_total_ht'=>price($object->total_ht2),
+ $array_key.'_total_vat'=>price($object->total_tva),
+ $array_key.'_total_ttc'=>price($object->total_ttc),
+ $array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
$array_key.'_vatrate'=>vatrate($object->tva),
$array_key.'_note_private'=>$object->note,
$array_key.'_note'=>$object->note_public,
@@ -293,12 +293,12 @@ abstract class CommonDocGenerator
'line_product_label'=>$line->product_label,
'line_desc'=>$line->desc,
'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
- 'line_up'=>price2num($line->subprice, 2),
+ 'line_up'=>price($line->subprice),
'line_qty'=>$line->qty,
'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
- 'line_price_ht'=>price2num($line->total_ht,2),
- 'line_price_ttc'=>price2num($line->total_ttc,2),
- 'line_price_vat'=>price2num($line->total_tva,2),
+ 'line_price_ht'=>price($line->total_ht),
+ 'line_price_ttc'=>price($line->total_ttc),
+ 'line_price_vat'=>price($line->total_tva),
'line_date_start'=>$line->date_start,
'line_date_end'=>$line->date_end
);
--
GitLab