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

Task # 559 : add discount by qty as done in supplier prices

Browse Source
This commit is contained in:
Maxime Kohlhaas 2012-10-25 08:18:59 +02:00
parent 6ffa8532c5
commit 03cf96ed31
4 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -800,3 +800,6 @@ ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_le
ALTER TABLE llx_product_price_by_qty ADD INDEX idx_product_price_by_qty_fk_product_price (fk_product_price); ALTER TABLE llx_product_price_by_qty ADD INDEX idx_product_price_by_qty_fk_product_price (fk_product_price);
ALTER TABLE llx_product_price_by_qty ADD CONSTRAINT fk_product_price_by_qty_fk_product_price FOREIGN KEY (fk_product_price) REFERENCES llx_product_price (rowid); ALTER TABLE llx_product_price_by_qty ADD CONSTRAINT fk_product_price_by_qty_fk_product_price FOREIGN KEY (fk_product_price) REFERENCES llx_product_price (rowid);
ALTER TABLE `llx_product_price_by_qty` ADD `remise_percent` DOUBLE NOT NULL DEFAULT '0' AFTER `price_ttc` ,
ADD `remise` DOUBLE NOT NULL DEFAULT '0' AFTER `remise_percent`;

2
htdocs/install/mysql/tables/llx_product_price_by_qty.sql
View File

@ -26,5 +26,7 @@ create table llx_product_price_by_qty
date_price timestamp, date_price timestamp,
price double (24,8) DEFAULT 0, price double (24,8) DEFAULT 0,
price_ttc double (24,8) DEFAULT 0, price_ttc double (24,8) DEFAULT 0,
remise_percent double NOT NULL DEFAULT 0,
remise double NOT NULL DEFAULT 0,
qty_min real DEFAULT 1 qty_min real DEFAULT 1
)ENGINE=innodb; )ENGINE=innodb;

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

@ -1203,7 +1203,7 @@ class Product extends CommonObject
// Récuperation de la liste des prix selon qty si flag positionné // Récuperation de la liste des prix selon qty si flag positionné
if ($this->prices_by_qty[$i] == 1) if ($this->prices_by_qty[$i] == 1)
{ {
$sql = "SELECT rowid,price, price_ttc,qty_min"; $sql = "SELECT rowid,price, price_ttc, qty_min, remise_percent, remise";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
$sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'";
$sql.= " ORDER BY qty_min ASC"; $sql.= " ORDER BY qty_min ASC";
@ -1218,6 +1218,8 @@ class Product extends CommonObject
$resultat[$ii]["price"]= $result["price"]; $resultat[$ii]["price"]= $result["price"];
$resultat[$ii]["price_ttc"]= $result["price_ttc"]; $resultat[$ii]["price_ttc"]= $result["price_ttc"];
$resultat[$ii]["qty_min"]= $result["qty_min"]; $resultat[$ii]["qty_min"]= $result["qty_min"];
$resultat[$ii]["remise_percent"]= $result["remise_percent"];
$resultat[$ii]["remise"]= $result["remise"];
$ii++; $ii++;
} }
$this->prices_by_qty_list[$i]=$resultat; $this->prices_by_qty_list[$i]=$resultat;
@ -1254,7 +1256,7 @@ class Product extends CommonObject
// Récuperation de la liste des prix selon qty si flag positionné // Récuperation de la liste des prix selon qty si flag positionné
if ($this->prices_by_qty[0] == 1) if ($this->prices_by_qty[0] == 1)
{ {
$sql = "SELECT rowid,price, price_ttc,qty_min"; $sql = "SELECT rowid,price, price_ttc, qty_min, remise_percent, remise";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
$sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'";
$sql.= " ORDER BY qty_min ASC"; $sql.= " ORDER BY qty_min ASC";
@ -1269,6 +1271,8 @@ class Product extends CommonObject
$resultat[$ii]["price"]= $result["price"]; $resultat[$ii]["price"]= $result["price"];
$resultat[$ii]["price_ttc"]= $result["price_ttc"]; $resultat[$ii]["price_ttc"]= $result["price_ttc"];
$resultat[$ii]["qty_min"]= $result["qty_min"]; $resultat[$ii]["qty_min"]= $result["qty_min"];
$resultat[$ii]["remise_percent"]= $result["remise_percent"];
$resultat[$ii]["remise"]= $result["remise"];
$ii++; $ii++;
} }
$this->prices_by_qty_list[0]=$resultat; $this->prices_by_qty_list[0]=$resultat;

38
htdocs/product/price.php
View File

@ -126,8 +126,10 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu
$rowid = GETPOST('rowid'); $rowid = GETPOST('rowid');
$priceid=GETPOST('priceid'); $priceid=GETPOST('priceid');
$newprice=price2num(GETPOST("price"),'MU'); $newprice=price2num(GETPOST("price"),'MU');
//$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management and discount management //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management
$qtymin=GETPOST('qty_min'); $qtymin=GETPOST('qty_min');
$remise_percent=price2num(GETPOST('remise_percent'));
$remise=0; // TODO : allow dicsoun by amount when available on documents
// Calcul des prix (HT et TTC) // Calcul des prix (HT et TTC)
if ($newprice!='' || $newprice==0) if ($newprice!='' || $newprice==0)
@ -176,13 +178,15 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu
$sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET";
$sql.= " price='".$price."',"; $sql.= " price='".$price."',";
$sql.= " price_ttc=".$price_ttc.","; $sql.= " price_ttc=".$price_ttc.",";
$sql.= " qty_min=".$qtymin; $sql.= " qty_min=".$qtymin.",";
$sql.= " remise_percent=".$remise_percent.",";
$sql.= " remise=".$remise;
$sql.= " WHERE rowid = ".GETPOST('rowid'); $sql.= " WHERE rowid = ".GETPOST('rowid');
$result = $db->query($sql); $result = $db->query($sql);
} else { } else {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min) values ("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min,remise_percent,remise) values (";
$sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.')'; $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.','.$remise_percent.','.$remise.')';
$result = $db->query($sql); $result = $db->query($sql);
} }
@ -349,6 +353,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
print '<td>'.$langs->trans("PriceByQuantityRange").' '.$i.'</td>'; print '<td>'.$langs->trans("PriceByQuantityRange").' '.$i.'</td>';
print '<td align="right">'.$langs->trans("HT").'</td>'; print '<td align="right">'.$langs->trans("HT").'</td>';
print '<td align="right">'.$langs->trans("TTC").'</td>'; print '<td align="right">'.$langs->trans("TTC").'</td>';
print '<td align="right">'.$langs->trans("Discount").'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
foreach ($object->prices_by_qty_list[$i] as $ii=> $prices) { foreach ($object->prices_by_qty_list[$i] as $ii=> $prices) {
@ -359,8 +364,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
print '<input type="hidden" value="'.$prices['rowid'].'" name="rowid">'; print '<input type="hidden" value="'.$prices['rowid'].'" name="rowid">';
print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">'; print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">';
print '<td><input size="5" type="text" value="'.$prices['qty_min'].'" name="qty_min"></td>'; print '<td><input size="5" type="text" value="'.$prices['qty_min'].'" name="qty_min"></td>';
print '<td align="right"><input type="text" value="'.$prices['price'].'" name="price">&nbsp;'.$object->price_base_type.'</td>'; print '<td align="right" colspan="2"><input size="10" type="text" value="'.$prices['price'].'" name="price">&nbsp;'.$object->price_base_type.'</td>';
print '<td align="right">&nbsp;</td>'; //print '<td align="right">&nbsp;</td>';
print '<td align="right"><input size="5" type="text" value="'.$prices['remise_percent'].'" name="remise_percent"><&nbsp;%/td>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Modify").'" class="button"></td>'; print '<td align="center"><input type="submit" value="'.$langs->trans("Modify").'" class="button"></td>';
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
@ -369,6 +375,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
print '<td>'.$prices['qty_min'].'</td>'; print '<td>'.$prices['qty_min'].'</td>';
print '<td align="right">'.price($prices['price']).'</td>'; print '<td align="right">'.price($prices['price']).'</td>';
print '<td align="right">'.price($prices['price_ttc']).'</td>'; print '<td align="right">'.price($prices['price_ttc']).'</td>';
print '<td align="right">'.price($prices['remise_percent']).' %</td>';
print '<td align="center">'; print '<td align="center">';
if(($user->rights->produit->creer || $user->rights->service->creer)) { if(($user->rights->produit->creer || $user->rights->service->creer)) {
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">'; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">';
@ -382,15 +389,16 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
print '</tr>'; print '</tr>';
} }
} }
if($action != 'edit_price_by_qty') { if($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) {
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">'; print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
print '<input type="hidden" name="action" value="update_price_by_qty">'; print '<input type="hidden" name="action" value="update_price_by_qty">';
print '<input type="hidden" name="priceid" value="'.$object->prices_by_qty_id[$i].'">'; print '<input type="hidden" name="priceid" value="'.$object->prices_by_qty_id[$i].'">';
print '<input type="hidden" value="0" name="rowid">'; print '<input type="hidden" value="0" name="rowid">';
print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">'; print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">';
print '<td><input size="5" type="text" value="1" name="qty_min"></td>'; print '<td><input size="5" type="text" value="1" name="qty_min"></td>';
print '<td align="right"><input type="text" value="0" name="price">&nbsp;'.$object->price_base_type.'</td>'; print '<td align="right" colspan="2"><input size="10" type="text" value="0" name="price">&nbsp;'.$object->price_base_type.'</td>';
print '<td align="right">&nbsp;</td>'; //print '<td align="right">&nbsp;</td>';
print '<td align="right"><input size="5" type="text" value="0" name="remise_percent">&nbsp;%</td>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" class="button"></td>'; print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" class="button"></td>';
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
@ -449,6 +457,7 @@ else
print '<td>'.$langs->trans("PriceByQuantityRange").'</td>'; print '<td>'.$langs->trans("PriceByQuantityRange").'</td>';
print '<td align="right">'.$langs->trans("HT").'</td>'; print '<td align="right">'.$langs->trans("HT").'</td>';
print '<td align="right">'.$langs->trans("TTC").'</td>'; print '<td align="right">'.$langs->trans("TTC").'</td>';
print '<td align="right">'.$langs->trans("Discount").'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
foreach ($object->prices_by_qty_list[0] as $ii=> $prices) { foreach ($object->prices_by_qty_list[0] as $ii=> $prices) {
@ -459,8 +468,9 @@ else
print '<input type="hidden" value="'.$prices['rowid'].'" name="rowid">'; print '<input type="hidden" value="'.$prices['rowid'].'" name="rowid">';
print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">'; print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">';
print '<td><input size="5" type="text" value="'.$prices['qty_min'].'" name="qty_min"></td>'; print '<td><input size="5" type="text" value="'.$prices['qty_min'].'" name="qty_min"></td>';
print '<td align="right"><input type="text" value="'.$prices['price'].'" name="price">&nbsp;'.$object->price_base_type.'</td>'; print '<td align="right" colspan="2"><input size="10" type="text" value="'.$prices['price'].'" name="price">&nbsp;'.$object->price_base_type.'</td>';
print '<td align="right">&nbsp;</td>'; //print '<td align="right">&nbsp;</td>';
print '<td align="right"><input size="5" type="text" value="'.$prices['remise_percent'].'" name="remise_percent">&nbsp;%</td>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Modify").'" class="button"></td>'; print '<td align="center"><input type="submit" value="'.$langs->trans("Modify").'" class="button"></td>';
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
@ -469,6 +479,7 @@ else
print '<td>'.$prices['qty_min'].'</td>'; print '<td>'.$prices['qty_min'].'</td>';
print '<td align="right">'.price($prices['price']).'</td>'; print '<td align="right">'.price($prices['price']).'</td>';
print '<td align="right">'.price($prices['price_ttc']).'</td>'; print '<td align="right">'.price($prices['price_ttc']).'</td>';
print '<td align="right">'.price($prices['remise_percent']).' %</td>';
print '<td align="center">'; print '<td align="center">';
if(($user->rights->produit->creer || $user->rights->service->creer)) { if(($user->rights->produit->creer || $user->rights->service->creer)) {
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">'; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">';
@ -489,8 +500,9 @@ else
print '<input type="hidden" value="0" name="rowid">'; print '<input type="hidden" value="0" name="rowid">';
print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">'; print '<tr class="'.($ii % 2 == 0 ? 'pair':'impair').'">';
print '<td><input size="5" type="text" value="1" name="qty_min"></td>'; print '<td><input size="5" type="text" value="1" name="qty_min"></td>';
print '<td align="right"><input type="text" value="0" name="price">&nbsp;'.$object->price_base_type.'</td>'; print '<td align="right" colspan="2"><input size="10" type="text" value="0" name="price">&nbsp;'.$object->price_base_type.'</td>';
print '<td align="right">&nbsp;</td>'; //print '<td align="right">&nbsp;</td>';
print '<td align="right"><input size="5" type="text" value="0" name="remise_percent">&nbsp;%</td>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" class="button"></td>'; print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" class="button"></td>';
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';