commit
3ba2ae1af5
5 changed files with 96 additions and 7 deletions
|
|
@ -437,3 +437,4 @@ AllowStockMovementVariantParent=Also records stock movements on parent products
|
|||
AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
|
||||
ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
|
||||
WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
|
||||
PriceLabel=Price label
|
||||
|
|
|
|||
|
|
@ -436,3 +436,4 @@ WarningConvertFromBatchToSerial=Si vous disposez actuellement d'une quantité su
|
|||
AllowStockMovementVariantParent=Enregistre également les mouvements de stock sur les produits parent des produits variants
|
||||
AllowStockMovementVariantParentHelp=Par défaut, un parent d'une variante est un produit virtuel, donc aucun stock n'est géré pour celui-ci. En activant cette option, un stock sera géré pour les produits parents et à chaque fois qu'une quantité de stock est modifiée pour une variante de produit, la même quantité sera modifiée pour le produit parent. Vous ne devriez pas avoir besoin de cette option, sauf si vous utilisez une variante pour gérer le même produit que le parent (mais avec des descriptions, des prix différents...)
|
||||
ConfirmSetToDraftInventory=Êtes-vous sûr de vouloir revenir à l'état de brouillon ?<br>Les quantités actuellement définies dans l'inventaire seront réinitialisées.
|
||||
PriceLabel=Libellé du prix
|
||||
|
|
|
|||
|
|
@ -184,6 +184,7 @@ class Product extends CommonObject
|
|||
* @var string
|
||||
*/
|
||||
public $price_base_type;
|
||||
public $price_label;
|
||||
|
||||
//! Arrays for multiprices
|
||||
public $multiprices = array();
|
||||
|
|
@ -684,6 +685,7 @@ class Product extends CommonObject
|
|||
$this->price = (float) price2num($this->price);
|
||||
$this->price_min_ttc = (float) price2num($this->price_min_ttc);
|
||||
$this->price_min = (float) price2num($this->price_min);
|
||||
$this->price_label = trim($this->price_label);
|
||||
if (empty($this->tva_tx)) {
|
||||
$this->tva_tx = 0;
|
||||
}
|
||||
|
|
@ -826,6 +828,7 @@ class Product extends CommonObject
|
|||
$sql .= ", price";
|
||||
$sql .= ", price_ttc";
|
||||
$sql .= ", price_base_type";
|
||||
$sql .= ", price_label";
|
||||
$sql .= ", tobuy";
|
||||
$sql .= ", tosell";
|
||||
if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
|
||||
|
|
@ -853,6 +856,7 @@ class Product extends CommonObject
|
|||
$sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
|
||||
$sql .= ", ".((int) $user->id);
|
||||
$sql .= ", ".((int) $this->type);
|
||||
$sql .= ", ".(!empty($this->price_label) ? "'".$this->db->escape($this->price_label)."'" : "null");
|
||||
$sql .= ", ".price2num($price_ht, 'MT');
|
||||
$sql .= ", ".price2num($price_ttc, 'MT');
|
||||
$sql .= ", '".$this->db->escape($this->price_base_type)."'";
|
||||
|
|
@ -1965,9 +1969,9 @@ class Product extends CommonObject
|
|||
}
|
||||
|
||||
// Add new price
|
||||
$sql = "INSERT INTO ".$this->db->prefix()."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
|
||||
$sql = "INSERT INTO ".$this->db->prefix()."product_price(price_level,date_price, fk_product, fk_user_author, price_label, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
|
||||
$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
|
||||
$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
|
||||
$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".(empty($this->price_label)?"null":"'".$this->db->escape($this->price_label)."'").", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
|
||||
$sql .= " ".price2num($this->localtax1_tx).", ".price2num($this->localtax2_tx).", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".price2num($this->price_min).", ".price2num($this->price_min_ttc).", ".price2num($this->price_by_qty).", ".((int) $conf->entity).",".($this->fk_price_expression > 0 ? ((int) $this->fk_price_expression) : 'null');
|
||||
$sql .= ")";
|
||||
|
||||
|
|
@ -2312,10 +2316,11 @@ class Product extends CommonObject
|
|||
* @param int $ignore_autogen Used to avoid infinite loops
|
||||
* @param array $localtaxes_array Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
|
||||
* @param string $newdefaultvatcode Default vat code
|
||||
* @param string $price_label Price Label
|
||||
* @param int $notrigger Disable triggers
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $notrigger = 0)
|
||||
public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $price_label = '', $notrigger = 0)
|
||||
{
|
||||
global $conf, $langs;
|
||||
|
||||
|
|
@ -2439,6 +2444,7 @@ class Product extends CommonObject
|
|||
$sql .= " localtax1_type = ".($localtaxtype1 != '' ? "'".$this->db->escape($localtaxtype1)."'" : "'0'").",";
|
||||
$sql .= " localtax2_type = ".($localtaxtype2 != '' ? "'".$this->db->escape($localtaxtype2)."'" : "'0'").",";
|
||||
$sql .= " default_vat_code = ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
|
||||
$sql .= " price_label = ".(!empty($price_label) ? "'".$this->db->escape($price_label)."'" : "null").",";
|
||||
$sql .= " tva_tx = ".(float) price2num($newvat).",";
|
||||
$sql .= " recuperableonly = '".$this->db->escape($newnpr)."'";
|
||||
$sql .= " WHERE rowid = ".((int) $id);
|
||||
|
|
@ -2456,6 +2462,7 @@ class Product extends CommonObject
|
|||
$this->multiprices_recuperableonly[$level] = $newnpr;
|
||||
|
||||
$this->price = $price;
|
||||
$this->price_label = $price_label;
|
||||
$this->price_ttc = $price_ttc;
|
||||
$this->price_min = $price_min;
|
||||
$this->price_min_ttc = $price_min_ttc;
|
||||
|
|
@ -2463,6 +2470,7 @@ class Product extends CommonObject
|
|||
$this->default_vat_code = $newdefaultvatcode;
|
||||
$this->tva_tx = $newvat;
|
||||
$this->tva_npr = $newnpr;
|
||||
|
||||
//Local taxes
|
||||
$this->localtax1_tx = $localtax1;
|
||||
$this->localtax2_tx = $localtax2;
|
||||
|
|
@ -2580,6 +2588,7 @@ class Product extends CommonObject
|
|||
}
|
||||
$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.sell_or_eat_by_mandatory, p.batch_mask, p.fk_unit,";
|
||||
$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf,";
|
||||
$sql .= " p.price_label,";
|
||||
if ($separatedStock) {
|
||||
$sql .= " SUM(sp.reel) as stock";
|
||||
} else {
|
||||
|
|
@ -2623,6 +2632,7 @@ class Product extends CommonObject
|
|||
}
|
||||
$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.sell_or_eat_by_mandatory, p.batch_mask, p.fk_unit,";
|
||||
$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
|
||||
$sql .= " ,p.price_label";
|
||||
if (!$separatedStock) {
|
||||
$sql .= ", p.stock";
|
||||
}
|
||||
|
|
@ -2646,6 +2656,7 @@ class Product extends CommonObject
|
|||
$this->note = $obj->note_private; // deprecated
|
||||
|
||||
$this->type = $obj->fk_product_type;
|
||||
$this->price_label = $obj->price_label;
|
||||
$this->status = $obj->tosell;
|
||||
$this->status_buy = $obj->tobuy;
|
||||
$this->status_batch = $obj->tobatch;
|
||||
|
|
@ -2742,6 +2753,7 @@ class Product extends CommonObject
|
|||
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, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
|
||||
$sql .= " ,price_label";
|
||||
$sql .= " FROM ".$this->db->prefix()."product_price";
|
||||
$sql .= " WHERE entity IN (".getEntity('productprice').")";
|
||||
$sql .= " AND price_level=".((int) $i);
|
||||
|
|
@ -4817,6 +4829,7 @@ class Product extends CommonObject
|
|||
$sql .= ", price_min";
|
||||
$sql .= ", price_min_ttc";
|
||||
$sql .= ", price_base_type";
|
||||
$sql .= ", price_label";
|
||||
$sql .= ", default_vat_code";
|
||||
$sql .= ", tva_tx";
|
||||
$sql .= ", recuperableonly";
|
||||
|
|
@ -4844,6 +4857,7 @@ class Product extends CommonObject
|
|||
$sql .= ", price_min";
|
||||
$sql .= ", price_min_ttc";
|
||||
$sql .= ", price_base_type";
|
||||
$sql .= ", price_label";
|
||||
$sql .= ", default_vat_code";
|
||||
$sql .= ", tva_tx";
|
||||
$sql .= ", recuperableonly";
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
'price_ttc' => array('type' => 'decimal(20,6)', 'label' => 'TTC', 'enabled' => 1, 'visible' => 1, 'position' => 8, 'notnull' => -1, 'comment' => 'Price TTC'),
|
||||
'price_min' => array('type' => 'decimal(20,6)', 'label' => 'MinPriceHT', 'enabled' => 1, 'visible' => 1, 'position' => 9, 'notnull' => -1, 'comment' => 'Minimum Price'),
|
||||
'price_min_ttc' => array('type' => 'decimal(20,6)', 'label' => 'MinPriceTTC', 'enabled' => 1, 'visible' => 1, 'position' => 10, 'notnull' => -1, 'comment' => 'Minimum Price TTC'),
|
||||
'price_label' => array('type' => 'varchar(255)', 'label' => 'PriceLabel', 'enabled' => 1, 'visible' => 1, 'position' => 20, 'notnull' => -1, 'comment' => 'Price Label'),
|
||||
'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => 1, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
|
||||
);
|
||||
|
||||
|
|
@ -91,6 +92,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
public $localtax1_tx;
|
||||
public $localtax2_type;
|
||||
public $localtax2_tx;
|
||||
public $price_label;
|
||||
|
||||
/**
|
||||
* @var int User ID
|
||||
|
|
@ -170,6 +172,9 @@ class ProductCustomerPrice extends CommonObject
|
|||
if (isset($this->fk_user)) {
|
||||
$this->fk_user = (int) $this->fk_user;
|
||||
}
|
||||
if (isset($this->price_label)) {
|
||||
$this->price_label = trim($this->price_label);
|
||||
}
|
||||
if (isset($this->import_key)) {
|
||||
$this->import_key = trim($this->import_key);
|
||||
}
|
||||
|
|
@ -228,6 +233,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= "localtax2_type,";
|
||||
$sql .= "localtax2_tx,";
|
||||
$sql .= "fk_user,";
|
||||
$sql .= "price_label,";
|
||||
$sql .= "import_key";
|
||||
$sql .= ") VALUES (";
|
||||
$sql .= " ".((int) $conf->entity).",";
|
||||
|
|
@ -248,6 +254,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= " ".(empty($this->localtax2_type) ? "'0'" : "'".$this->db->escape($this->localtax2_type)."'").",";
|
||||
$sql .= " ".(!isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx)).",";
|
||||
$sql .= " ".((int) $user->id).",";
|
||||
$sql .= " ".(!isset($this->price_label) ? 'NULL' : "'".$this->db->escape($this->price_label)."'").",";
|
||||
$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'");
|
||||
$sql .= ")";
|
||||
|
||||
|
|
@ -321,6 +328,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= " t.localtax1_tx,";
|
||||
$sql .= " t.localtax2_tx,";
|
||||
$sql .= " t.fk_user,";
|
||||
$sql .= " t.price_label,";
|
||||
$sql .= " t.import_key";
|
||||
$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
|
||||
$sql .= " WHERE t.rowid = ".((int) $id);
|
||||
|
|
@ -350,6 +358,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$this->localtax1_tx = $obj->localtax1_tx;
|
||||
$this->localtax2_tx = $obj->localtax2_tx;
|
||||
$this->fk_user = $obj->fk_user;
|
||||
$this->price_label = $obj->price_label;
|
||||
$this->import_key = $obj->import_key;
|
||||
|
||||
$this->db->free($resql);
|
||||
|
|
@ -407,6 +416,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= " t.localtax1_type,";
|
||||
$sql .= " t.localtax2_type,";
|
||||
$sql .= " t.fk_user,";
|
||||
$sql .= " t.price_label,";
|
||||
$sql .= " t.import_key,";
|
||||
$sql .= " soc.nom as socname,";
|
||||
$sql .= " prod.ref as prodref";
|
||||
|
|
@ -483,6 +493,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$line->localtax1_type = $obj->localtax1_type;
|
||||
$line->localtax2_type = $obj->localtax2_type;
|
||||
$line->fk_user = $obj->fk_user;
|
||||
$line->price_label = $obj->price_label;
|
||||
$line->import_key = $obj->import_key;
|
||||
$line->socname = $obj->socname;
|
||||
$line->prodref = $obj->prodref;
|
||||
|
|
@ -535,6 +546,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= " t.localtax1_tx,";
|
||||
$sql .= " t.localtax2_tx,";
|
||||
$sql .= " t.fk_user,";
|
||||
$sql .= " t.price_label,";
|
||||
$sql .= " t.import_key,";
|
||||
$sql .= " soc.nom as socname,";
|
||||
$sql .= " prod.ref as prodref";
|
||||
|
|
@ -590,6 +602,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$line->localtax1_tx = $obj->localtax1_tx;
|
||||
$line->localtax2_tx = $obj->localtax2_tx;
|
||||
$line->fk_user = $obj->fk_user;
|
||||
$line->price_label = $obj->price_label;
|
||||
$line->import_key = $obj->import_key;
|
||||
$line->socname = $obj->socname;
|
||||
$line->prodref = $obj->prodref;
|
||||
|
|
@ -662,6 +675,9 @@ class ProductCustomerPrice extends CommonObject
|
|||
if (isset($this->fk_user)) {
|
||||
$this->fk_user = (int) $this->fk_user;
|
||||
}
|
||||
if (isset($this->price_label)) {
|
||||
$this->price_label = trim($this->price_label);
|
||||
}
|
||||
if (isset($this->import_key)) {
|
||||
$this->import_key = trim($this->import_key);
|
||||
}
|
||||
|
|
@ -722,6 +738,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= "localtax1_type,";
|
||||
$sql .= "localtax2_type,";
|
||||
$sql .= "fk_user,";
|
||||
$sql .= "price_label,";
|
||||
$sql .= "import_key";
|
||||
|
||||
$sql .= ") ";
|
||||
|
|
@ -745,6 +762,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= " t.localtax1_type,";
|
||||
$sql .= " t.localtax2_type,";
|
||||
$sql .= " t.fk_user,";
|
||||
$sql .= " t.price_label,";
|
||||
$sql .= " t.import_key";
|
||||
|
||||
$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
|
||||
|
|
@ -780,6 +798,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$sql .= " localtax1_type=".(!empty($this->localtax1_type) ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'").",";
|
||||
$sql .= " localtax2_type=".(!empty($this->localtax2_type) ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'").",";
|
||||
$sql .= " fk_user=".$user->id.",";
|
||||
$sql .= " price_label=".(isset($this->price_label) ? "'".$this->db->escape($this->price_label)."'" : "null").",";
|
||||
$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
|
||||
|
||||
$sql .= " WHERE rowid=".((int) $this->id);
|
||||
|
|
@ -876,6 +895,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$prodsocpriceupd->price_base_type = $this->price_base_type;
|
||||
$prodsocpriceupd->tva_tx = $this->tva_tx;
|
||||
$prodsocpriceupd->recuperableonly = $this->recuperableonly;
|
||||
$prodsocpriceupd->price_label = $this->price_label;
|
||||
|
||||
$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
|
||||
if ($resultupd < 0) {
|
||||
|
|
@ -894,6 +914,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$prodsocpricenew->price_base_type = $this->price_base_type;
|
||||
$prodsocpricenew->tva_tx = $this->tva_tx;
|
||||
$prodsocpricenew->recuperableonly = $this->recuperableonly;
|
||||
$prodsocpricenew->price_label = $this->price_label;
|
||||
|
||||
$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
|
||||
if ($resultupd < 0) {
|
||||
|
|
@ -1039,6 +1060,7 @@ class ProductCustomerPrice extends CommonObject
|
|||
$this->localtax1_tx = '';
|
||||
$this->localtax2_tx = '';
|
||||
$this->fk_user = 0;
|
||||
$this->price_label = '';
|
||||
$this->import_key = '';
|
||||
|
||||
return 1;
|
||||
|
|
@ -1093,6 +1115,7 @@ class PriceByCustomerLine
|
|||
* @var int User ID
|
||||
*/
|
||||
public $fk_user;
|
||||
public $price_label;
|
||||
|
||||
public $import_key;
|
||||
public $socname;
|
||||
|
|
|
|||
|
|
@ -123,6 +123,8 @@ if (empty($reshook)) {
|
|||
if (($action == 'update_vat') && !$cancel && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
|
||||
$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5 (XXX)' or '8.5* (XXX)'
|
||||
|
||||
$price_label = GETPOST('price_label', 'alpha');
|
||||
|
||||
// We must define tva_tx, npr and local taxes
|
||||
$tva_tx = $tva_tx_txt;
|
||||
$reg = array();
|
||||
|
|
@ -190,6 +192,7 @@ if (empty($reshook)) {
|
|||
$object->localtax2_tx = $localtax2;
|
||||
$object->localtax1_type = $localtax1_type;
|
||||
$object->localtax2_type = $localtax2_type;
|
||||
$object->price_label = $price_label;
|
||||
|
||||
$db->begin();
|
||||
|
||||
|
|
@ -216,7 +219,7 @@ if (empty($reshook)) {
|
|||
//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
|
||||
$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
|
||||
$level = $i;
|
||||
$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
|
||||
$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
|
||||
|
||||
if ($ret < 0) {
|
||||
$error++;
|
||||
|
|
@ -238,7 +241,7 @@ if (empty($reshook)) {
|
|||
//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
|
||||
$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them when required.
|
||||
$level = 0;
|
||||
$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
|
||||
$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
|
||||
|
||||
if ($ret < 0) {
|
||||
$error++;
|
||||
|
|
@ -382,6 +385,7 @@ if (empty($reshook)) {
|
|||
$newprice_min = price2num(GETPOST('price_min', 'alpha'), '', 2);
|
||||
$newpricebase = GETPOST('price_base_type', 'alpha');
|
||||
$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5 (XXX)' or '8.5* (XXX)'
|
||||
$price_label = GETPOST('price_label', 'alpha');
|
||||
|
||||
$tva_tx = $tva_tx_txt;
|
||||
$vatratecode = '';
|
||||
|
|
@ -447,6 +451,7 @@ if (empty($reshook)) {
|
|||
|
||||
$pricestoupdate[0] = array(
|
||||
'price' => $newprice,
|
||||
'price_label' => $price_label,
|
||||
'price_min' => $newprice_min,
|
||||
'price_base_type' => $newpricebase,
|
||||
'default_vat_code' => $vatratecode,
|
||||
|
|
@ -478,7 +483,7 @@ if (empty($reshook)) {
|
|||
|
||||
// If price has changed, we update it
|
||||
if (!array_key_exists($key, $object->multiprices) || $object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'] || $object->multiprices_tva_tx[$key] != $newvattx) {
|
||||
$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
|
||||
$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code'], $val['price_label']);
|
||||
} else {
|
||||
$res = 0;
|
||||
}
|
||||
|
|
@ -638,6 +643,7 @@ if (empty($reshook)) {
|
|||
$prodcustprice->price = price2num(GETPOST("price"), 'MU');
|
||||
$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
|
||||
$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
|
||||
$prodcustprice->price_label = GETPOST("price_label", 'alpha');
|
||||
|
||||
$tva_tx_txt = GETPOST("tva_tx", 'alpha');
|
||||
|
||||
|
|
@ -761,6 +767,7 @@ if (empty($reshook)) {
|
|||
$prodcustprice->price = price2num(GETPOST("price"), 'MU');
|
||||
$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
|
||||
$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
|
||||
$prodcustprice->price_label = GETPOST("price_label", 'alpha');
|
||||
|
||||
$tva_tx_txt = GETPOST("tva_tx");
|
||||
|
||||
|
|
@ -1234,7 +1241,11 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
|
|||
print '<i class="opacitymedium"> - ' . price($object->price_min_ttc).' '.$langs->trans('TTC') . '</i>';
|
||||
}
|
||||
}
|
||||
print '</td></tr>';
|
||||
|
||||
// Price Label
|
||||
print '<tr class="field_price_label"><td>'.$langs->trans("PriceLabel").'</td><td>';
|
||||
print $object->price_label;
|
||||
print '</td></tr>';
|
||||
|
||||
// Price by quantity
|
||||
|
|
@ -1521,6 +1532,14 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
|
|||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
// Price Label
|
||||
print '<tr><td>';
|
||||
print $langs->trans('PriceLabel');
|
||||
print '</td><td>';
|
||||
print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$object->price_label.'">';
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
$parameters = array();
|
||||
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||
|
||||
|
|
@ -1661,6 +1680,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
|
|||
$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
|
||||
$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
|
||||
$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
|
||||
$sql .= " ,p.price_label";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
|
||||
$sql .= " ".MAIN_DB_PREFIX."user as u";
|
||||
$sql .= " WHERE fk_product = ".((int) $object->id);
|
||||
|
|
@ -1740,6 +1760,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
|
|||
}
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
|
||||
print '<td class="right">'.$langs->trans("Label").'</td>';
|
||||
print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
|
||||
if ($user->hasRight('produit', 'supprimer')) {
|
||||
print '<td class="right"> </td>';
|
||||
|
|
@ -1869,6 +1890,11 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
|
|||
}
|
||||
print '</td>';
|
||||
|
||||
// Price Label
|
||||
print '<td class="right">';
|
||||
print $objp->price_label;
|
||||
print '</td>';
|
||||
|
||||
// User
|
||||
print '<td class="right">';
|
||||
if ($objp->user_id > 0) {
|
||||
|
|
@ -1878,6 +1904,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
|
|||
}
|
||||
print '</td>';
|
||||
|
||||
|
||||
// Action
|
||||
if ($user->hasRight('produit', 'supprimer')) {
|
||||
$candelete = 0;
|
||||
|
|
@ -2014,6 +2041,14 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
}
|
||||
print '</td></tr>';
|
||||
|
||||
// Price Label
|
||||
print '<tr><td>';
|
||||
print $langs->trans('PriceLabel');
|
||||
print '</td><td>';
|
||||
print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$object->price_label.'">';
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '</table>';
|
||||
|
||||
print '</div>';
|
||||
|
|
@ -2101,6 +2136,16 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
}
|
||||
print '</tr>';
|
||||
|
||||
|
||||
|
||||
// Price Label
|
||||
print '<tr><td>';
|
||||
print $langs->trans('PriceLabel');
|
||||
print '</td><td>';
|
||||
print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$prodcustprice->price_label.'">';
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '</table>';
|
||||
|
||||
|
||||
|
|
@ -2164,6 +2209,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
}
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
|
||||
print '<td class="right">'.$langs->trans("PriceLabel").'</td>';
|
||||
print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
|
||||
print '<td> </td>';
|
||||
print '</tr>';
|
||||
|
|
@ -2228,6 +2274,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
|
||||
print '<td class="right">'.price($line->price_min).'</td>';
|
||||
print '<td class="right">'.price($line->price_min_ttc).'</td>';
|
||||
print '<td class="right">'.$line->price_label.'</td>';
|
||||
|
||||
// User
|
||||
$userstatic = new User($db);
|
||||
|
|
@ -2272,7 +2319,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
print '<table class="liste centpercent">'."\n";
|
||||
|
||||
if (count($prodcustprice->lines) > 0 || $search_soc) {
|
||||
$colspan = 9;
|
||||
$colspan = 10;
|
||||
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
|
||||
$colspan++;
|
||||
}
|
||||
|
|
@ -2301,6 +2348,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
}
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
|
||||
print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
|
||||
print '<td class="right">'.$langs->trans("PriceLabel").'</td>';
|
||||
print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
|
||||
print '<td></td>';
|
||||
print '</tr>';
|
||||
|
|
@ -2360,6 +2408,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
|
||||
print '<td class="right">'.price($object->price_min).'</td>';
|
||||
print '<td class="right">'.price($object->price_min_ttc).'</td>';
|
||||
print '<td class="right">'.$object->price_label.'</td>';
|
||||
print '<td class="right">';
|
||||
print '</td>';
|
||||
if ($user->hasRight('produit', 'supprimer') || $user->hasRight('service', 'supprimer')) {
|
||||
|
|
@ -2438,6 +2487,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
|
|||
|
||||
print '<td class="right">'.price($line->price_min).'</td>';
|
||||
print '<td class="right">'.price($line->price_min_ttc).'</td>';
|
||||
print '<td class="right">'.$line->price_label.'</td>';
|
||||
|
||||
// User
|
||||
$userstatic = new User($db);
|
||||
|
|
|
|||
Loading…
Reference in a new issue