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

Fix: PGsql compatibility

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-22 01:59:52 +02:00
parent 89ad634230
commit 7ff2e559aa
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
htdocs/product/class/product.class.php
View File

@ -1797,8 +1797,16 @@ class Product extends CommonObject
*/ */
function add_sousproduit($id_pere, $id_fils,$qty) function add_sousproduit($id_pere, $id_fils,$qty)
{ {
$sql = 'DELETE from '.MAIN_DB_PREFIX.'product_association'; // Clean parameters
$sql .= ' WHERE fk_product_pere = "'.$id_pere.'" AND fk_product_fils = "'.$id_fils.'"'; if (! is_numeric($id_pere)) $id_pere=0;
if (! is_numeric($id_fils)) $id_fils=0;
$result=$this->del_sousproduit($id_pere, $id_fils);
if ($result < 0) return $result;
// Check not already father of id_pere (to avoid father -> child -> father links)
$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
$sql .= ' WHERE fk_product_pere = '.$id_fils.' AND fk_product_fils = '.$id_pere;
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dol_print_error($this->db); dol_print_error($this->db);
@ -1806,37 +1814,27 @@ class Product extends CommonObject
} }
else else
{ {
$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association'; $result = $this->db->query($sql);
$sql .= ' WHERE fk_product_pere = "'.$id_fils.'" AND fk_product_fils = "'.$id_pere.'"'; if ($result)
if (! $this->db->query($sql))
{ {
dol_print_error($this->db); $num = $this->db->num_rows($result);
return -1; if($num > 0)
}
else
{
$result = $this->db->query($sql);
if ($result)
{ {
$num = $this->db->num_rows($result); $this->error="isFatherOfThis";
if($num > 0) return -1;
}
else
{
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty)';
$sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.')';
if (! $this->db->query($sql))
{ {
$this->error="isFatherOfThis"; dol_print_error($this->db);
return -1; return -1;
} }
else else
{ {
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty)'; return 1;
$sql .= ' VALUES ("'.$id_pere.'","'.$id_fils.'","'.$qty.'")';
if (! $this->db->query($sql))
{
dol_print_error($this->db);
return -1;
}
else
{
return 1;
}
} }
} }
} }
@ -1848,14 +1846,18 @@ class Product extends CommonObject
* *
* @param int $fk_parent Id du produit auquel ne sera plus lie le produit lie * @param int $fk_parent Id du produit auquel ne sera plus lie le produit lie
* @param int $fk_child Id du produit a ne plus lie * @param int $fk_child Id du produit a ne plus lie
* @return int < 0 si erreur, > 0 si ok * @return int < 0 if KO, > 0 if OK
*/ */
function del_sousproduit($fk_parent, $fk_child) function del_sousproduit($fk_parent, $fk_child)
{ {
if (! is_numeric($fk_parent)) $fk_parent=0;
if (! is_numeric($fk_child)) $fk_child=0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
$sql.= " WHERE fk_product_pere = '".$fk_parent."'"; $sql.= " WHERE fk_product_pere = ".$fk_parent;
$sql.= " AND fk_product_fils = '".$fk_child."'"; $sql.= " AND fk_product_fils = ".$fk_child;
dol_syslog(get_class($this).'::del_sousproduit sql='.$sql);
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dol_print_error($this->db); dol_print_error($this->db);

4
htdocs/product/composition/fiche.php
View File

@ -72,8 +72,8 @@ $cancel <> $langs->trans("Cancel") &&
$error=0; $error=0;
for($i=0;$i<$_POST["max_prod"];$i++) for($i=0;$i<$_POST["max_prod"];$i++)
{ {
// print "<br> : ".$_POST["prod_id_chk".$i]; print "<br> : ".$_POST["prod_id_chk".$i];
if($_POST["prod_id_chk".$i] != "") if ($_POST["prod_id_chk".$i] > 0)
{ {
if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0) if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)
{ {