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

Fix customer ref of shipment

Browse Source
This commit is contained in:
Laurent Destailleur 2016-10-30 16:34:46 +01:00
parent 6df4666cf3
commit a3607fff77
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

@ -2798,7 +2798,11 @@ abstract class CommonObject
if (! $error) if (! $error)
{ {
$this->db->commit(); $this->db->commit();
if (empty($elementId)) // If the element we update was $this (so $elementId is null)
{
$this->statut = $status; $this->statut = $status;
$this->status = $status;
}
return 1; return 1;
} }
else else

2
htdocs/expedition/card.php
View File

@ -202,7 +202,7 @@ if (empty($reshook))
$objectsrc->fetch($object->origin_id); $objectsrc->fetch($object->origin_id);
$object->socid = $objectsrc->socid; $object->socid = $objectsrc->socid;
$object->ref_customer = $objectsrc->ref_client; $object->ref_customer = ''; // We don't use $objectsrc->ref_client, this is ref or order not shipment
$object->model_pdf = GETPOST('model'); $object->model_pdf = GETPOST('model');
$object->date_delivery = $date_delivery; // Date delivery planed $object->date_delivery = $date_delivery; // Date delivery planed
$object->fk_delivery_address = $objectsrc->fk_delivery_address; $object->fk_delivery_address = $objectsrc->fk_delivery_address;

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

@ -742,6 +742,7 @@ 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++;