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

Merge remote-tracking branch 'upstream/develop' into use_ismodenabled

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-04-18 21:03:22 +02:00
commit b1aee4dda6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/product/class/productcustomerprice.class.php
View File

@ -875,7 +875,7 @@ class Productcustomerprice extends CommonObject
$prodsocpriceupd->recuperableonly = $this->recuperableonly; $prodsocpriceupd->recuperableonly = $this->recuperableonly;
$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate); $resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
if ($result < 0) { if ($resultupd < 0) {
$error++; $error++;
$this->error = $prodsocpriceupd->error; $this->error = $prodsocpriceupd->error;
} }
@ -893,7 +893,7 @@ class Productcustomerprice extends CommonObject
$prodsocpricenew->recuperableonly = $this->recuperableonly; $prodsocpricenew->recuperableonly = $this->recuperableonly;
$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate); $resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
if ($result < 0) { if ($resultupd < 0) {
$error++; $error++;
$this->error = $prodsocpricenew->error; $this->error = $prodsocpricenew->error;
} }
@ -927,7 +927,7 @@ class Productcustomerprice extends CommonObject
$this->db->begin(); $this->db->begin();
if (!$error && !$notrigger) { if (!$notrigger) {
$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user); $result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user);
if ($result < 0) { if ($result < 0) {
$error++; $error++;