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

Fix: uniformized code

Browse Source
This commit is contained in:
Regis Houssin 2009-12-09 12:52:32 +00:00
parent a1133afefb
commit 526fef3a4f
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
htdocs/product.class.php
View File

@ -1677,9 +1677,14 @@ class Product extends CommonObject
*/ */
function add_fournisseur($user, $id_fourn, $ref_fourn) function add_fournisseur($user, $id_fourn, $ref_fourn)
{ {
global $conf;
$sql = "SELECT count(*) as nb"; $sql = "SELECT count(*) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur";
$sql.= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn." AND ref_fourn = '".$ref_fourn."'"; $sql.= " WHERE fk_product = ".$this->id;
$sql.= " AND fk_soc = ".$id_fourn;
$sql.= " AND ref_fourn = '".$ref_fourn."'";
$sql.= " AND entity = ".$conf->entity;
dol_syslog("Product::add_fournisseur sql=".$sql); dol_syslog("Product::add_fournisseur sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
@ -1688,9 +1693,21 @@ class Product extends CommonObject
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($obj->nb == 0) if ($obj->nb == 0)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur "; $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur (";
$sql .= " (datec, fk_product, fk_soc, ref_fourn, fk_user_author)"; $sql.= "datec";
$sql .= " VALUES (".$this->db->idate(mktime()).", ".$this->id.", ".$id_fourn.", '".$ref_fourn."', ".$user->id.")"; $sql.= ", entity";
$sql.= ", fk_product";
$sql.= ", fk_soc";
$sql.= ", ref_fourn";
$sql.= ", fk_user_author";
$sql.= ") VALUES (";
$sql.= $this->db->idate(mktime());
$sql.= ", ".$conf->entity;
$sql.= ", ".$this->id;
$sql.= ", ".$id_fourn;
$sql.= ", '".$ref_fourn."'";
$sql.= ", ".$user->id;
$sql.= ")";
dol_syslog("Product::add_fournisseur sql=".$sql); dol_syslog("Product::add_fournisseur sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
@ -1709,7 +1726,10 @@ class Product extends CommonObject
{ {
$sql = "SELECT rowid"; $sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur";
$sql.= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn." AND ref_fourn = '".$ref_fourn."'"; $sql.= " WHERE fk_product = ".$this->id;
$sql.= " AND fk_soc = ".$id_fourn;
$sql.= " AND ref_fourn = '".$ref_fourn."'";
$sql.= " AND entity = ".$conf->entity;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -1734,11 +1754,14 @@ class Product extends CommonObject
*/ */
function list_suppliers() function list_suppliers()
{ {
global $conf;
$list = array(); $list = array();
$sql = "SELECT fk_soc"; $sql = "SELECT fk_soc";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur as p"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur as p";
$sql.= " WHERE p.fk_product = ".$this->id; $sql.= " WHERE p.fk_product = ".$this->id;
$sql.= " AND p.entity = ".$conf->entity;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
@ -1746,11 +1769,11 @@ class Product extends CommonObject
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i=0; $i=0;
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$list[$i] = $obj->fk_soc; $list[$i] = $obj->fk_soc;
$i++; $i++;
} }
} }
return $list; return $list;
@ -1777,30 +1800,6 @@ class Product extends CommonObject
return 1; return 1;
} }
/**
* \brief Supprime un tarif fournisseur
* \param user utilisateur qui d<EFBFBD>fait le lien
* \param id_fourn id du fournisseur
* \param qty quantit
* \return int < 0 si erreur, > 0 si ok
*/
function remove_price($user, $id_fourn, $qty)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
$sql.= " WHERE fk_product = $this->id AND fk_soc = $id_fourn and quantity = '".$qty."';";
if ($this->db->query($sql) )
{
return 1;
}
else
{
dol_print_error($this->db);
return -1;
}
}
/** /**
* \brief Recopie les prix d'un produit/service sur un autre * \brief Recopie les prix d'un produit/service sur un autre
* \param fromId Id produit source * \param fromId Id produit source

2
htdocs/product/fournisseurs.php
View File

@ -127,7 +127,7 @@ if ($_POST["action"] == 'updateprice' && $_POST["cancel"] <> $langs->trans("Canc
if ($ret < 0) if ($ret < 0)
{ {
$error++; $error++;
$mesg='<div class="error">'.$product->error.'</div>'; $mesg=$ret.'<div class="error">'.$product->error.'</div>';
if ($ret == -2) if ($ret == -2)
{ {
$mesg='<div class="error">'.$langs->trans("ProductHasAlreadyReferenceInThisSupplier").'</div>'; $mesg='<div class="error">'.$langs->trans("ProductHasAlreadyReferenceInThisSupplier").'</div>';