[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 131/173: Merge branch 'dev-7201' into entrepr
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 131/173: Merge branch 'dev-7201' into entreprise |
Date: |
Mon, 22 Mar 2021 12:59:09 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit cb0a8491de2e4e7b82f8799f25dff657ab6dd193
Merge: 3b89701 f306130
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Fri Jan 17 20:27:49 2020 +0100
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
doc/developper/Doxyfile | 2 +-
html/image/logo7200.png | Bin 0 -> 35895 bytes
html/index.css | 14 +--
html/index.php | 2 +-
html/install.php | 4 +-
html/js/scripts.js | 2 +-
include/ajax/ajax_search_operation.php | 11 +-
include/class/acc_ledger_purchase.class.php | 8 +-
include/class/acc_ledger_search.class.php | 101 ++++++++++++----
include/class/acc_ledger_sold.class.php | 1 +
include/class/anc_account_table.class.php | 4 +-
include/class/anc_balance_double.class.php | 2 +-
include/class/package_plugin.class.php | 2 +-
include/class/template_card_category.class.php | 2 +-
include/class/tva_rate_mtable.class.php | 2 +-
include/export/export_fiche_balance_csv.php | 4 +-
include/export/export_fiche_csv.php | 3 +-
include/export/export_gl_csv.php | 4 +-
include/export/export_histo_csv.php | 5 +-
include/history_operation.inc.php | 9 +-
include/lib/http_input.class.php | 40 ++++++-
include/lib/inplace_edit.class.php | 4 +-
include/lib/user_menu.php | 11 +-
include/sql/patch/upgrade140.sql | 10 ++
include/template/ledger_search.php | 2 +-
scenario/acc_ledger_historyTest.php | 10 +-
unit-test/include/class/acc_ledger_search.Test.php | 133 +++++++++++++++++++++
unit-test/include/class/acc_ledger_sold.Test.php | 2 +-
28 files changed, 319 insertions(+), 75 deletions(-)
diff --cc include/class/acc_ledger_sold.class.php
index eeb0fcb,7b14a50..b4c8077
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@@ -360,28 -333,19 +360,29 @@@ class Acc_Ledger_Sold extends Acc_Ledge
/* retrieve tva */
$l = new Acc_Tva($this->db, $idx_tva);
$l->load();
- $tva_item = bcmul($amount, $l->get_parameter('rate'));
+ $tva_item_currency = bcmul($amount,
$l->get_parameter('rate'));
+ $tva_item=round($tva_item,2);
}
+ $tva_item=bcdiv($tva_item_currency,$p_currency_rate);
+ $tva_item=round($tva_item,2);
if (isset($tva[$idx_tva]))
- $tva[$idx_tva]=bcadd($tva[$idx_tva],$tva_item);
+ {
+ $tva[$idx_tva]=bcadd($tva_item,$tva[$idx_tva]);
+ $tva[$idx_tva]=round($tva[$idx_tva],2);
+ }
else
- $tva[$idx_tva] = $tva_item;
+ {
+ $tva[$idx_tva]=$tva_item;
+ }
if ($oTva->get_parameter("both_side") == 0) {
- $tot_tva = round(bcadd($tva_item, $tot_tva), 2);
+ $tot_tva = bcadd($tva_item, $tot_tva);
+ $tot_tva = round($tot_tva, 2);
} else {
$n_both = $tva_item;
- if ($n_both < 0)
- $tot_debit = bcadd($tot_debit, abs($n_both));
+ if ($n_both<0)
+ {
+ $tot_debit=round(bcadd($tot_debit,
abs($n_both)),2);
+ }
}
}
- [Noalyss-commit] [noalyss] 119/173: improve test for fiche get_row, (continued)
- [Noalyss-commit] [noalyss] 119/173: improve test for fiche get_row, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 134/173: Merge branch 'dev7202' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 135/173: Merge branch 'dev7220' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 137/173: Fiche.Test : add test cmp_name and get_row, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 145/173: Merge branch 'entreprise' into next-release-8, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 138/173: Test Unit Acc_Account_Legder , rounded value fixed, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 139/173: Fix cosmetic and typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 147/173: Error : duplicate function update_row, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 151/173: htmlspecialchars use HTML5 and UTF8, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 114/173: fixup! Printtva , under some circumstance tva_summary::check fails, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 131/173: Merge branch 'dev-7201' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 142/173: Merge commit 'db9d4c53d1325b1ab3c8a3fcae6ddd201799fb42' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 146/173: Merge branch 'pre7300' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 150/173: Include Bootstrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 154/173: create dossier, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 169/173: Task #1907: Gestion : événement ajout de lien hyperlnk, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 101/173: task #0001698: Problème affichage historique fiches Prevent direct use of http_request translation Cosmetic, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 152/173: Bug : filter of the search and tag, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 160/173: typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 159/173: Merge branch 'master' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 162/173: Merge branch 'master' into dev-8-bootstrap, Dany De Bontridder, 2021/03/22