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

Merge pull request #13467 from Je2fb/develop

Browse Source 
Update card.php
This commit is contained in:
Laurent Destailleur 2020-04-02 13:30:40 +02:00 committed by GitHub
commit e8fa0ec50c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/fourn/facture/card.php
View File

@ -966,11 +966,23 @@ if (empty($reshook))
// FIXME Missing special_code into addline and updateline methods
$object->special_code = $lines[$i]->special_code;
// FIXME If currency different from main currency, take multicurrency price
if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
{
$pu = 0;
$pu_currency = $lines[$i]->multicurrency_subprice;
}
else
{
$pu = $lines[$i]->subprice;
$pu_currency = 0;
}
// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
$result = $object->addline(
$desc,
$lines[$i]->subprice,
$pu,
$lines[$i]->tva_tx,
$lines[$i]->localtax1_tx,
$lines[$i]->localtax2_tx,
@ -988,7 +1000,7 @@ if (empty($reshook))
$lines[$i]->array_options,
$lines[$i]->fk_unit,
$lines[$i]->id,
0,
$pu_currency,
$lines[$i]->ref_supplier,
$lines[$i]->special_code
);