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

Fix: limit request if price level

Browse Source
This commit is contained in:
Regis Houssin 2009-06-18 20:07:36 +00:00
parent 21fe5a9bc1
commit f2d02e401e
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/fiche.php
View File

@ -1040,7 +1040,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'; print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">';
print '</textarea></td></tr>'; print '</textarea></td></tr>';
// Note priv<EFBFBD>e // Note privee
if (! $user->societe_id) if (! $user->societe_id)
{ {
print '<tr>'; print '<tr>';

15
htdocs/html.form.class.php
View File

@ -871,7 +871,7 @@ class Form
$opt.= dol_trunc($objp->label,32).' - '; $opt.= dol_trunc($objp->label,32).' - ';
// Multiprice // Multiprice
if ($price_level > 0) if ($price_level > 1)
{ {
$sql= "SELECT price, price_ttc, price_base_type "; $sql= "SELECT price, price_ttc, price_base_type ";
$sql.= "FROM ".MAIN_DB_PREFIX."product_price "; $sql.= "FROM ".MAIN_DB_PREFIX."product_price ";
@ -888,17 +888,9 @@ class Form
if ($objp2) if ($objp2)
{ {
if ($objp2->price_base_type == 'HT') if ($objp2->price_base_type == 'HT')
$opt.= price($objp2->price,1).' '.$conf->monnaie.' '.$langs->trans("HT"); $opt.= price($objp2->price,1).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT");
else else
$opt.= price($objp2->price_ttc,1).' '.$conf->monnaie.' '.$langs->trans("TTC"); $opt.= price($objp2->price_ttc,1).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("TTC");
}
//si il n'y a pas de prix multiple on prend le prix de base du produit/service
else
{
if ($objp->price_base_type == 'HT')
$opt.= price($objp->price,1).' '.$conf->monnaie.' '.$langs->trans("HT");
else
$opt.= price($objp->price_ttc,1).' '.$conf->monnaie.' '.$langs->trans("TTC");
} }
} }
else else
@ -906,6 +898,7 @@ class Form
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
//si il n'y a pas de prix multiple on prend le prix de base du produit/service
else else
{ {
if ($objp->price_base_type == 'HT') if ($objp->price_base_type == 'HT')