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

Fix: le taux de tva n'tait pas rcupr dans la liste de prix multiple

Browse Source 
Add: suppression des prix multiples dans la base product_price lors d'une suppression d'un produit non utilis.
This commit is contained in:
Regis Houssin 2007-01-05 12:54:23 +00:00
parent 464619fbbb
commit 0f2f0d8466
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/product.class.php
View File

@ -425,19 +425,24 @@ class Product
if ($user->rights->produit->supprimer) if ($user->rights->produit->supprimer)
{ {
$prod_use = $this->verif_prod_use($id); $prod_use = $this->verif_prod_use($id);
if ($prod_use == 0) if ($prod_use == 0)
{ {
$sqld = "DELETE from ".MAIN_DB_PREFIX."product "; $sqld = "DELETE from ".MAIN_DB_PREFIX."product ";
$sqld.= " WHERE rowid = ".$id; $sqld.= " WHERE rowid = ".$id;
$result = $this->db->query($sqld); $result = $this->db->query($sqld);
return 0;
} $sqlc = "DELETE from ".MAIN_DB_PREFIX."product_price ";
else $sqlc.= " WHERE fk_product = ".$id;
{ $result = $this->db->query($sqlc);
$this->error .= "Impossible de supprimer le produit.\n";
return -1; return 0;
} }
else
{
$this->error .= "Impossible de supprimer le produit.\n";
return -1;
}
} }
} }
@ -583,8 +588,8 @@ class Product
$this->db->query($sql_multiprix); $this->db->query($sql_multiprix);
// On ajoute nouveau tarif // On ajoute nouveau tarif
$sql_multiprix = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price_level,price,price_ttc,price_base_type) "; $sql_multiprix = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price_level,price,price_ttc,price_base_type,tva_tx) ";
$sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($this->multiprices["$i"]).",'".$price_ttc."','".$this->multiprices_base_type["$i"]."'"; $sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($this->multiprices["$i"]).",'".$price_ttc."','".$this->multiprices_base_type["$i"]."',".$this->tva_tx;
$sql_multiprix .= ")"; $sql_multiprix .= ")";
if (! $this->db->query($sql_multiprix) ) if (! $this->db->query($sql_multiprix) )
{ {