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

Fix: Do not touch stock for service lines

Browse Source
This commit is contained in:
Laurent Destailleur 2008-06-17 18:03:36 +00:00
parent 67f11311cc
commit 7afa1f7067
3 changed files with 1068 additions and 1059 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2097
htdocs/facture.class.php
View File

File diff suppressed because it is too large Load Diff

24
htdocs/product.class.php
View File

@ -149,7 +149,7 @@ class Product extends CommonObject
} }
/** /**
\brief Ins<EFBFBD>re le produit en base \brief Insert product in database
\param user Utilisateur qui effectue l'insertion \param user Utilisateur qui effectue l'insertion
\return int id du produit ou numero d'erreur < 0 \return int id du produit ou numero d'erreur < 0
*/ */
@ -236,7 +236,7 @@ class Product extends CommonObject
} }
else else
{ {
$this->_setErrNo("Create",260); $this->_setErrNo("Create",260,$this->error);
} }
} }
else else
@ -277,7 +277,7 @@ class Product extends CommonObject
else else
{ {
$this->db->rollback(); $this->db->rollback();
dolibarr_syslog("Product::Create ROLLBACK ERRNO (".$this->errno.")"); $this->_setErrNo("Create",265);
return -1; return -1;
} }
} }
@ -292,14 +292,15 @@ class Product extends CommonObject
} }
/** /**
\brief Positionne le numero d'erreur \brief Positionne le numero d'erreur
\param func Nom de la fonction \param func Nom de la fonction
\param num Numero de l'erreur \param num Numero de l'erreur
\param error string
*/ */
function _setErrNo($func, $num) function _setErrNo($func, $num, $error='')
{ {
$this->errno = $num; $this->errno = $num;
dolibarr_syslog("Product::".$func." - ".get_class($this) ." ERRNO (".$this->errno.")"); dolibarr_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR);
} }
/** /**
@ -344,9 +345,9 @@ class Product extends CommonObject
$sql .= ",tva_tx = " . $this->tva_tx; $sql .= ",tva_tx = " . $this->tva_tx;
$sql .= ",envente = " . $this->status; $sql .= ",envente = " . $this->status;
$sql .= ",weight = " . ($this->weight!='' ? "'".$this->weight."'" : 'null'); $sql .= ",weight = " . ($this->weight!='' ? "'".$this->weight."'" : 'null');
$sql .= ",weight_units = '" . $this->weight_units."'"; $sql .= ",weight_units = " . ($this->weight_units!='' ? "'".$this->weight_units."'": 'null');
$sql .= ",volume = " . ($this->volume!='' ? "'".$this->volume."'" : 'null'); $sql .= ",volume = " . ($this->volume!='' ? "'".$this->volume."'" : 'null');
$sql .= ",volume_units = '" . $this->volume_units."'"; $sql .= ",volume_units = " . ($this->volume_units!='' ? "'".$this->volume_units."'" : 'null');
$sql .= ",seuil_stock_alerte = '" . $this->seuil_stock_alerte."'"; $sql .= ",seuil_stock_alerte = '" . $this->seuil_stock_alerte."'";
$sql .= ",description = '" . addslashes($this->description) ."'"; $sql .= ",description = '" . addslashes($this->description) ."'";
$sql .= ",stock_loc = '" . addslashes($this->stock_loc) ."'"; $sql .= ",stock_loc = '" . addslashes($this->stock_loc) ."'";
@ -355,7 +356,8 @@ class Product extends CommonObject
$sql .= " WHERE rowid = " . $id; $sql .= " WHERE rowid = " . $id;
dolibarr_syslog("Product::update sql=".$sql); dolibarr_syslog("Product::update sql=".$sql);
if ( $this->db->query($sql) ) $resql=$this->db->query($sql);
if ($resql)
{ {
// Multilangs // Multilangs
if($conf->global->MAIN_MULTILANGS) if($conf->global->MAIN_MULTILANGS)

6
htdocs/product/fiche.php
View File

@ -111,15 +111,15 @@ if ($_POST["action"] == 'add' && $user->rights->produit->creer)
// $_POST n'est pas utilise dans la classe Product // $_POST n'est pas utilise dans la classe Product
// mais dans des classes qui hérite de Product // mais dans des classes qui hérite de Product
$id = $product->create($user, $_POST); $id = $product->create($user, $_POST);
if ($id > 0) if ($id > 0)
{ {
Header("Location: fiche.php?id=$id"); Header("Location: fiche.php?id=".$id);
exit; exit;
} }
else else
{ {
$mesg='<div class="error">'.$langs->trans($product->error()).'</div>'; $mesg='<div class="error">'.$langs->trans($product->error).'</div>';
$_GET["action"] = "create"; $_GET["action"] = "create";
$_GET["canvas"] = $product->canvas; $_GET["canvas"] = $product->canvas;
$_GET["type"] = $_POST["type"]; $_GET["type"] = $_POST["type"];