Skip to content

Commit

Permalink
[16.0][MIG] l10n_es_aeat_mod349: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
FernandoRomera committed Feb 8, 2023
1 parent c22406a commit 14bf29c
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
2 changes: 1 addition & 1 deletion l10n_es_aeat_mod349/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{
"name": "AEAT modelo 349",
"version": "15.0.1.3.0",
"version": "16.0.1.0.0",
"author": "Tecnativa, ForgeFlow, Odoo Community Association (OCA)",
"license": "AGPL-3",
"category": "Localisation/Accounting",
Expand Down
20 changes: 10 additions & 10 deletions l10n_es_aeat_mod349/models/mod349.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ def _create_349_details(self, move_lines):
self._create_349_record_detail(move_line)

def _create_349_record_detail(self, move_line):
types = move_line.move_id.mapped("line_ids.account_id.internal_type")
sign = 1 if "payable" in types else -1
types = move_line.move_id.mapped("line_ids.account_id.account_type")
sign = 1 if "liability_payable" in types else -1
return self.env["l10n.es.aeat.mod349.partner_record_detail"].create(
{
"report_id": self.id,
Expand All @@ -137,8 +137,8 @@ def _create_349_record_detail(self, move_line):
)

def _create_349_refund_detail(self, move_line):
types = move_line.move_id.mapped("line_ids.account_id.internal_type")
sign = 1 if "receivable" in types else -1
types = move_line.move_id.mapped("line_ids.account_id.account_type")
sign = 1 if "asset_receivable" in types else -1
return self.env["l10n.es.aeat.mod349.partner_refund_detail"].create(
{
"report_id": self.id,
Expand Down Expand Up @@ -199,10 +199,10 @@ def _create_349_refund_records(self):
for refund_detail in self.partner_refund_detail_ids:
move_line = refund_detail.refund_line_id
origin_invoice = move_line.move_id.reversed_entry_id
groups.setdefault(origin_invoice, refund_detail_obj)
groups[origin_invoice] += refund_detail
for origin_invoice in groups:
refund_details = groups[origin_invoice]
key = (origin_invoice, move_line.l10n_es_aeat_349_operation_key)
groups.setdefault(key, refund_detail_obj)
groups[key] += refund_detail
for (origin_invoice, op_key), refund_details in groups.items():
refund_detail = first(refund_details)
move_line = refund_detail.refund_line_id
partner = move_line.partner_id
Expand Down Expand Up @@ -382,7 +382,7 @@ def calculate(self):
self._create_349_invoice_records()
self._create_349_refund_records()
# Recompute all pending computed fields
self.recompute()
self.flush_recordset()
return True

def button_recover(self):
Expand Down Expand Up @@ -427,7 +427,7 @@ def button_confirm(self):
"""Checks if all the fields of the report are correctly filled"""
self._check_names()
self._check_report_lines()
return super(Mod349, self).button_confirm()
return super().button_confirm()


class Mod349PartnerRecord(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion l10n_es_aeat_mod349/tests/test_l10n_es_aeat_mod349.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,5 @@ def test_model_349(self):
self.assertTrue(export_to_boe._export_config(model349, export_config))
# Test report printing
self.env.ref("l10n_es_aeat_mod349.act_report_aeat_mod349_pdf")._render(
model349.ids
"l10n_es_aeat_mod349.report_l10n_es_mod349_pdf", model349.ids, {}
)
9 changes: 6 additions & 3 deletions l10n_es_aeat_mod349/views/account_move_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@
<record id="view_move_form" model="ir.ui.view">
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form" />
<field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />
<field name="arch" type="xml">
<field name="fiscal_position_id" position="after">
<field
name="eu_triangular_deal"
groups="l10n_es_aeat.group_account_aeat"
groups="l10n_es_aeat.group_account_aeat,account.group_account_invoice"
/>
</field>
<xpath
expr="//field[@name='invoice_line_ids']/tree/field[@name='tax_ids']"
position="after"
>
<field name="l10n_es_aeat_349_operation_key" invisible="1" />
<field
name="l10n_es_aeat_349_operation_key"
invisible="1"
groups="l10n_es_aeat.group_account_aeat,account.group_account_invoice"
/>
</xpath>
</field>
</record>
Expand Down
1 change: 1 addition & 0 deletions setup/l10n_es_aeat_mod349/odoo/addons/l10n_es_aeat_mod349
6 changes: 6 additions & 0 deletions setup/l10n_es_aeat_mod349/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

0 comments on commit 14bf29c

Please sign in to comment.