Merge branch 'dev-7201' into entreprise
* dev-7201: Bug 1786: Comptabilité analytique : TVA non déductible bloque http_input , trim on array is invalid Test : correct test for Acc_Ledger_Factory : payment status Bug in reconcile for bank amount: total_invoice is null for FIN and ODS Bug : search Bug #1783 : les nombres commençant par zéro ne sont pas supportés zero is considered as empty value http_input replace empty by a value export historic card csv : column wrong Remove direct access to $http Documentation + bug cosmetic about TVA_SIDED : total operation shown instead of total_invoice (VAT REVERSED) Fix cosmetic + export histo CSV with operation filter Round VAT add forgotten file Change logo warning about session_start Acc_Ledger_Search , fix small bug + Test file Documentation TEST fix bug in acc_balanceTest
This commit is contained in:
commit
cb0a8491de
28 changed files with 319 additions and 75 deletions
|
|
@ -181,13 +181,13 @@ else
|
|||
if ($row['j_debit'] == 't')
|
||||
{
|
||||
$export->add($row['j_montant'],"number");
|
||||
$export->add("");
|
||||
$export->add(0,"number");
|
||||
$amount_deb=bcadd($amount_deb,$row['j_montant']);
|
||||
$prog = bcadd($prog, $row['j_montant']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$export->add("");
|
||||
$export->add(0,"number");
|
||||
$export->add($row['j_montant'],"number");
|
||||
$amount_cred=bcadd($amount_cred,$row['j_montant']);
|
||||
$prog = bcsub($prog, $row['j_montant']);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue