-
-
Notifications
You must be signed in to change notification settings - Fork 305
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by eLBati
- Loading branch information
Showing
4 changed files
with
110 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,5 +2,8 @@ | |
* Silvio Gregorini <[email protected]> | ||
* Stefano Pezzini <[email protected]> | ||
* Lorenzo Battistini <[email protected]> | ||
* `TAKOBI <https://takobi.online>`_: | ||
|
||
* Simone Rubino <[email protected]> | ||
|
||
Base icon made by `surang <https://www.flaticon.com/authors/surang>`_ from `www.flaticon.com <https://www.flaticon.com/>`_. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
# Author(s): Silvio Gregorini ([email protected]) | ||
# Copyright 2019 Openforce Srls Unipersonale (www.openforce.it) | ||
# Copyright 2022 Simone Rubino - TAKOBI | ||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). | ||
|
||
from collections import OrderedDict | ||
|
@@ -360,6 +361,12 @@ def generate_totals(self): | |
if fy_start <= report_date <= fy_end: | ||
totals_by_dep_type[dep_type][fname] += \ | ||
line_curr.compute(last_line[fname], curr) | ||
elif fy_end < report_date: | ||
totals_by_dep_type[dep_type][fname] += \ | ||
line_curr.compute( | ||
last_line['amount_depreciation_fund_curr_year'], | ||
curr, | ||
) | ||
elif fname in ( | ||
'amount_in_total', | ||
'amount_out_total', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
# Author(s): Silvio Gregorini ([email protected]) | ||
# Copyright 2019 Openforce Srls Unipersonale (www.openforce.it) | ||
# Copyright 2022 Simone Rubino - TAKOBI | ||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). | ||
|
||
from collections import OrderedDict | ||
|
@@ -391,6 +392,12 @@ def generate_totals(self): | |
if fy_start <= report_date <= fy_end: | ||
totals_by_dep_type[dep_type][fname] += \ | ||
line_curr.compute(last_line[fname], curr) | ||
elif fy_end < report_date: | ||
totals_by_dep_type[dep_type][fname] += \ | ||
line_curr.compute( | ||
last_line['amount_depreciation_fund_curr_year'], | ||
curr, | ||
) | ||
elif fname in ( | ||
'amount_in_total', | ||
'amount_out_total', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters