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

Fix: bug #21998 : bug affichage Montant HT

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-20 00:23:19 +00:00
parent 5c10a7e4c2
commit 9a79fb2d54
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/comm/propal.php
View File

@ -1225,13 +1225,13 @@ if ($_GET['propalid'] > 0)
} }
// VAT Rate // VAT Rate
print '<td align="right">'.vatrate($objp->tva_tx,'%',$objp->info_bits).'</td>'; print '<td align="right" nowrap="nowrap">'.vatrate($objp->tva_tx,'%',$objp->info_bits).'</td>';
// U.P HT // U.P HT
print '<td align="right">'.price($objp->subprice)."</td>\n"; print '<td align="right" nowrap="nowrap">'.price($objp->subprice)."</td>\n";
// Qty // Qty
print '<td align="right">'; print '<td align="right" nowrap="nowrap">';
if ((($objp->info_bits & 2) != 2) && $objp->special_code != 3) if ((($objp->info_bits & 2) != 2) && $objp->special_code != 3)
{ {
print $objp->qty; print $objp->qty;
@ -1253,11 +1253,11 @@ if ($_GET['propalid'] > 0)
if ($objp->special_code == 3) if ($objp->special_code == 3)
{ {
// Si ligne en option // Si ligne en option
print '<td align="right">'.$langs->trans('Option').'</td>'; print '<td align="right" nowrap="nowrap">'.$langs->trans('Option').'</td>';
} }
else else
{ {
print '<td align="right">'.price($objp->total_ht)."</td>\n"; print '<td align="right" nowrap="nowrap">'.price($objp->total_ht)."</td>\n";
} }
// Icone d'edition et suppression // Icone d'edition et suppression

6
htdocs/commande/fiche.php
View File

@ -1419,8 +1419,8 @@ else
print '</td>'; print '</td>';
} }
print '<td align="right">'.vatrate($objp->tva_tx,'%',$objp->info_bits).'</td>'; print '<td align="right" nowrap="nowrap">'.vatrate($objp->tva_tx,'%',$objp->info_bits).'</td>';
print '<td align="right">'.price($objp->subprice).'</td>'; print '<td align="right" nowrap="nowrap">'.price($objp->subprice).'</td>';
print '<td align="right">'; print '<td align="right">';
if (($objp->info_bits & 2) != 2) if (($objp->info_bits & 2) != 2)
{ {
@ -1436,7 +1436,7 @@ else
{ {
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }
print '<td align="right">'.price($objp->total_ht).'</td>'; print '<td align="right nowrap="nowrap"">'.price($objp->total_ht).'</td>';
// Icone d'edition et suppression // Icone d'edition et suppression
if ($commande->statut == 0 && $user->rights->commande->creer) if ($commande->statut == 0 && $user->rights->commande->creer)

10
htdocs/fourn/commande/fiche.php
View File

@ -703,19 +703,19 @@ if ($id > 0)
print nl2br($objp->description); print nl2br($objp->description);
print '</td>'; print '</td>';
} }
print '<td align="right">'.vatrate($objp->tva_tx).'%</td>'; print '<td align="right" nowrap="nowrap">'.vatrate($objp->tva_tx).'%</td>';
print '<td align="right">'.price($objp->subprice)."</td>\n"; print '<td align="right" nowrap="nowrap">'.price($objp->subprice)."</td>\n";
print '<td align="right">'.$objp->qty.'</td>'; print '<td align="right" nowrap="nowrap">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
{ {
print '<td align="right">'.dolibarr_print_reduction($objp->remise_percent)."</td>\n"; print '<td align="right" nowrap="nowrap">'.dolibarr_print_reduction($objp->remise_percent)."</td>\n";
} }
else else
{ {
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }
//Todo: Modifier la classe pour utiliser le champ total_ttc //Todo: Modifier la classe pour utiliser le champ total_ttc
print '<td align="right">'.price($objp->subprice*$objp->qty*(100-$objp->remise_percent)/100).'</td>'; print '<td align="right" nowrap="nowrap">'.price($objp->subprice*$objp->qty*(100-$objp->remise_percent)/100).'</td>';
if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer) if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer)
{ {
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'#'.$objp->rowid.'">'; print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'#'.$objp->rowid.'">';