Merge remote-tracking branch 'upstream/develop' into use_ismodenabled
This commit is contained in:
commit
b1aee4dda6
@ -875,7 +875,7 @@ class Productcustomerprice extends CommonObject
|
||||
$prodsocpriceupd->recuperableonly = $this->recuperableonly;
|
||||
|
||||
$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
|
||||
if ($result < 0) {
|
||||
if ($resultupd < 0) {
|
||||
$error++;
|
||||
$this->error = $prodsocpriceupd->error;
|
||||
}
|
||||
@ -893,7 +893,7 @@ class Productcustomerprice extends CommonObject
|
||||
$prodsocpricenew->recuperableonly = $this->recuperableonly;
|
||||
|
||||
$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
|
||||
if ($result < 0) {
|
||||
if ($resultupd < 0) {
|
||||
$error++;
|
||||
$this->error = $prodsocpricenew->error;
|
||||
}
|
||||
@ -927,7 +927,7 @@ class Productcustomerprice extends CommonObject
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
if (!$error && !$notrigger) {
|
||||
if (!$notrigger) {
|
||||
$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user);
|
||||
if ($result < 0) {
|
||||
$error++;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user