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

Merge pull request #12398 from c3do/patch-2

Browse Source 
Fix issue #12397
This commit is contained in:
Laurent Destailleur 2019-11-09 18:43:24 +01:00 committed by GitHub
commit 431337e9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1073,7 +1073,7 @@ class Product extends CommonObject
$comb = new ProductCombination($this->db); $comb = new ProductCombination($this->db);
foreach ($comb->fetchAllByFkProductParent($this->id) as $currcomb) { foreach ($comb->fetchAllByFkProductParent($this->id) as $currcomb) {
$currcomb->updateProperties($this); $currcomb->updateProperties($this, $user);
} }
} }

7
htdocs/variants/class/ProductCombination.class.php
View File

@ -248,7 +248,7 @@ class ProductCombination
$parent = new Product($this->db); $parent = new Product($this->db);
$parent->fetch($this->fk_product_parent); $parent->fetch($this->fk_product_parent);
$this->updateProperties($parent); $this->updateProperties($parent, $user);
return 1; return 1;
} }
@ -315,11 +315,12 @@ class ProductCombination
* Updates the weight of the child product. The price must be updated using Product::updatePrices * Updates the weight of the child product. The price must be updated using Product::updatePrices
* *
* @param Product $parent Parent product * @param Product $parent Parent product
* @param User $user Object user
* @return int >0 OK <0 KO * @return int >0 OK <0 KO
*/ */
public function updateProperties(Product $parent) public function updateProperties(Product $parent, User $user)
{ {
global $user, $conf; global $conf;
$this->db->begin(); $this->db->begin();