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

Fix the source object may have been modified with corrupted data.

Browse Source
This commit is contained in:
Laurent Destailleur 2021-01-08 01:56:23 +01:00
parent 8fca2ce2eb
commit b91bca7022
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/card.php
View File

@ -188,7 +188,6 @@ if (empty($reshook))
if ($action == 'add' && $user->rights->expedition->creer) if ($action == 'add' && $user->rights->expedition->creer)
{ {
$error = 0; $error = 0;
$predef = '';
$db->begin(); $db->begin();
@ -215,7 +214,6 @@ if (empty($reshook))
$object->fk_delivery_address = $objectsrc->fk_delivery_address; $object->fk_delivery_address = $objectsrc->fk_delivery_address;
$object->shipping_method_id = GETPOST('shipping_method_id', 'int'); $object->shipping_method_id = GETPOST('shipping_method_id', 'int');
$object->tracking_number = GETPOST('tracking_number', 'alpha'); $object->tracking_number = GETPOST('tracking_number', 'alpha');
$object->ref_int = GETPOST('ref_int', 'alpha');
$object->note_private = GETPOST('note_private', 'restricthtml'); $object->note_private = GETPOST('note_private', 'restricthtml');
$object->note_public = GETPOST('note_public', 'restricthtml'); $object->note_public = GETPOST('note_public', 'restricthtml');
$object->fk_incoterms = GETPOST('incoterm_id', 'int'); $object->fk_incoterms = GETPOST('incoterm_id', 'int');

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

@ -671,7 +671,7 @@ class Expedition extends CommonObject
// Protection // Protection
if ($this->statut) if ($this->statut)
{ {
dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING); dol_syslog(get_class($this)."::valid not in draft status", LOG_WARNING);
return 0; return 0;
} }
@ -757,7 +757,7 @@ class Expedition extends CommonObject
//var_dump($this->lines[$i]); //var_dump($this->lines[$i]);
$mouvS = new MouvementStock($this->db); $mouvS = new MouvementStock($this->db);
$mouvS->origin = &$this; $mouvS->origin = dol_clone($this, 1);
if (empty($obj->edbrowid)) if (empty($obj->edbrowid))
{ {
@ -765,6 +765,7 @@ class Expedition extends CommonObject
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record. // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref)); $result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref));
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->error = $mouvS->error; $this->error = $mouvS->error;
@ -794,7 +795,6 @@ class Expedition extends CommonObject
// Change status of order to "shipment in process" // Change status of order to "shipment in process"
$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin); $ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
if (!$ret) if (!$ret)
{ {
$error++; $error++;

1
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -666,7 +666,6 @@ class MouvementStock extends CommonObject
} }
// Retrieve all extrafield // Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals(); $this->fetch_optionals();
// $this->fetch_lines(); // $this->fetch_lines();