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

FIX convert inventory class

Browse Source
This commit is contained in:
Regis Houssin 2022-01-27 10:16:02 +01:00
parent 9278c7cb85
commit 7ff2678ef0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/product/inventory/class/inventory.class.php
View File

@ -266,7 +266,7 @@ class Inventory extends CommonObject
if ($this->status == self::STATUS_DRAFT) { if ($this->status == self::STATUS_DRAFT) {
// Delete inventory // Delete inventory
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'inventorydet WHERE fk_inventory = '.((int) $this->id); $sql = 'DELETE FROM '.$this->db->prefix().'inventorydet WHERE fk_inventory = '.((int) $this->id);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
@ -277,9 +277,9 @@ class Inventory extends CommonObject
// Scan existing stock to prefill the inventory // Scan existing stock to prefill the inventory
$sql = 'SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,'; $sql = 'SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,';
$sql .= ' pb.batch, pb.qty'; $sql .= ' pb.batch, pb.qty';
$sql .= ' FROM '.MAIN_DB_PREFIX.'product_stock as ps'; $sql .= ' FROM '.$this->db->prefix().'product_stock as ps';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb ON pb.fk_product_stock = ps.rowid,'; $sql .= ' LEFT JOIN '.$this->db->prefix().'product_batch as pb ON pb.fk_product_stock = ps.rowid,';
$sql .= ' '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'entrepot as e'; $sql .= ' '.$this->db->prefix().'product as p, '.$this->db->prefix().'entrepot as e';
$sql .= ' WHERE p.entity IN ('.getEntity('product').')'; $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
$sql .= ' AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid'; $sql .= ' AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid';
if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) { if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
@ -349,7 +349,7 @@ class Inventory extends CommonObject
$this->db->begin(); $this->db->begin();
// Delete inventory // Delete inventory
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'inventorydet WHERE fk_inventory = '.((int) $this->id); $sql = 'DELETE FROM '.$this->db->prefix().'inventorydet WHERE fk_inventory = '.((int) $this->id);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
@ -642,7 +642,7 @@ class Inventory extends CommonObject
{ {
$sql = 'SELECT rowid, date_creation as datec, tms as datem, date_validation as datev,'; $sql = 'SELECT rowid, date_creation as datec, tms as datem, date_validation as datev,';
$sql .= ' fk_user_creat, fk_user_modif, fk_user_valid'; $sql .= ' fk_user_creat, fk_user_modif, fk_user_valid';
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t'; $sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
$sql .= ' WHERE t.rowid = '.((int) $id); $sql .= ' WHERE t.rowid = '.((int) $id);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {