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

Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields

Browse Source 
FIX delivery extrafields
This commit is contained in:
Laurent Destailleur 2019-08-10 01:28:46 +02:00 committed by GitHub
commit c647195689
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/livraison/card.php
View File

@ -570,7 +570,7 @@ else
} }
// Other attributes // Other attributes
if ($action = 'create_delivery') { if ($action == 'create_delivery') {
// copy from expedition // copy from expedition
$expeditionExtrafields = new Extrafields($db); $expeditionExtrafields = new Extrafields($db);
$expeditionExtrafieldLabels = $expeditionExtrafields->fetch_name_optionals_label($expedition->table_element); $expeditionExtrafieldLabels = $expeditionExtrafields->fetch_name_optionals_label($expedition->table_element);
@ -675,7 +675,7 @@ else
$mode = ($object->statut == 0) ? 'edit' : 'view'; $mode = ($object->statut == 0) ? 'edit' : 'view';
$line = new LivraisonLigne($db); $line = new LivraisonLigne($db);
$line->fetch_optionals($object->lines[$i]->id); $line->fetch_optionals($object->lines[$i]->id);
if ($action = 'create_delivery') { if ($action == 'create_delivery') {
$srcLine = new ExpeditionLigne($db); $srcLine = new ExpeditionLigne($db);
$expeditionLineExtrafields = new Extrafields($db); $expeditionLineExtrafields = new Extrafields($db);
$expeditionLineExtrafieldLabels = $expeditionLineExtrafields->fetch_name_optionals_label($srcLine->table_element); $expeditionLineExtrafieldLabels = $expeditionLineExtrafields->fetch_name_optionals_label($srcLine->table_element);