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

Merge pull request #6836 from atm-ph/fix_deposit_calculation

Browse Source 
Fix wrong calculation
This commit is contained in:
Laurent Destailleur 2017-05-20 11:57:05 +02:00 committed by GitHub
commit 54f9990467
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,8 +1087,9 @@ if (empty($reshook))
} }
if ($totalamount != 0) { if ($totalamount != 0) {
$tva_tx = $lines[$i]->tva_tx; if ($numlines > 0) $numlines = $numlines-1;
if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')'; $tva_tx = $lines[$numlines]->tva_tx;
if (! empty($lines[$numlines]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$numlines]->vat_src_code.')';
$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100; $amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
} else { } else {
$amountdeposit[0] = 0; $amountdeposit[0] = 0;
@ -1137,7 +1138,7 @@ if (empty($reshook))
if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
{ {
$object->fetch_lines(); $object->fetch_lines();
$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx); $subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100); $object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
} }