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

Merge pull request #11030 from atm-florian/9.0

Browse Source 
fix #11023
This commit is contained in:
Laurent Destailleur 2019-04-19 13:05:38 +02:00 committed by GitHub
commit 83205e6963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/propal/card.php
View File

@ -759,6 +759,7 @@ if (empty($reshook))
$qty = GETPOST('qty' . $predef); $qty = GETPOST('qty' . $predef);
$remise_percent = GETPOST('remise_percent' . $predef); $remise_percent = GETPOST('remise_percent' . $predef);
if (empty($remise_percent)) $remise_percent=0;
// Extrafields // Extrafields
$extrafieldsline = new ExtraFields($db); $extrafieldsline = new ExtraFields($db);

2
htdocs/core/lib/sendings.lib.php
View File

@ -51,7 +51,7 @@ function shipping_prepare_head($object)
{ {
// delivery link // delivery link
$object->fetchObjectLinked($object->id,$object->element); $object->fetchObjectLinked($object->id,$object->element);
if (count($object->linkedObjectsIds['delivery']) > 0) // If there is a delivery if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0) // If there is a delivery
{ {
// Take first one element of array // Take first one element of array
$tmp = reset($object->linkedObjectsIds['delivery']); $tmp = reset($object->linkedObjectsIds['delivery']);

2
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
View File

@ -307,7 +307,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
$diff_array=array_diff_assoc($qtyordred,$qtyshipped); $diff_array=array_diff_assoc($qtyordred,$qtyshipped);
if (count($diff_array)==0) { if (count($diff_array)==0) {
//No diff => mean everythings is shipped //No diff => mean everythings is shipped
$ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin); $ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
if ($ret<0) { if ($ret<0) {
$this->error=$object->error; $this->errors=$object->errors; $this->error=$object->error; $this->errors=$object->errors;
return $ret; return $ret;