mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
New: Provide both tags for string formated amount and numeric amount
into odt templates. New: [ task #923 ] Localtax support for ODT templates
This commit is contained in:
Laurent Destailleur
parent
949b8c6274
commit
9826b202e9
|
|
@ -54,7 +54,8 @@ For users:
|
|||
- New: Add ref supplier into muscadet model
|
||||
- New: Can use tag {mm} before {yy} even when there is a reset into numbering masks.
|
||||
- New: [ task #1060 ] Register fields localtax(1|2)_type into details tables
|
||||
|
||||
- New: [ task #923 ] Localtax support for ODT templates
|
||||
|
||||
For translators:
|
||||
- Qual: Normalized sort order of all languages files with english reference files.
|
||||
- New: Add language code files for South Africa, France new caledonia.
|
||||
|
|
|
|||
|
|
@ -247,10 +247,20 @@ 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'=>price($object->total_ht),
|
||||
$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.'_total_ht_locale'=>price($object->total_ht,0,$outputlangs),
|
||||
$array_key.'_total_vat_locale'=>price($object->total_tva,0,$outputlangs),
|
||||
$array_key.'_total_localtax1_locale'=>price($object->total_localtax1,0,$outputlangs),
|
||||
$array_key.'_total_localtax2_locale'=>price($object->total_localtax2,0,$outputlangs),
|
||||
$array_key.'_total_ttc_locale'=>price($object->total_ttc,0,$outputlangs),
|
||||
$array_key.'_total_discount_ht_locale' => price($object->getTotalDiscount(),0,$outputlangs),
|
||||
$array_key.'_total_ht'=>price2num($object->total_ht),
|
||||
$array_key.'_total_vat'=>price2num($object->total_tva),
|
||||
$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
|
||||
$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
|
||||
$array_key.'_total_ttc'=>price2num($object->total_ttc),
|
||||
$array_key.'_total_discount_ht' => price2num($object->getTotalDiscount()),
|
||||
|
||||
$array_key.'_vatrate'=>vatrate($object->tva),
|
||||
$array_key.'_note_private'=>$object->note,
|
||||
$array_key.'_note'=>$object->note_public,
|
||||
|
|
|
|||
|
|
@ -114,10 +114,20 @@ class doc_generic_order_odt extends ModelePDFCommandes
|
|||
'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),
|
||||
'object_total_discount_ht' => price($object->getTotalDiscount(), 0, $outputlangs),
|
||||
|
||||
'object_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
|
||||
'object_total_vat_locale'=>price($object->total_tva, 0, $outputlangs),
|
||||
'object_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
|
||||
'object_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
|
||||
'object_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
|
||||
'object_total_discount_ht_locale' => price($object->getTotalDiscount(), 0, $outputlangs),
|
||||
'object_total_ht'=>price2num($object->total_ht),
|
||||
'object_total_vat'=>price2num($object->total_tva),
|
||||
'object_total_localtax1'=>price2num($object->total_localtax1),
|
||||
'object_total_localtax2'=>price2num($object->total_localtax2),
|
||||
'object_total_ttc'=>price2num($object->total_ttc),
|
||||
'object_total_discount_ht' => price2num($object->getTotalDiscount()),
|
||||
|
||||
'object_vatrate'=>vatrate($object->tva),
|
||||
'object_note_private'=>$object->note,
|
||||
'object_note'=>$object->note_public,
|
||||
|
|
|
|||
|
|
@ -114,10 +114,20 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
|
|||
'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),
|
||||
'object_total_discount_ht' => price($object->getTotalDiscount(), 0, $outputlangs),
|
||||
|
||||
'object_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
|
||||
'object_total_vat_locale'=>price($object->total_tva, 0, $outputlangs),
|
||||
'object_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
|
||||
'object_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
|
||||
'object_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
|
||||
'object_total_discount_ht_locale' => price($object->getTotalDiscount(), 0, $outputlangs),
|
||||
'object_total_ht'=>price2num($object->total_ht),
|
||||
'object_total_vat'=>price2num($object->total_tva),
|
||||
'object_total_localtax1'=>price2num($object->total_localtax1),
|
||||
'object_total_localtax2'=>price2num($object->total_localtax2),
|
||||
'object_total_ttc'=>price2num($object->total_ttc),
|
||||
'object_total_discount_ht' => price2num($object->getTotalDiscount()),
|
||||
|
||||
'object_vatrate'=>vatrate($object->tva),
|
||||
'object_note_private'=>$object->note,
|
||||
'object_note'=>$object->note_public,
|
||||
|
|
|
|||
|
|
@ -124,10 +124,20 @@ class doc_generic_invoice_odt extends ModelePDFFactures
|
|||
'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_locale'=>price($object->total_ht, 0, $outputlangs),
|
||||
'object_total_vat_locale'=>price($object->total_tva, 0, $outputlangs),
|
||||
'object_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
|
||||
'object_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
|
||||
'object_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
|
||||
'object_total_discount_ht_locale' => price($object->getTotalDiscount(), 0, $outputlangs),
|
||||
'object_total_ht'=>price2num($object->total_ht),
|
||||
'object_total_vat'=>price2num($object->total_tva),
|
||||
'object_total_localtax1'=>price2num($object->total_localtax1),
|
||||
'object_total_localtax2'=>price2num($object->total_localtax2),
|
||||
'object_total_ttc'=>price2num($object->total_ttc),
|
||||
'object_total_discount_ht' => price2num($object->getTotalDiscount(), 0, $outputlangs),
|
||||
'object_total_discount_ht' => price2num($object->getTotalDiscount()),
|
||||
|
||||
'object_vatrate'=>(isset($object->tva)?vatrate($object->tva):''),
|
||||
'object_note_private'=>$object->note,
|
||||
'object_note'=>$object->note_public,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user