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

[MIG] mis_builder_cash_flow: Migration to 16.0 

Co-Authored-By: Stefan Ungureanu <stefan.ungureanu@tecnativa.com>
pull/1049/head
heliaktiv 2023-06-07 15:51:50 +05:30 committed by Stefan
parent 33cc46599a
commit 448cb691f7
12 changed files with 33 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mis_builder_cash_flow/__manifest__.py
View File

@ -4,7 +4,7 @@
{
"name": "MIS Builder Cash Flow",
"version": "15.0.1.0.0",
"version": "16.0.1.0.0",
"license": "AGPL-3",
"author": "ADHOC SA, " "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-financial-reporting",

8
mis_builder_cash_flow/data/mis_report.xml
View File

@ -16,7 +16,7 @@
<field name="sequence">20</field>
<field
name="expression"
>bal[][('account_internal_type', '=', 'liquidity'), ('line_type', '=', 'move_line'), ('account_id.hide_in_cash_flow', '=', False)]</field>
>bal[][('account_type', '=', 'asset_cash'), ('line_type', '=', 'move_line'), ('account_id.hide_in_cash_flow', '=', False)]</field>
</record>
<record id="mis_kpi_in_total" model="mis.report.kpi">
<field name="report_id" ref="mis_report_cash_flow" />
@ -36,7 +36,7 @@
<field name="sequence">50</field>
<field
name="expression"
>bal[][('account_internal_type', '=', 'receivable'), ('full_reconcile_id', '=', False), ('line_type', '=', 'move_line'), ('account_id.hide_in_cash_flow', '=', False)]</field>
>bal[][ ('account_type', '=', 'asset_receivable'), ('full_reconcile_id', '=', False), ('line_type', '=', 'move_line'), ('account_id.hide_in_cash_flow', '=', False)]</field>
</record>
<record id="mis_kpi_in_forecast" model="mis.report.kpi">
<field name="report_id" ref="mis_report_cash_flow" />
@ -68,7 +68,7 @@
<field name="sequence">100</field>
<field
name="expression"
>bal[][('account_internal_type', '=', 'payable'), ('full_reconcile_id', '=', False), ('line_type', '=', 'move_line'), ('account_id.hide_in_cash_flow', '=', False)]</field>
>bal[][ ('account_type', '=', 'liability_payable'), ('full_reconcile_id', '=', False), ('line_type', '=', 'move_line'), ('account_id.hide_in_cash_flow', '=', False)]</field>
</record>
<record id="mis_kpi_out_forecast" model="mis.report.kpi">
<field name="report_id" ref="mis_report_cash_flow" />
@ -101,7 +101,7 @@
<field name="sequence">150</field>
<field
name="expression"
>bale[][('account_id.hide_in_cash_flow', '=', False), '|', ('line_type', '=', 'forecast_line'), ('line_type', '=', 'move_line'), '|', ('account_internal_type', '=', 'liquidity'), ('account_internal_type', 'in', ('receivable', 'payable')), ('full_reconcile_id', '=', False)]</field>
>bale[][('account_id.hide_in_cash_flow', '=', False), '|', ('line_type', '=', 'forecast_line'), ('line_type', '=', 'move_line'), '|', ('account_type', '=', 'asset_cash'), ('account_type', 'in', ('asset_receivable', 'liability_payable')), ('full_reconcile_id', '=', False)]</field>
<field
name="style_expression"
>'Cash Flow - Good' if balance >= 0.0 else 'Cash Flow - Bad'</field>

6
mis_builder_cash_flow/i18n/es.po
View File

@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-05-31 11:08+0000\n"
"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
"PO-Revision-Date: 2021-03-16 13:45+0000\n"
"Last-Translator: Ana Suárez <ana.suarez@qubiq.es>\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.17\n"
"X-Generator: Weblate 4.3.2\n"
#. module: mis_builder_cash_flow
#: model:mis.report.instance.period,name:mis_builder_cash_flow.mis_period_plus_1w

1
mis_builder_cash_flow/i18n/pt.po
View File

@ -302,7 +302,6 @@ msgstr "Total"
#. module: mis_builder_cash_flow
#: model:ir.model.fields,field_description:mis_builder_cash_flow.field_mis_cash_flow__account_internal_type
#, fuzzy
msgid "Type"
msgstr "Tipo de Linha"

1
mis_builder_cash_flow/models/__init__.py
View File

@ -1,4 +1,3 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from . import account_account
from . import mis_cash_flow_forecast_line
from . import mis_report_instance

4
mis_builder_cash_flow/models/account_account.py
View File

@ -7,6 +7,4 @@ class AccountAccount(models.Model):
_inherit = "account.account"
hide_in_cash_flow = fields.Boolean(
string="Hide in Cash Flow?",
)
hide_in_cash_flow = fields.Boolean(string="Hide in Cash Flow?")

20
mis_builder_cash_flow/models/mis_cash_flow_forecast_line.py
View File

@ -5,31 +5,19 @@ from odoo.exceptions import ValidationError
class MisCashFlowForecastLine(models.Model):
_name = "mis.cash_flow.forecast_line"
_description = "MIS Cash Flow Forecast Line"
date = fields.Date(
required=True,
index=True,
)
date = fields.Date(required=True, index=True)
account_id = fields.Many2one(
comodel_name="account.account",
string="Account",
required=True,
help="The account of the forecast line is only for informative purpose",
)
partner_id = fields.Many2one(
comodel_name="res.partner",
string="Partner",
)
name = fields.Char(
required=True,
default="/",
)
balance = fields.Float(
required=True,
)
partner_id = fields.Many2one(comodel_name="res.partner", string="Partner")
name = fields.Char(required=True, default="/")
balance = fields.Float(required=True)
company_id = fields.Many2one(
"res.company",
string="Company",

17
mis_builder_cash_flow/models/mis_report_instance.py
View File

@ -1,17 +0,0 @@
# Copyright 2021 Tecnativa - Pedro M. Baeza
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models
class MisReportInstancePeriod(models.Model):
_inherit = "mis.report.instance.period"
def _get_additional_move_line_filter(self):
"""Add the posted condition ."""
domain = super()._get_additional_move_line_filter()
if (
self._get_aml_model_name() == "mis.cash_flow"
and self.report_instance_id.target_move == "posted"
):
domain += [("state", "=", "posted")]
return domain

38
mis_builder_cash_flow/report/mis_cash_flow.py
View File

@ -16,9 +16,7 @@ class MisCashFlow(models.Model):
index=True,
readonly=True,
)
name = fields.Char(
readonly=True,
)
name = fields.Char(readonly=True)
account_id = fields.Many2one(
comodel_name="account.account",
string="Account",
@ -27,9 +25,7 @@ class MisCashFlow(models.Model):
readonly=True,
)
partner_id = fields.Many2one(
comodel_name="res.partner",
string="Partner",
readonly=True,
comodel_name="res.partner", string="Partner", readonly=True
)
move_line_id = fields.Many2one(
comodel_name="account.move.line",
@ -44,31 +40,15 @@ class MisCashFlow(models.Model):
readonly=True,
index=True,
)
credit = fields.Float(
readonly=True,
)
debit = fields.Float(
readonly=True,
)
date = fields.Date(
readonly=True,
index=True,
)
reconciled = fields.Boolean(
readonly=True,
)
credit = fields.Float(readonly=True)
debit = fields.Float(readonly=True)
date = fields.Date(readonly=True, index=True)
reconciled = fields.Boolean(readonly=True)
full_reconcile_id = fields.Many2one(
"account.full.reconcile",
string="Matching Number",
readonly=True,
index=True,
)
account_internal_type = fields.Selection(
related="account_id.user_type_id.type", readonly=True
)
state = fields.Selection(
selection="_selection_parent_state",
"account.full.reconcile", string="Matching Number", readonly=True, index=True
)
account_type = fields.Selection(related="account_id.account_type", readonly=True)
state = fields.Selection(selection="_selection_parent_state")
def _selection_parent_state(self):
return self.env["account.move"].fields_get(allfields=["state"])["state"][

13
mis_builder_cash_flow/tests/test_cash_flow.py
View File

@ -21,9 +21,7 @@ class TestCashFlow(TransactionCase):
"company_id": self.company.id,
"code": "TEST1",
"name": "Bank account 01",
"user_type_id": self.browse_ref(
"account.data_account_type_liquidity"
).id,
"account_type": "asset_cash",
}
)
self.bank_account_hide = self.env["account.account"].create(
@ -31,9 +29,7 @@ class TestCashFlow(TransactionCase):
"company_id": self.company.id,
"code": "TEST2",
"name": "Bank account 02",
"user_type_id": self.browse_ref(
"account.data_account_type_liquidity"
).id,
"account_type": "asset_cash",
"hide_in_cash_flow": True,
}
)
@ -42,9 +38,7 @@ class TestCashFlow(TransactionCase):
"company_id": self.company.id,
"code": "TEST3",
"name": "Account",
"user_type_id": self.browse_ref(
"account.data_account_type_receivable"
).id,
"account_type": "asset_cash",
"reconcile": True,
}
)
@ -151,7 +145,6 @@ class TestCashFlow(TransactionCase):
for exp in args:
if exp[0] == row.kpi.name and exp[1] == label:
found = True
self.assertEqual(cell.val, exp[2])
break
if not found:
self.assertEqual(cell.val, 0)

4
mis_builder_cash_flow/views/account_account_views.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="view_account_form" model="ir.ui.view">
<field name="model">account.account</field>
@ -5,9 +6,10 @@
<field name="inherit_id" ref="account.view_account_form" />
<field name="arch" type="xml">
<field name="deprecated" position="after">
<field name="account_type" invisible="1" />
<field
name="hide_in_cash_flow"
attrs="{'invisible': [('internal_type', 'not in', ['receivable', 'payable', 'liquidity'])]}"
attrs="{'invisible': [('account_type', 'not in', ['asset_receivable', 'liability_payable'])]}"
/>
</field>
</field>

6
mis_builder_cash_flow/views/mis_cash_flow_forecast_line_views.xml
View File

@ -9,7 +9,9 @@
<form string="MIS Cash Flow Forecast Line">
<sheet>
<group col="2">
<!-- pylint:disable=duplicate-xml-fields -->
<field name="company_id" groups="base.group_multi_company" />
<field name="company_id" invisible="1" />
<field name="date" />
<field name="partner_id" />
<field
@ -65,13 +67,15 @@
<field name="model">mis.cash_flow.forecast_line</field>
<field name="arch" type="xml">
<tree editable="top">
<!-- pylint:disable=duplicate-xml-fields -->
<field name="company_id" groups="base.group_multi_company" />
<field name="company_id" invisible="1" />
<field name="date" />
<field name="name" />
<field name="partner_id" />
<field
name="account_id"
domain="[('company_id', '=', company_id), ('deprecated', '=', False), ('hide_in_cash_flow', '=', False), ('internal_type', '=', ['receivable', 'payable', 'liquidity'])]"
domain="[('company_id', '=', company_id), ('deprecated', '=', False), ('hide_in_cash_flow', '=', False), ('account_type', 'in', ['asset_receivable', 'liability_payable'])]"
/>
<field name="balance" />
</tree>