diff --git a/l10n_es_aeat_mod349/__manifest__.py b/l10n_es_aeat_mod349/__manifest__.py
index 28e35b8cde7..d5cf696534c 100644
--- a/l10n_es_aeat_mod349/__manifest__.py
+++ b/l10n_es_aeat_mod349/__manifest__.py
@@ -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",
diff --git a/l10n_es_aeat_mod349/models/mod349.py b/l10n_es_aeat_mod349/models/mod349.py
index 47a842b99c6..4035c3ec807 100644
--- a/l10n_es_aeat_mod349/models/mod349.py
+++ b/l10n_es_aeat_mod349/models/mod349.py
@@ -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,
@@ -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,
@@ -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):
@@ -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):
diff --git a/l10n_es_aeat_mod349/tests/test_l10n_es_aeat_mod349.py b/l10n_es_aeat_mod349/tests/test_l10n_es_aeat_mod349.py
index d522d22acc7..fcb58d77b7e 100644
--- a/l10n_es_aeat_mod349/tests/test_l10n_es_aeat_mod349.py
+++ b/l10n_es_aeat_mod349/tests/test_l10n_es_aeat_mod349.py
@@ -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, {}
         )
diff --git a/l10n_es_aeat_mod349/views/account_move_view.xml b/l10n_es_aeat_mod349/views/account_move_view.xml
index c540ca69187..b271231a7ea 100644
--- a/l10n_es_aeat_mod349/views/account_move_view.xml
+++ b/l10n_es_aeat_mod349/views/account_move_view.xml
@@ -3,12 +3,11 @@
     <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