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

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-13 01:07:27 +02:00
commit 32ec40647a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -419,7 +419,11 @@ class ProductFournisseur extends Product
$productfournisseurprice->array_options[$key] = $value; $productfournisseurprice->array_options[$key] = $value;
} }
$res = $productfournisseurprice->update($user); $res = $productfournisseurprice->update($user);
if ($res < 0) $error++; if ($res < 0) {
$this->error = $productfournisseurprice->error;
$this->errors = $productfournisseurprice->errors;
$error++;
}
} }
} }
} }
@ -506,6 +510,7 @@ class ProductFournisseur extends Product
if ($resql) { if ($resql) {
$this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price"); $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
} else { } else {
$this->error = $this->db->lasterror();
$error++; $error++;
} }
@ -518,7 +523,11 @@ class ProductFournisseur extends Product
$productfournisseurprice->array_options[$key] = $value; $productfournisseurprice->array_options[$key] = $value;
} }
$res = $productfournisseurprice->update($user); $res = $productfournisseurprice->update($user);
if ($res < 0) $error++; if ($res < 0) {
$this->error = $productfournisseurprice->error;
$this->errors = $productfournisseurprice->errors;
$error++;
}
} }
} }
} }

1
htdocs/install/mysql/tables/llx_establishment.sql
View File

@ -22,6 +22,7 @@
CREATE TABLE llx_establishment ( CREATE TABLE llx_establishment (
rowid integer NOT NULL auto_increment PRIMARY KEY, rowid integer NOT NULL auto_increment PRIMARY KEY,
entity integer NOT NULL DEFAULT 1, entity integer NOT NULL DEFAULT 1,
label varchar(255),
ref varchar(30), ref varchar(30),
name varchar(128), name varchar(128),
address varchar(255), address varchar(255),