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

Fix: price function not correctly used

Browse Source
This commit is contained in:
Laurent Destailleur 2013-12-14 17:40:23 +01:00
parent ed40e6d9b0
commit 0e25939373
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/comm/propal.php
View File

@ -701,7 +701,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT'); $price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
$db->begin(); $db->begin();
// Ecrase $pu par celui du produit // Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit // Ecrase $desc par celui du produit
// Ecrase $txtva par celui du produit // Ecrase $txtva par celui du produit
@ -861,7 +861,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
if ($result > 0) if ($result > 0)
{ {
$db->commit(); $db->commit();
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{ {
// Define output language // Define output language
@ -903,7 +903,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
else else
{ {
$db->rollback(); $db->rollback();
setEventMessage($object->error, 'errors'); setEventMessage($object->error, 'errors');
} }
} }
@ -984,11 +984,11 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
$error++; $error++;
} }
} }
if (! $error) if (! $error)
{ {
$db->begin(); $db->begin();
$result = $object->updateline( $result = $object->updateline(
GETPOST('lineid'), GETPOST('lineid'),
$pu_ht, $pu_ht,
@ -1015,7 +1015,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
if ($result >= 0) if ($result >= 0)
{ {
$db->commit(); $db->commit();
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{ {
// Define output language // Define output language
@ -1046,7 +1046,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
else else
{ {
$db->rollback(); $db->rollback();
setEventMessage($object->error, 'errors'); setEventMessage($object->error, 'errors');
} }
} }
@ -1980,8 +1980,8 @@ else
// Amount HT // Amount HT
print '<tr><td height="10" width="25%">'.$langs->trans('AmountHT').'</td>'; print '<tr><td height="10" width="25%">'.$langs->trans('AmountHT').'</td>';
print '<td align="right" class="nowrap"><b>'.price($object->total_ht).'</b></td>'; print '<td align="right" class="nowrap"><b>'.price($object->total_ht,'',$langs,0,-1,-1,$conf->currency).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->currency).'</td>'; print '<td></td>';
// Margin Infos // Margin Infos
if (! empty($conf->margin->enabled)) { if (! empty($conf->margin->enabled)) {
@ -1993,28 +1993,28 @@ else
// Amount VAT // Amount VAT
print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td>'; print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td>';
print '<td align="right" class="nowrap">'.price($object->total_tva).'</td>'; print '<td align="right" class="nowrap">'.price($object->total_tva,'',$langs,0,-1,-1,$conf->currency).'</td>';
print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<td></td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->localtax1_assuj=="1") //Localtax1 if ($mysoc->localtax1_assuj=="1") //Localtax1
{ {
print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>'; print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
print '<td align="right" class="nowrap">'.price($object->total_localtax1).'</td>'; print '<td align="right" class="nowrap">'.price($object->total_localtax1,'',$langs,0,-1,-1,$conf->currency).'</td>';
print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<td></td></tr>';
} }
if ($mysoc->localtax2_assuj=="1") //Localtax2 if ($mysoc->localtax2_assuj=="1") //Localtax2
{ {
print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>'; print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
print '<td align="right" class="nowrap">'.price($object->total_localtax2).'</td>'; print '<td align="right" class="nowrap">'.price($object->total_localtax2,'',$langs,0,-1,-1,$conf->currency).'</td>';
print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<td></td></tr>';
} }
// Amount TTC // Amount TTC
print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>'; print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
print '<td align="right" class="nowrap">'.price($object->total_ttc).'</td>'; print '<td align="right" class="nowrap">'.price($object->total_ttc,'',$langs,0,-1,-1,$conf->currency).'</td>';
print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<td></td></tr>';
// Statut // Statut
print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="2">'.$object->getLibStatut(4).'</td></tr>'; print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="2">'.$object->getLibStatut(4).'</td></tr>';

2
htdocs/societe/soc.php
View File

@ -1737,7 +1737,7 @@ else
// Capital // Capital
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">';
if ($object->capital) print $object->capital.' '.$langs->trans("Currency".$conf->currency); if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
else print '&nbsp;'; else print '&nbsp;';
print '</td></tr>'; print '</td></tr>';