+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+--
+-- ============================================================================
+
+create table llx_product_price_by_qty
+(
+ rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ fk_product_price integer NOT NULL,
+ date_price timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ price double(24,8) DEFAULT 0,
+ quantity double DEFAULT NULL,
+ remise_percent double NOT NULL DEFAULT 0,
+ remise double NOT NULL DEFAULT 0,
+ unitprice double(24,8) DEFAULT 0
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 5c107a7e50b34..8881ce278f9cf 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -180,4 +180,6 @@ AddThisServiceCard=Create service card
HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
CurrentProductPrice=Current price
AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
\ No newline at end of file
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Price by quantity
+PriceByQuantityRange=Quantity range
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 37c70e544d9a9..c641adee29ad7 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -180,4 +180,6 @@ AddThisServiceCard=Créer fiche service
HelpAddThisServiceCard=Cette option permet de créer ou de cloner une fiche service si elle n'existe pas.
CurrentProductPrice=Prix actuel
AlwaysUseNewPrice=Toujours utiliser le prix du jour
-AlwaysUseFixedPrice=Utiliser le prix fixé
\ No newline at end of file
+AlwaysUseFixedPrice=Utiliser le prix fixé
+PriceByQuantity=Prix par quantité
+PriceByQuantityRange=Grille de quantités
\ No newline at end of file
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index d1874d11eaa34..9e20392fc341b 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -38,9 +38,10 @@
$mode=GETPOST('mode','int');
$status=((GETPOST('status','int') >= 0) ? GETPOST('status','int') : -1);
$outjson=(GETPOST('outjson','int') ? GETPOST('outjson','int') : 0);
-$pricelevel=GETPOST('price_level','int');
+$price_level=GETPOST('price_level','int');
$action=GETPOST('action', 'alpha');
$id=GETPOST('id', 'int');
+$price_by_qty_rowid=GETPOST('pbq', 'int');
/*
* View
@@ -65,11 +66,37 @@
$outlabel=$object->label;
$outdesc=$object->description;
$outtype=$object->type;
+ $outqty=1;
+ $outdiscount=0;
$found=false;
+
+ // Price by qty
+ if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1) // If we need a particular price related to qty
+ {
+ $sql = "SELECT price, unitprice, quantity, remise_percent";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty ";
+ $sql.= " WHERE rowid=".$price_by_qty_rowid."";
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $objp = $db->fetch_object($result);
+ if ($objp)
+ {
+ $found=true;
+ $outprice_ht=price($objp->unitprice);
+ $outprice_ttc=price($objp->unitprice * (1 + ($object->tva_tx / 100)));
+ $outpricebasetype=$object->price_base_type;
+ $outtva_tx=$object->tva_tx;
+ $outqty=$objp->quantity;
+ $outdiscount=$objp->remise_percent;
+ }
+ }
+ }
// Multiprice
- if (isset($price_level) && $price_level >= 1) // If we need a particular price level (from 1 to 6)
+ if (! $found && isset($price_level) && $price_level >= 1) // If we need a particular price level (from 1 to 6)
{
$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price ";
@@ -78,10 +105,10 @@
$sql.= " ORDER BY date_price";
$sql.= " DESC LIMIT 1";
- $result = $this->db->query($sql);
+ $result = $db->query($sql);
if ($result)
{
- $objp = $this->db->fetch_object($result);
+ $objp = $db->fetch_object($result);
if ($objp)
{
$found=true;
@@ -101,7 +128,7 @@
$outtva_tx=$object->tva_tx;
}
- $outjson = array('ref'=>$outref, 'label'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx);
+ $outjson = array('ref'=>$outref, 'label'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount);
}
echo json_encode($outjson);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 698e479467827..2b6e28c55f37a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -61,6 +61,11 @@ class Product extends CommonObject
var $multiprices_ttc=array();
var $multiprices_base_type=array();
var $multiprices_tva_tx=array();
+ //! Price by quantity arrays
+ var $price_by_qty;
+ var $prices_by_qty=array();
+ var $prices_by_qty_id=array();
+ var $prices_by_qty_list=array();
//! Default VAT rate of product
var $tva_tx;
//! French VAT NPR (0 or 1)
@@ -214,6 +219,10 @@ function create($user,$notrigger=0)
if (empty($this->price)) $this->price = 0;
if (empty($this->price_min)) $this->price_min = 0;
+
+ // Price by quantity
+ if (empty($this->price_by_qty)) $this->price_by_qty = 0;
+
if (empty($this->status)) $this->status = 0;
if (empty($this->status_buy)) $this->status_buy = 0;
if (empty($this->finished)) $this->finished = 0;
@@ -806,9 +815,9 @@ function _log_price($user,$level=0)
// Add new price
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell,tva_tx,recuperableonly,";
- $sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc) ";
+ $sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc,price_by_qty) ";
$sql.= " VALUES(".($level?$level:1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx.",".$this->tva_npr.",";
- $sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc;
+ $sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty;
$sql.= ")";
dol_syslog(get_class($this)."_log_price sql=".$sql);
@@ -945,9 +954,10 @@ function get_buyprice($prodfournprice,$qty,$product_id=0,$fourn_ref=0)
* @param double $newminprice New price min
* @param int $level 0=standard, >0 = level if multilevel prices
* @param int $newnpr 0=Standard vat rate, 1=Special vat rate for French NPR VAT
+ * @param int $newpsq 1 if it has price by quantity
* @return int <0 if KO, >0 if OK
*/
- function updatePrice($id, $newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0)
+ function updatePrice($id, $newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0)
{
global $conf,$langs;
@@ -1036,6 +1046,9 @@ function updatePrice($id, $newprice, $newpricebase, $user, $newvat='',$newminpri
$this->localtax1_tx = $localtax1;
$this->localtax2_tx = $localtax2;
+ // Price by quantity
+ $this->price_by_qty = $newpsq;
+
$this->_log_price($user,$level);
// Appel des triggers
@@ -1170,7 +1183,7 @@ function fetch($id='',$ref='',$ref_ext='')
for ($i=1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
{
$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
- $sql.= " price_base_type, tva_tx, tosell";
+ $sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
$sql.= " WHERE price_level=".$i;
$sql.= " AND fk_product = '".$this->id."'";
@@ -1187,6 +1200,40 @@ function fetch($id='',$ref='',$ref_ext='')
$this->multiprices_min_ttc[$i]=$result["price_min_ttc"];
$this->multiprices_base_type[$i]=$result["price_base_type"];
$this->multiprices_tva_tx[$i]=$result["tva_tx"];
+
+ // Price by quantity
+ $this->prices_by_qty[$i]=$result["price_by_qty"];
+ $this->prices_by_qty_id[$i]=$result["rowid"];
+ // Récuperation de la liste des prix selon qty si flag positionné
+ if ($this->prices_by_qty[$i] == 1)
+ {
+ $sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+ $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'";
+ $sql.= " ORDER BY quantity ASC";
+ $resultat=array();
+ $resql = $this->db->query($sql) ;
+ if ($resql)
+ {
+ $ii=0;
+ while ($result= $this->db->fetch_array($resql)) {
+ $resultat[$ii]=array();
+ $resultat[$ii]["rowid"]=$result["rowid"];
+ $resultat[$ii]["price"]= $result["price"];
+ $resultat[$ii]["unitprice"]= $result["unitprice"];
+ $resultat[$ii]["quantity"]= $result["quantity"];
+ $resultat[$ii]["remise_percent"]= $result["remise_percent"];
+ $resultat[$ii]["remise"]= $result["remise"];
+ $ii++;
+ }
+ $this->prices_by_qty_list[$i]=$resultat;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
}
else
{
@@ -1194,6 +1241,58 @@ function fetch($id='',$ref='',$ref_ext='')
return -1;
}
}
+ } else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+ {
+ $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
+ $sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product_price";
+ $sql.= " WHERE fk_product = '".$this->id."'";
+ $sql.= " ORDER BY date_price DESC";
+ $sql.= " LIMIT 1";
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $result = $this->db->fetch_array($resql);
+
+ // Price by quantity
+ $this->prices_by_qty[0]=$result["price_by_qty"];
+ $this->prices_by_qty_id[0]=$result["rowid"];
+ // Récuperation de la liste des prix selon qty si flag positionné
+ if ($this->prices_by_qty[0] == 1)
+ {
+ $sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+ $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'";
+ $sql.= " ORDER BY quantity ASC";
+ $resultat=array();
+ $resql = $this->db->query($sql) ;
+ if ($resql)
+ {
+ $ii=0;
+ while ($result= $this->db->fetch_array($resql)) {
+ $resultat[$ii]=array();
+ $resultat[$ii]["rowid"]=$result["rowid"];
+ $resultat[$ii]["price"]= $result["price"];
+ $resultat[$ii]["unitprice"]= $result["unitprice"];
+ $resultat[$ii]["quantity"]= $result["quantity"];
+ $resultat[$ii]["remise_percent"]= $result["remise_percent"];
+ $resultat[$ii]["remise"]= $result["remise"];
+ $ii++;
+ }
+ $this->prices_by_qty_list[0]=$resultat;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+ }
+ else
+ {
+ dol_print_error($this->db);
+ return -1;
+ }
}
$res=$this->load_stock();
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index cd0ce9ba307f0..390b09127e77e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -51,7 +51,7 @@
if ($action == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer))
{
$result = $object->fetch($id);
-
+
// MultiPrix
if (! empty($conf->global->PRODUIT_MULTIPRICES))
{
@@ -70,6 +70,8 @@
$newpricebase=$_POST["multiprices_base_type_".$i];
$newnpr=(preg_match('/\*/',$_POST["tva_tx_".$i]) ? 1 : 0);
$newvat=str_replace('*','',$_POST["tva_tx_".$i]);
+ $newpsq=GETPOST('psqflag');
+ $newpsq = empty($newpsq) ? 0 : $newpsq;
break; // We found submited price
}
}
@@ -82,9 +84,11 @@
$newpricebase=$_POST["price_base_type"];
$newnpr=(preg_match('/\*/',$_POST["tva_tx"]) ? 1 : 0);
$newvat=str_replace('*','',$_POST["tva_tx"]);
+ $newpsq=GETPOST('psqflag');
+ $newpsq = empty($newpsq) ? 0 : $newpsq;
}
- if ($object->updatePrice($object->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr) > 0)
+ if ($object->updatePrice($object->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0)
{
$action = '';
$mesg = ''.$langs->trans("RecordSaved").'
';
@@ -101,6 +105,92 @@
if ($result < 0) $mesg=''.$object->error.'
';
}
+/*****************************************************
+ * Price by quantity
+ *****************************************************/
+$error=0;
+if ($action == 'activate_price_by_qty') { // Activating product price by quantity add a new price, specified as by quantity
+ $result = $object->fetch($id);
+ $level=GETPOST('level');
+
+ $object->updatePrice($object->id, 0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 1);
+}
+
+if ($action == 'edit_price_by_qty') { // Edition d'un prix par quantité
+ $rowid = GETPOST('rowid');
+}
+
+if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par quantité
+ $result = $object->fetch($id);
+
+ // Récupération des variables
+ $rowid = GETPOST('rowid');
+ $priceid=GETPOST('priceid');
+ $newprice=price2num(GETPOST("price"),'MU');
+ //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management
+ $quantity=GETPOST('quantity');
+ $remise_percent=price2num(GETPOST('remise_percent'));
+ $remise=0; // TODO : allow dicsount by amount when available on documents
+
+ if (empty($quantity))
+ {
+ $error++;
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")).'
';
+ }
+ if (empty($newprice))
+ {
+ $error++;
+ $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")).'
';
+ }
+ if(!$error) {
+ // Calcul du prix HT et du prix unitaire
+ if ($object->price_base_type == 'TTC')
+ {
+ $price = price2num($newprice) / (1 + ($object->tva_tx / 100));
+ }
+
+ $price = price2num($newprice,'MU');
+ $unitPrice = price2num($price/$quantity,'MU');
+
+ // Ajout / mise à jour
+ if($rowid > 0) {
+ $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET";
+ $sql.= " price='".$price."',";
+ $sql.= " unitprice=".$unitPrice.",";
+ $sql.= " quantity=".$quantity.",";
+ $sql.= " remise_percent=".$remise_percent.",";
+ $sql.= " remise=".$remise;
+ $sql.= " WHERE rowid = ".GETPOST('rowid');
+
+ $result = $db->query($sql);
+ } else {
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,unitprice,quantity,remise_percent,remise) values (";
+ $sql.= $priceid.','.$price.','.$unitPrice.','.$quantity.','.$remise_percent.','.$remise.')';
+
+ $result = $db->query($sql);
+ }
+ }
+}
+
+if ($action == 'delete_price_by_qty') {
+ $rowid = GETPOST('rowid');
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+ $sql.= " WHERE rowid = ".GETPOST('rowid');
+
+ $result = $db->query($sql);
+}
+
+if ($action == 'delete_all_price_by_qty') {
+ $priceid=GETPOST('priceid');
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+ $sql.= " WHERE fk_product_price = ".$priceid;
+
+ $result = $db->query($sql);
+}
+
+
/*
* View
@@ -230,6 +320,77 @@
print price($object->multiprices_min["$i"]).' '.$langs->trans($object->multiprices_base_type["$i"]);
}
print '';
+
+ // Price by quantity
+ if($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+ print '| '.$langs->trans("PriceByQuantity").' '.$i;
+ print ' | ';
+
+ if($object->prices_by_qty[$i] == 1) {
+ print '';
+
+ print '';
+ print '| '.$langs->trans("PriceByQuantityRange").' '.$i.' | ';
+ print ''.$langs->trans("HT").' | ';
+ print ''.$langs->trans("UnitPrice").' | ';
+ print ''.$langs->trans("Discount").' | ';
+ print ' | ';
+ print ' ';
+ foreach ($object->prices_by_qty_list[$i] as $ii=> $prices) {
+ if($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+ print '';
+ } else {
+ print '';
+ print '| '.$prices['quantity'].' | ';
+ print ''.price($prices['price']).' | ';
+ print ''.price($prices['unitprice']).' | ';
+ print ''.price($prices['remise_percent']).' % | ';
+ print '';
+ if(($user->rights->produit->creer || $user->rights->service->creer)) {
+ print '';
+ print img_edit().'';
+ print '';
+ print img_delete().'';
+ } else {
+ print ' ';
+ }
+ print ' | ';
+ print ' ';
+ }
+ }
+ if($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) {
+ print '';
+ }
+
+ print ' ';
+ } else {
+ print $langs->trans("No");
+ print ' ('.$langs->trans("Activate").')';
+ }
+ print ' |
';
+ }
}
}
}
@@ -261,6 +422,78 @@
print price($object->price_min).' '.$langs->trans($object->price_base_type);
}
print '';
+
+ // Price by quantity
+ if($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+ print '| '.$langs->trans("PriceByQuantity");
+ if($object->prices_by_qty[0] == 0) {
+ print ' '.$langs->trans("Activate");
+ }
+ print ' | ';
+
+ if($object->prices_by_qty[0] == 1) {
+ print '';
+ print '';
+ print '| '.$langs->trans("PriceByQuantityRange").' | ';
+ print ''.$langs->trans("HT").' | ';
+ print ''.$langs->trans("UnitPrice").' | ';
+ print ''.$langs->trans("Discount").' | ';
+ print ' | ';
+ print ' ';
+ foreach ($object->prices_by_qty_list[0] as $ii=> $prices) {
+ if($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+ print '';
+ } else {
+ print '';
+ print '| '.$prices['quantity'].' | ';
+ print ''.price($prices['price']).' | ';
+ print ''.price($prices['unitprice']).' | ';
+ print ''.price($prices['remise_percent']).' % | ';
+ print '';
+ if(($user->rights->produit->creer || $user->rights->service->creer)) {
+ print '';
+ print img_edit().'';
+ print '';
+ print img_delete().'';
+ } else {
+ print ' ';
+ }
+ print ' | ';
+ print ' ';
+ }
+ }
+ if($action != 'edit_price_by_qty') {
+ print '';
+ }
+
+ print ' ';
+ } else {
+ print $langs->trans("No");
+ }
+ print ' |
';
+ }
}
// Status (to sell)
@@ -426,7 +659,7 @@
// Liste des evolutions du prix
$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.recuperableonly,";
-$sql.= " p.price_level, p.price_min, p.price_min_ttc,";
+$sql.= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
$sql.= " p.date_price as dp, u.rowid as user_id, u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price as p,";
$sql.= " ".MAIN_DB_PREFIX."user as u";
@@ -464,7 +697,11 @@
if (! empty($conf->global->PRODUIT_MULTIPRICES))
{
- print ''.$langs->trans("MultiPriceLevelsName").' | ';
+ print ''.$langs->trans("MultiPriceLevelsName").' | ';
+ }
+ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+ {
+ print ''.$langs->trans("Type").' | ';
}
print ''.$langs->trans("PriceBase").' | ';
@@ -492,6 +729,12 @@
{
print ''.$objp->price_level." | ";
}
+ // Price by quantity
+ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+ {
+ $type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
+ print ''.$langs->trans($type)." | ";
+ }
print ''.$langs->trans($objp->price_base_type)." | ";
print ''.vatrate($objp->tva_tx,true,$objp->recuperableonly)." | ";