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

Merge pull request #14172 from atm-quentin/FIX_origin_element_is_always_order

Browse Source 
FIX wrong origin
This commit is contained in:
Laurent Destailleur 2020-07-03 00:15:06 +02:00 committed by GitHub
commit 77b0800633
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/commande/class/commande.class.php
View File

@ -1014,7 +1014,7 @@ class Commande extends CommonOrder
// Complete vat rate with code // Complete vat rate with code
$vatrate = $line->tva_tx; $vatrate = $line->tva_tx;
if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')'; if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
$origin = (!empty($line->origin) ? $line->origin : $this->element);
$result = $this->addline( $result = $this->addline(
$line->desc, $line->desc,
$line->subprice, $line->subprice,
@ -1039,7 +1039,7 @@ class Commande extends CommonOrder
$line->label, $line->label,
$line->array_options, $line->array_options,
$line->fk_unit, $line->fk_unit,
$this->element, $origin,
$line->id $line->id
); );
if ($result < 0) if ($result < 0)