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

Fix bug reported by scrutinizers

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-02 15:03:14 +01:00
parent e57c8f324d
commit 1f4a079f01
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/class/propal.class.php
View File

@ -2959,6 +2959,8 @@ class Propal extends CommonObject
*/ */
function demand_reason($demand_reason_id, $notrigger=0) function demand_reason($demand_reason_id, $notrigger=0)
{ {
global $user;
if ($this->statut >= self::STATUS_DRAFT) if ($this->statut >= self::STATUS_DRAFT)
{ {
$error=0; $error=0;

2
htdocs/compta/facture/card.php
View File

@ -1098,7 +1098,7 @@ if (empty($reshook))
$exp = new Expedition($db); $exp = new Expedition($db);
$exp->fetch($object->origin_id); $exp->fetch($object->origin_id);
$exp->fetchObjectLinked(); $exp->fetchObjectLinked();
if (count($exp->linkedObjectsIds['commande']) > 0) { if (is_array($exp->linkedObjectsIds['commande']) && count($exp->linkedObjectsIds['commande']) > 0) {
foreach ($exp->linkedObjectsIds['commande'] as $key => $value){ foreach ($exp->linkedObjectsIds['commande'] as $key => $value){
$object->linked_objects['commande'] = $value; $object->linked_objects['commande'] = $value;
} }