lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add price in local format in json response

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-13 12:22:16 +02:00
parent 92c807d0df
commit 8f5c05f577
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.form.class.php
View File

@ -3146,6 +3146,8 @@ class Form
'type'=>$outtype, 'type'=>$outtype,
'price_ht'=>price2num($outprice_ht), 'price_ht'=>price2num($outprice_ht),
'price_ttc'=>price2num($outprice_ttc), 'price_ttc'=>price2num($outprice_ttc),
'price_ht_locale'=>price(price2num($outprice_ht)),
'price_ttc_locale'=>price(price2num($outprice_ttc)),
'pricebasetype'=>$outpricebasetype, 'pricebasetype'=>$outpricebasetype,
'tva_tx'=>$outtva_tx, 'tva_tx'=>$outtva_tx,
'default_vat_code'=>$outdefault_vat_code, 'default_vat_code'=>$outdefault_vat_code,
@ -3532,7 +3534,7 @@ class Form
$opt .= ' disabled'; $opt .= ' disabled';
} }
if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) { if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {
$opt .= ' data-product-id="'.$objp->rowid.'" data-price-id="'.$objp->idprodfournprice.'" data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'" data-tvatx="'.$objp->tva_tx.'"'; $opt .= ' data-product-id="'.dol_escape_htmltag($objp->rowid).'" data-price-id="'.dol_escape_htmltag($objp->idprodfournprice).'" data-qty="'.dol_escape_htmltag($objp->quantity).'" data-up="'.dol_escape_htmltag($objp->unitprice).'" data-discount="'.dol_escape_htmltag($outdiscount).'" data-tvatx="'.dol_escape_htmltag($objp->tva_tx).'"';
} }
$opt .= ' data-description="'.dol_escape_htmltag($objp->description, 0, 1).'"'; $opt .= ' data-description="'.dol_escape_htmltag($objp->description, 0, 1).'"';
$opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"'; $opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';
@ -3556,6 +3558,8 @@ class Form
'price_qty_ht'=>price2num($objp->fprice, 'MU'), // Keep higher resolution for price for the min qty 'price_qty_ht'=>price2num($objp->fprice, 'MU'), // Keep higher resolution for price for the min qty
'price_unit_ht'=>price2num($objp->unitprice, 'MU'), // This is used to fill the Unit Price 'price_unit_ht'=>price2num($objp->unitprice, 'MU'), // This is used to fill the Unit Price
'price_ht'=>price2num($objp->unitprice, 'MU'), // This is used to fill the Unit Price (for compatibility) 'price_ht'=>price2num($objp->unitprice, 'MU'), // This is used to fill the Unit Price (for compatibility)
'price_qty_ht_locale'=>price($objp->fprice),
'price_unit_ht_locale'=>price($objp->unitprice),
'tva_tx'=>$objp->tva_tx, 'tva_tx'=>$objp->tva_tx,
'default_vat_code'=>$objp->default_vat_code, 'default_vat_code'=>$objp->default_vat_code,
'discount'=>$outdiscount, 'discount'=>$outdiscount,