Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #811 into 13.0 

Signed-off-by joao-p-marques
pull/834/head
OCA-git-bot 2021-09-24 10:14:22 +00:00
parent 6c3d0f8cb6 bb72d94f3c
commit 8dcbe015af
4 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
account_financial_report/report/aged_partner_balance.py
View File

@ -116,9 +116,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
"ref",
"reconciled",
]
move_lines = self.env["account.move.line"].search_read(
domain=domain, fields=ml_fields
)
line_model = self.env["account.move.line"]
move_lines = line_model.search_read(domain=domain, fields=ml_fields)
journals_ids = set()
partners_ids = set()
partners_data = {}
@ -186,6 +185,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
ref_label = move_line["ref"] + str(" - ") + move_line["name"]
move_line_data.update(
{
"line_rec": line_model.browse(move_line["id"]),
"date": move_line["date"],
"entry": move_line["move_id"][1],
"jnl_id": move_line["journal_id"][0],

52
account_financial_report/report/templates/aged_partner_balance.xml
View File

@ -235,7 +235,7 @@
<!--## date-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.id"
t-att-res-id="line['line_rec'].id"
res-model="account.move.line"
view-type="form"
>
@ -246,7 +246,7 @@
<!--## move-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.move_id.id"
t-att-res-id="line['line_rec'].move_id.id"
res-model="account.move"
view-type="form"
>
@ -256,7 +256,7 @@
<!--## journal-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.move_id.journal_id.id"
t-att-res-id="line['line_rec'].move_id.journal_id.id"
res-model="account.journal"
view-type="form"
>
@ -266,7 +266,7 @@
<!--## account code-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.account_id.id"
t-att-res-id="line['line_rec'].account_id.id"
res-model="account.account"
view-type="form"
>
@ -276,7 +276,7 @@
<!--## partner-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.partner_id.id"
t-att-res-id="line['line_rec'].partner_id.id"
res-model="res.partner"
view-type="form"
>
@ -286,7 +286,7 @@
<!--## ref - label-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.id"
t-att-res-id="line['line_rec'].id"
res-model="account.move.line"
view-type="form"
>
@ -296,7 +296,7 @@
<!--## date_due-->
<div class="act_as_cell left">
<span
t-att-res-id="line.move_line_id.id"
t-att-res-id="line['line_rec'].id"
res-model="account.move.line"
view-type="form"
>
@ -310,7 +310,7 @@
<!--## amount_residual-->
<div class="act_as_cell amount">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t
@ -321,15 +321,15 @@
</div>
<!--## current-->
<div class="act_as_cell amount">
<t t-if="line.current == 0">
<t t-if="line['current'] == 0">
<span
t-field="line.current"
t-esc="line['current']"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/>
</t>
<t t-else="">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t
@ -341,15 +341,15 @@
</div>
<!--## age_30_days-->
<div class="act_as_cell amount">
<t t-if="line.age_30_days == 0">
<t t-if="line['30_days'] == 0">
<span
t-field="line.age_30_days"
t-esc="line['30_days']"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/>
</t>
<t t-else="">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t
@ -361,15 +361,15 @@
</div>
<!--## age_60_days-->
<div class="act_as_cell amount">
<t t-if="line.age_60_days == 0">
<t t-if="line['60_days'] == 0">
<span
t-field="line.age_60_days"
t-esc="line['60_days']"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/>
</t>
<t t-else="">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t
@ -381,15 +381,15 @@
</div>
<!--## age_90_days-->
<div class="act_as_cell amount">
<t t-if="line.age_90_days == 0">
<t t-if="line['90_days'] == 0">
<span
t-field="line.age_90_days"
t-esc="line['90_days']"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/>
</t>
<t t-else="">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t
@ -401,15 +401,15 @@
</div>
<!--## age_120_days-->
<div class="act_as_cell amount">
<t t-if="line.age_120_days == 0">
<t t-if="line['120_days'] == 0">
<span
t-field="line.age_120_days"
t-esc="line['120_days']"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/>
</t>
<t t-else="">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t
@ -421,15 +421,15 @@
</div>
<!--## older-->
<div class="act_as_cell amount">
<t t-if="line.older == 0">
<t t-if="line['older'] == 0">
<span
t-field="line.older"
t-esc="line['older']"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/>
</t>
<t t-else="">
<span
domain="[('id', 'in', (line.move_line_id | line.move_line_id.matched_debit_ids.mapped('debit_move_id') | line.move_line_id.matched_credit_ids.mapped('credit_move_id')).ids)]"
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line"
>
<t

1
account_financial_report/tests/__init__.py
View File

@ -1,6 +1,7 @@
# © 2016 Julien Coux (Camptocamp)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).-
from . import test_aged_partner_balance
from . import test_general_ledger
from . import test_journal_ledger
from . import test_open_items

31
account_financial_report/tests/test_aged_partner_balance.py 100644
View File

@ -0,0 +1,31 @@
# Copyright 2021 Simone Rubino - Agile Business Group
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo.tests import TransactionCase
from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, test_reports
class TestAgedPartnerBalance(TransactionCase):
def setUp(self):
super().setUp()
self.wizard_model = self.env["aged.partner.balance.report.wizard"]
def test_report(self):
"""Check that report is produced correctly."""
wizard = self.wizard_model.create(
{"show_move_line_details": True, "receivable_accounts_only": True}
)
wizard.onchange_type_accounts_only()
data = wizard._prepare_report_aged_partner_balance()
# Simulate web client behavior:
# default value is a datetime.date but web client sends back strings
data.update({"date_at": data["date_at"].strftime(DEFAULT_SERVER_DATE_FORMAT)})
result = test_reports.try_report(
self.env.cr,
self.env.uid,
"account_financial_report.aged_partner_balance",
wizard.ids,
data=data,
)
self.assertTrue(result)