Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
e85db964ca
2 changed files with 2 additions and 2 deletions
|
|
@ -301,7 +301,7 @@ class BookKeeping extends CommonObject
|
|||
$this->credit = 0.0;
|
||||
}
|
||||
|
||||
$result = $this->validBookkeepingDate($this->doc_date);
|
||||
$result = $this->validBookkeepingDate($this->doc_date); // Check date according to ACCOUNTANCY_FISCAL_PERIOD_MODE.
|
||||
if ($result < 0) {
|
||||
return -1;
|
||||
} elseif ($result == 0) {
|
||||
|
|
|
|||
|
|
@ -1387,7 +1387,7 @@ if (empty($reshook)) {
|
|||
$tva_tx = 0;
|
||||
}
|
||||
|
||||
$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 1, $tva_tx, 0, 0, 0, 0, '', '', 0, 0, 0, 'TTC');
|
||||
$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), 0, 1, $tva_tx, 0, 0, 0, 0, '', '', 0, 0, 0, 'TTC', $remain_to_pay);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue