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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-05 02:14:16 +02:00
commit b77f2be2e1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -697,7 +697,7 @@ class CommandeFournisseur extends CommonOrder
public function LibStatut($status, $mode = 0, $billed = 0)
{
// phpcs:enable
global $conf, $langs;
global $conf, $langs, $hookmanager;
if (empty($this->statuts) || empty($this->statutshort)) {
$langs->load('orders');
@ -756,6 +756,11 @@ class CommandeFournisseur extends CommonOrder
$statusLong = $langs->transnoentitiesnoconv($this->statuts[$status]).$billedtext;
$statusShort = $langs->transnoentitiesnoconv($this->statutshort[$status]);
$parameters = array('status' => $status, 'mode' => $mode, 'billed' => $billed);
$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $this); // Note that $action and $object may have been modified by hook
if ($reshook > 0) {
return $hookmanager->resPrint;
}
return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
}

1
htdocs/fourn/commande/list.php
View File

@ -1287,6 +1287,7 @@ if ($resql) {
$objectstatic->id = $obj->rowid;
$objectstatic->ref = $obj->ref;
$objectstatic->socid = $obj->socid;
$objectstatic->ref_supplier = $obj->ref_supplier;
$objectstatic->socid = $obj->socid;
$objectstatic->total_ht = $obj->total_ht;