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

Merge pull request #19556 from fappels/Debug_15

Browse Source 
Fix shipment delete
This commit is contained in:
Laurent Destailleur 2021-12-08 15:53:40 +01:00 committed by GitHub
commit 042bb9f5cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -144,6 +144,8 @@ Following changes may create regressions for some external modules, but were nec
* Method getDictvalue has been renamed into getDictionaryValue to match camel case rule. * Method getDictvalue has been renamed into getDictionaryValue to match camel case rule.
* To execute shell or command line command, your code must never use method like exec, shell_exec, popen, .. but must use the built-in * To execute shell or command line command, your code must never use method like exec, shell_exec, popen, .. but must use the built-in
method executeCLI() available into core/class/utils.class.php method executeCLI() available into core/class/utils.class.php
* Class file expeditionbatch.class.php renamed to expeditionlinebatch.class.php
* ExpeditionLineBatch::fetchAll is not static anymore and first parameter $db is removed
* ExtraFields->showOutputField parameter 4 'extrafieldsobjectkey' is now required * ExtraFields->showOutputField parameter 4 'extrafieldsobjectkey' is now required

15
htdocs/expedition/class/expedition.class.php
View File

@ -1403,6 +1403,9 @@ class Expedition extends CommonObject
$langs->load("agenda"); $langs->load("agenda");
// we try deletion of batch line even if module batch not enabled in case of the module were enabled and disabled previously
$shipmentlinebatch = new ExpeditionLineBatch($this->db);
// Loop on each product line to add a stock movement // Loop on each product line to add a stock movement
$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id"; $sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id";
$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,"; $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
@ -1422,12 +1425,9 @@ class Expedition extends CommonObject
// we do not log origin because it will be deleted // we do not log origin because it will be deleted
$mouvS->origin = null; $mouvS->origin = null;
// get lot/serial // get lot/serial
$lotArray = null; $lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
if ($conf->productbatch->enabled) { if (!is_array($lotArray)) {
$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id); $error++; $this->errors[] = "Error ".$this->db->lasterror();
if (!is_array($lotArray)) {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
} }
if (empty($lotArray)) { if (empty($lotArray)) {
// no lot/serial // no lot/serial
@ -1458,9 +1458,8 @@ class Expedition extends CommonObject
} }
} }
// delete batch expedition line (we try deletion even if module not enabled in case of the module were enabled and disabled previously) // delete batch expedition line
if (!$error) { if (!$error) {
$shipmentlinebatch = ExpeditionLineBatch($this->db);
if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) { if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
$error++; $this->errors[] = "Error ".$this->db->lasterror(); $error++; $this->errors[] = "Error ".$this->db->lasterror();
} }