Qual: Mise en transaction creation ligne commande

This commit is contained in:
Laurent Destailleur 2005-08-14 02:46:33 +00:00
parent a691947a84
commit 1db9003b84

View File

@ -361,58 +361,64 @@ class Commande
} }
} }
} }
/** /**
* Ajoute une ligne de commande * Ajoute une ligne de commande
* *
*/ */
function addline( $desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0) function addline($desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0)
{ {
$qty = ereg_replace(",",".",$qty); // Nettoyage parametres
$pu = ereg_replace(",",".",$pu); $qty = ereg_replace(",",".",$qty);
$pu = ereg_replace(",",".",$pu);
$desc=trim($desc);
if (strlen(trim($qty))==0)
{
$qty=1;
}
if ($this->brouillon && strlen(trim($desc))) // Verifs
{ if (! $this->brouillon) return -1;
if (strlen(trim($qty))==0)
{
$qty=1;
}
if ($fk_product > 0) $this->db->begin();
{
$prod = new Product($this->db, $fk_product);
if ($prod->fetch($fk_product) > 0)
{
$desc = $prod->libelle;
$pu = $prod->price;
$txtva = $prod->tva_tx;
}
}
if ($fk_product > 0)
{
$prod = new Product($this->db, $fk_product);
if ($prod->fetch($fk_product) > 0)
{
$desc = $desc?$desc:$prod->libelle;
$pu = $prod->price;
$txtva = $prod->tva_tx;
}
}
$remise = 0; $remise = 0;
$price = round(ereg_replace(",",".",$pu), 2); $price = round(ereg_replace(",",".",$pu), 2);
$subprice = $price; $subprice = $price;
if (trim(strlen($remise_percent)) > 0) if (trim(strlen($remise_percent)) > 0)
{ {
$remise = round(($pu * $remise_percent / 100), 2); $remise = round(($pu * $remise_percent / 100), 2);
$price = $pu - $remise; $price = $pu - $remise;
} }
$sql = "INSERT INTO ".MAIN_DB_PREFIX."commandedet (fk_commande,label,description,fk_product, price,qty,tva_tx, remise_percent, subprice, remise)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."commandedet (fk_commande,label,description,fk_product, price,qty,tva_tx, remise_percent, subprice, remise)";
$sql .= " VALUES ($this->id, '" . addslashes($desc) . "','" . addslashes($desc) . "',$fk_product,".ereg_replace(",",".",$price).", '$qty', $txtva, $remise_percent,'".ereg_replace(",",".",$subprice)."','".ereg_replace(",",".", $remise)."') ;"; $sql .= " VALUES ($this->id, '" . addslashes($desc) . "','" . addslashes($desc) . "',$fk_product,".ereg_replace(",",".",$price).", '$qty', $txtva, $remise_percent,'".ereg_replace(",",".",$subprice)."','".ereg_replace(",",".", $remise)."') ;";
if ( $this->db->query( $sql) ) if ( $this->db->query( $sql) )
{ {
$this->update_price(); $this->update_price();
return 1; $this->db->commit();
} return 1;
else }
{ else
dolibarr_print_error($this->db); {
return -1; $this->error=$this->db->error();
} $this->db->rollback();
} return -1;
}
} }
/** /**
* Ajoute un produit dans la commande * Ajoute un produit dans la commande
* *
@ -638,7 +644,7 @@ class Commande
} }
else else
{ {
dolibarr_print_error($this->db); dolibarr_syslog("Commande::set_remise Erreur SQL");
} }
} }
} }
@ -867,8 +873,7 @@ class Commande
} }
else else
{ {
dolibarr_print_error($this->db); $this->error=$this->db->error();
$this->error=$this->db->error();
return -1; return -1;
} }
} }
@ -938,7 +943,9 @@ class Commande
class CommandeLigne class CommandeLigne
{ {
var $pu; function CommandeLigne()
{
}
} }
?> ?>