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

Uniformize usage of function price

Browse Source
This commit is contained in:
Laurent Destailleur 2014-04-11 18:00:58 +02:00
parent 55599f9455
commit 417a1232ef
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/dons/index.php
View File

@ -181,8 +181,8 @@ if ($resql)
print '<td class="nobordernopadding">'; print '<td class="nobordernopadding">';
print $obj->societe; print $obj->societe;
print ($obj->societe && $obj->nom?' / ':''); print ($obj->societe && ($obj->lastname || $obj->firstname)?' / ':'');
print dolGetFirstLastname($obj->nom,$obj->firstname); print dolGetFirstLastname($obj->lastname,$obj->firstname);
print '</td>'; print '</td>';
print '<td align="right" class="nobordernopadding">'; print '<td align="right" class="nobordernopadding">';

8
htdocs/compta/tva/quadri_detail.php
View File

@ -425,14 +425,14 @@ else
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
$temp_ht=$fields['totalht']; $temp_ht=$fields['totalht'];
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice; if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht,'MT')); print price(price2num($temp_ht,'MT'),1);
print '</td>'; print '</td>';
// VAT // VAT
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
$temp_vat=$fields['vat']; $temp_vat=$fields['vat'];
if ($type == 1) $temp_vat=$fields['vat']*$ratiopaymentinvoice; if ($type == 1) $temp_vat=$fields['vat']*$ratiopaymentinvoice;
print price(price2num($temp_vat,'MT')); print price(price2num($temp_vat,'MT'),1);
//print price($fields['vat']); //print price($fields['vat']);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -576,14 +576,14 @@ else
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
$temp_ht=$fields['totalht']; $temp_ht=$fields['totalht'];
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice; if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht,'MT')); print price(price2num($temp_ht,'MT'),1);
print '</td>'; print '</td>';
// VAT // VAT
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
$temp_vat=$fields['vat']; $temp_vat=$fields['vat'];
if ($type == 1) $temp_vat=$fields['vat']*$ratiopaymentinvoice; if ($type == 1) $temp_vat=$fields['vat']*$ratiopaymentinvoice;
print price(price2num($temp_vat,'MT')); print price(price2num($temp_vat,'MT'),1);
//print price($fields['vat']); //print price($fields['vat']);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';

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

@ -1625,13 +1625,13 @@ class Form
if ($objp->custprice_base_type == 'HT') if ($objp->custprice_base_type == 'HT')
{ {
$opt.= price($objp->custprice,1).' '.$currencytext.' '.$langs->trans("HT"); $opt.= price($objp->custprice,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("HT");
$outval.= price($objp->custprice,1).' '.$currencytextnoent.' '.$langs->transnoentities("HT"); $outval.= price($objp->custprice,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("HT");
} }
else else
{ {
$opt.= price($objp->custprice_ttc,1).' '.$currencytext.' '.$langs->trans("TTC"); $opt.= price($objp->custprice_ttc,1,$langs,0,0,-1,$conf->currency).' '.$langs->trans("TTC");
$outval.= price($objp->custprice_ttc,1).' '.$currencytextnoent.' '.$langs->transnoentities("TTC"); $outval.= price($objp->custprice_ttc,0,$langs,0,0,-1,$conf->currency).' '.$langs->transnoentities("TTC");
} }
$outprice_ht=price($objp->custprice); $outprice_ht=price($objp->custprice);

4
htdocs/product/stock/fiche.php
View File

@ -443,11 +443,11 @@ else
{ {
$pricemin=$objp->price; $pricemin=$objp->price;
print '<td align="right">'; print '<td align="right">';
print price(price2num($pricemin,'MU')); print price(price2num($pricemin,'MU'),1);
print '</td>'; print '</td>';
// Total sell min // Total sell min
print '<td align="right">'; print '<td align="right">';
print price(price2num($pricemin*$objp->value,'MT')); print price(price2num($pricemin*$objp->value,'MT'),1);
print '</td>'; print '</td>';
} }
$totalvaluesell+=price2num($pricemin*$objp->value,'MT'); $totalvaluesell+=price2num($pricemin*$objp->value,'MT');

10
htdocs/product/stock/product.php
View File

@ -627,11 +627,11 @@ if ($resql)
print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
// Sell price // Sell price
print '<td align="right">'; print '<td align="right">';
if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU')); if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1);
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; // Ditto : Show PMP from movement or from product print '</td>'; // Ditto : Show PMP from movement or from product
print '<td align="right">'; print '<td align="right">';
if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT')).'</td>'; // Ditto : Show PMP from movement or from product if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'</td>'; // Ditto : Show PMP from movement or from product
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</tr>'; ; print '</tr>'; ;
$total += $obj->reel; $total += $obj->reel;
@ -661,14 +661,14 @@ print '<td class="liste_total" align="right">';
print ($totalwithpmp?price($totalvalue/$totalwithpmp):'&nbsp;'); print ($totalwithpmp?price($totalvalue/$totalwithpmp):'&nbsp;');
print '</td>'; print '</td>';
print '<td class="liste_total" align="right">'; print '<td class="liste_total" align="right">';
print price(price2num($totalvalue,'MT')); print price(price2num($totalvalue,'MT'),1);
print '</td>'; print '</td>';
print '<td class="liste_total" align="right">'; print '<td class="liste_total" align="right">';
if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total):'&nbsp;'); if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; print '</td>';
print '<td class="liste_total" align="right">'; print '<td class="liste_total" align="right">';
if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT')); if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'),1);
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; print '</td>';
print "</tr>"; print "</tr>";

4
htdocs/product/stock/valo.php
View File

@ -108,12 +108,12 @@ if ($result)
print '<td>'.$objp->lieu.'</td>'; print '<td>'.$objp->lieu.'</td>';
// PMP value // PMP value
print '<td align="right">'; print '<td align="right">';
if (price2num($objp->estimatedvalue,'MT')) print price(price2num($objp->estimatedvalue,'MT')); if (price2num($objp->estimatedvalue,'MT')) print price(price2num($objp->estimatedvalue,'MT'),1);
else print ''; else print '';
print '</td>'; print '</td>';
// Selling value // Selling value
print '<td align="right">'; print '<td align="right">';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue,'MT')); if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue,'MT'),1);
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; print '</td>';
// Status // Status