This commit is contained in:
Laurent Destailleur 2014-04-13 02:08:57 +02:00
parent 87f7771af2
commit 9fb029890c

View File

@ -560,7 +560,7 @@ class Product extends CommonObject
if (empty($this->localtax2_tx)) $this->localtax2_tx = 0; if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
if (empty($this->status)) $this->status = 0; if (empty($this->status)) $this->status = 0;
if (empty($this->status_buy)) $this->status_buy = 0; if (empty($this->status_buy)) $this->status_buy = 0;
if (empty($this->country_id)) $this->country_id = 0; if (empty($this->country_id)) $this->country_id = 0;
//Gencod //Gencod
@ -1486,9 +1486,9 @@ class Product extends CommonObject
// We should not load stock at each fetch. If someone need stock, he must call load_stock after fetch. // We should not load stock at each fetch. If someone need stock, he must call load_stock after fetch.
//$res=$this->load_stock(); //$res=$this->load_stock();
//return $res;
// ok we don't load stock but we init the stock_warehouse array // instead we just init the stock_warehouse array
$this->stock_warehouse = Array(); $this->stock_warehouse = array();
return 1; return 1;
} }
@ -3271,7 +3271,7 @@ class Product extends CommonObject
function get_barcode($object,$type='') function get_barcode($object,$type='')
{ {
global $conf; global $conf;
$result=''; $result='';
if (! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) if (! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
{ {