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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2020-12-08 18:03:01 +01:00
commit a0b1bd3eca
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,6 +922,7 @@ class Product extends CommonObject
$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export); $this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
$this->db->begin(); $this->db->begin();
$result = 0; $result = 0;
@ -945,6 +946,7 @@ class Product extends CommonObject
if ($this->hasbatch() && !$this->oldcopy->hasbatch()) { if ($this->hasbatch() && !$this->oldcopy->hasbatch()) {
//$valueforundefinedlot = 'Undefined'; // In previous version, 39 and lower //$valueforundefinedlot = 'Undefined'; // In previous version, 39 and lower
$valueforundefinedlot = '000000'; $valueforundefinedlot = '000000';
if (!empty($conf->global->STOCK_DEFAULT_BATCH)) $valueforundefinedlot = $conf->global->STOCK_DEFAULT_BATCH;
dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch"); dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");