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

Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY

Browse Source
This commit is contained in:
Maxime Kohlhaas 2012-12-01 14:38:59 +01:00
parent e45438994c
commit 69fa1e9d10
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/class/product.class.php
View File

@ -1241,7 +1241,7 @@ class Product extends CommonObject
return -1; return -1;
} }
} }
} else if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) } else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
{ {
$sql = "SELECT price, price_ttc, price_min, price_min_ttc,"; $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
$sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid"; $sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid";

8
htdocs/product/price.php
View File

@ -322,7 +322,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
print '</td></tr>'; print '</td></tr>';
// Price by quantity // Price by quantity
if($conf->global->PRODUIT_PRICE_BY_QTY) { if($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i; print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i;
print '</td><td>'; print '</td><td>';
@ -424,7 +424,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Price by quantity // Price by quantity
if($conf->global->PRODUIT_PRICE_BY_QTY) { if($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
print '<tr><td>'.$langs->trans("PriceByQuantity"); print '<tr><td>'.$langs->trans("PriceByQuantity");
if($object->prices_by_qty[0] == 0) { if($object->prices_by_qty[0] == 0) {
print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">'.$langs->trans("Activate"); print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">'.$langs->trans("Activate");
@ -699,7 +699,7 @@ if ($result)
{ {
print '<td align="center">'.$langs->trans("MultiPriceLevelsName").'</td>'; print '<td align="center">'.$langs->trans("MultiPriceLevelsName").'</td>';
} }
if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
{ {
print '<td align="center">'.$langs->trans("Type").'</td>'; print '<td align="center">'.$langs->trans("Type").'</td>';
} }
@ -730,7 +730,7 @@ if ($result)
print '<td align="center">'.$objp->price_level."</td>"; print '<td align="center">'.$objp->price_level."</td>";
} }
// Price by quantity // Price by quantity
if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
{ {
$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard'; $type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
print '<td align="center">'.$langs->trans($type)."</td>"; print '<td align="center">'.$langs->trans($type)."</td>";