odoo-addon-l10n-es-aeat-sii-oca 16.0.2.5.3__py3-none-any.whl → 17.0.1.1.0__py3-none-any.whl

odoo/addons/l10n_es_aeat_sii_oca/views/account_move_views.xml

@@ -12,60 +12,55 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='thirdparty_invoice']" position="attributes">
                 <attribute
-                    name="attrs"
-                >{'invisible': [('move_type', 'not in', ('in_invoice', 'out_invoice', 'out_refund', 'in_refund'))]}</attribute>
+                    name="invisible"
+                >move_type not in ['in_invoice', 'out_invoice', 'out_refund', 'in_refund']</attribute>
             </xpath>
             <xpath expr="//field[@name='thirdparty_number']" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'required': [('thirdparty_invoice', '=', True)], 'invisible': [('thirdparty_invoice', '=', False)]}</attribute>
+                <attribute name="required">thirdparty_invoice</attribute>
+                <attribute name="invisible">not thirdparty_invoice</attribute>
             </xpath>
             <button name="button_draft" position="after">
+                <field name="aeat_state" invisible="1" />
                 <button
                     type="object"
                     string="Send to SII"
                     name="send_sii"
                     groups="l10n_es_aeat.group_account_aeat"
-                    attrs="{'invisible': ['|','|',('sii_enabled', '=', False), ('state', 'not in', ['posted']), ('aeat_state','in',['sent','cancelled'])]}"
+                    invisible="not sii_enabled or state not in ['posted'] or not aeat_send_failed"
                 />
                 <button
                     type="object"
                     string="Send cancellation to SII"
                     name="cancel_sii"
                     groups="l10n_es_aeat.group_account_aeat"
-                    attrs="{'invisible': ['|','|',('sii_enabled', '=', False), ('state', 'not in', ['cancel']), ('aeat_state', 'not in', ['sent','sent_w_errors','sent_modified'])]}"
+                    invisible="not sii_enabled or state not in ['cancel'] or aeat_state not in ['sent','sent_w_errors','sent_modified']"
                 />
             </button>
             <notebook position="inside">
-                <page
-                    string="SII"
-                    name="page_sii"
-                    attrs="{'invisible': [('sii_enabled', '=', False)]}"
-                >
+                <page string="SII" name="page_sii" invisible="not sii_enabled">
                     <group string="SII Information" name="group_sii_information">
-                        <field
-                            name="sii_description"
-                            attrs="{'required': [('sii_enabled', '=', True)]}"
-                        />
+                        <field name="sii_description" required="sii_enabled" />
                         <field name="thirdparty_invoice" />
                         <field
                             name="thirdparty_number"
-                            attrs="{'required': [('thirdparty_invoice', '=', True)], 'invisible': [('thirdparty_invoice', '=', False)]}"
+                            required="thirdparty_invoice"
+                            invisible="not thirdparty_invoice"
                         />
                         <field
                             name="sii_refund_type"
-                            attrs="{'required': [('sii_enabled', '=', True),('move_type', 'in', ('out_refund','in_refund'))], 'invisible': [('move_type', 'not in', ('out_refund','in_refund'))]}"
+                            required="sii_enabled and move_type in ['out_refund','in_refund']"
+                            invisible="move_type not in ['out_refund','in_refund']"
                         />
                         <field
                             name="sii_refund_specific_invoice_type"
-                            attrs="{'invisible': [('move_type', '!=', 'out_refund')]}"
+                            invisible="move_type != 'out_refund'"
                         />
                         <field name="sii_registration_key_domain" invisible="1" />
                         <field
                             name="sii_registration_key"
                             groups="account.group_account_invoice"
                             domain="[('type', '=', sii_registration_key_domain)]"
-                            attrs="{'required': [('sii_enabled', '=', True)]}"
+                            required="sii_enabled"
                             widget="selection"
                         />
                         <field
@@ -85,38 +80,36 @@
                             groups="account.group_account_invoice"
                             invisible="1"
                         />
+                        <label for="sii_send_date" />
+                        <div
+                            name="sii_send_date"
+                            invisible="aeat_state in ['sent','cancelled']"
+                        >
+                            <field name="sii_send_date" class="oe_inline text-break" />
+                            <button
+                                type="object"
+                                class="oi oi-arrow-right oe_link"
+                                name="send_sii"
+                                string="Send to SII"
+                            />
+                        </div>
+                        <field
+                            name="sii_needs_cancel"
+                            invisible="state != 'cancel' or aeat_state not in ['sent', 'sent_w_errors', 'sent_modified']"
+                        />
                         <field name="sii_enabled" invisible="1" />
                         <field name="sii_lc_operation" />
                         <field
                             name="sii_property_location"
                             groups="account.group_account_invoice"
-                            attrs="{
-                                'invisible': [
-                                    '|',
-                                    ('sii_registration_key_code', 'not in', ['12', '13']),
-                                    ('move_type', 'not in', ['out_invoice', 'out_refund']),
-                                ],
-                                'required': [
-                                    ('sii_registration_key_code', 'in', ['12', '13']),
-                                    ('move_type', 'in', ['out_invoice', 'out_refund']),
-                                ],
-                            }"
+                            invisible="sii_registration_key_code not in ['12', '13'] or move_type not in ['out_invoice', 'out_refund']"
+                            required="sii_registration_key_code in ['12', '13'] and move_type in ['out_invoice', 'out_refund']"
                         />
                         <field
                             name="sii_property_cadastrial_code"
                             groups="account.group_account_invoice"
-                            attrs="{
-                                'invisible': [
-                                    '|',
-                                    ('sii_registration_key_code', 'not in', ['12', '13']),
-                                    ('move_type', 'not in', ['out_invoice', 'out_refund']),
-                                ],
-                                'required': [
-                                    ('sii_registration_key_code', 'in', ['12', '13']),
-                                    ('sii_property_location', 'in', ['1', '2']),
-                                    ('move_type', 'in', ['out_invoice', 'out_refund']),
-                                ],
-                            }"
+                            invisible="sii_registration_key_code not in ['12', '13'] or move_type not in ['out_invoice', 'out_refund']"
+                            required="sii_registration_key_code in ['12', '13'] and sii_property_location in ['1', '2'] and move_type in ['out_invoice', 'out_refund']"
                         />
                     </group>
                     <group
@@ -130,15 +123,15 @@
                                     <field name="aeat_state" />
                                     <field
                                         name="sii_account_registration_date"
-                                        attrs="{'invisible': ['|',('sii_account_registration_date', '=', False),('move_type', 'not in', ['in_invoice', 'in_refund'])]}"
+                                        invisible="not sii_account_registration_date or move_type not in ['in_invoice', 'in_refund']"
                                     />
                                     <field
                                         name="aeat_send_failed"
-                                        attrs="{'invisible': [('aeat_send_failed', '=', False)]}"
+                                        invisible="not aeat_send_failed"
                                     />
                                     <field
                                         name="aeat_send_error"
-                                        attrs="{'invisible': [('aeat_send_failed', '=', False)]}"
+                                        invisible="not aeat_send_failed"
                                     />
                                     <field name="sii_csv" />
                                 </group>
@@ -167,30 +160,6 @@
             </notebook>
         </field>
     </record>
-    <record id="invoice_sii_form_connector" model="ir.ui.view">
-        <field name="name">account.invoice.sii.form - Connector</field>
-        <field name="model">account.move</field>
-        <field name="inherit_id" ref="invoice_sii_form" />
-        <field name="arch" type="xml">
-            <group name="group_sii_result" position="after">
-                <group
-                    string="Connector Jobs"
-                    name="group_sii_jobs"
-                    groups="l10n_es_aeat.group_account_aeat"
-                    cols="4"
-                >
-                    <field
-                        name="invoice_jobs_ids"
-                        options="{'reload_on_button': true}"
-                        nolabel="1"
-                        colspan="2"
-                        readonly="1"
-                        context="{'tree_view_ref': 'l10n_es_aeat_sii_oca.view_queue_job_sii'}"
-                    />
-                </group>
-            </group>
-        </field>
-    </record>
     <record id="view_account_invoice_sii_filter" model="ir.ui.view">
         <field name="name">account.invoice.select.sii</field>
         <field name="model">account.move</field>

odoo/addons/l10n_es_aeat_sii_oca/views/aeat_sii_map_view.xml

@@ -57,7 +57,7 @@
             <tree editable="bottom">
                 <field name="code" />
                 <field name="name" />
-                <field name="taxes" widget="many2many_tags" />
+                <field name="tax_xmlid_ids" widget="many2many_tags" />
             </tree>
         </field>
     </record>

odoo/addons/l10n_es_aeat_sii_oca/views/res_company_view.xml

@@ -13,7 +13,7 @@
                     <group name="sii_enabled">
                         <field name="sii_enabled" />
                     </group>
-                    <group attrs="{'invisible': [('sii_enabled', '=', False)]}">
+                    <group invisible="not sii_enabled">
                         <group name="sii_config">
                             <field name="sii_test" />
                             <field name="sii_method" />
@@ -23,26 +23,22 @@
                             <field name="sii_description_method" />
                             <field
                                 name="sii_description"
-                                attrs="{'invisible': [('sii_description_method', '!=', 'fixed')]}"
+                                invisible="sii_description_method != 'fixed'"
                             />
                             <field name="sii_header_customer" />
                             <field name="sii_header_supplier" />
                         </group>
-                        <group name="sii_connector" string="Connector config">
-                            <field name="use_connector" />
-                            <field
-                                name="send_mode"
-                                attrs="{'invisible': [('use_connector', '=', False)]}"
-                            />
+                        <group name="cron_config" string="Cron Config">
+                            <field name="send_mode" />
                             <field
                                 name='sent_time'
                                 widget='float_time'
-                                attrs="{'invisible': ['|', ('use_connector', '=', False), ('send_mode', '!=', 'fixed')]}"
+                                invisible="send_mode != 'fixed'"
                             />
                             <field
                                 name='delay_time'
                                 widget='float_time'
-                                attrs="{'invisible': ['|', ('use_connector', '=', False), ('send_mode', '!=', 'delayed')]}"
+                                invisible="send_mode != 'delayed'"
                             />
                         </group>
                     </group>

odoo/addons/l10n_es_aeat_sii_oca/wizards/account_move_reversal.py

@@ -37,12 +37,13 @@ class AccountMoveReversal(models.TransientModel):
         if (
             "sii_refund_type" in fields_list
             or "sii_refund_type_required" in fields_list
-        ) and self.env.context.get("active_model") == "account.move":
-            invoices = self.env["account.move"].browse(
-                self.env.context.get("active_ids"),
-            )
-            to_refund = invoices.filtered(
-                lambda i: i.move_type in ("in_invoice", "out_invoice")
+        ):
+            to_refund = self.env["account.move"].search(
+                [
+                    ("id", "in", self.env.context.get("active_ids")),
+                    ("move_type", "in", ["in_invoice", "out_invoice"]),
+                    ("journal_id.sii_enabled", "=", True),
+                ]
             )
             if any(to_refund.mapped("company_id.sii_enabled")):
                 defaults["sii_refund_type"] = "I"
@@ -56,9 +57,9 @@ class AccountMoveReversal(models.TransientModel):
                 )
         return defaults
 
-    def reverse_moves(self):
+    def reverse_moves(self, is_modify=False):
         obj = self.with_context(
             sii_refund_type=self.sii_refund_type,
             supplier_invoice_number=self.supplier_invoice_number_refund,
         )
-        return super(AccountMoveReversal, obj).reverse_moves()
+        return super(AccountMoveReversal, obj).reverse_moves(is_modify)

odoo/addons/l10n_es_aeat_sii_oca/wizards/account_move_reversal_views.xml

@@ -11,11 +11,13 @@
                 <field name="supplier_invoice_number_refund_required" invisible="1" />
                 <field
                     name="sii_refund_type"
-                    attrs="{'required': [('sii_refund_type_required', '=', True)], 'invisible': [('sii_refund_type_required', '=', False)]}"
+                    required="sii_refund_type_required"
+                    invisible="not sii_refund_type_required"
                 />
                 <field
                     name="supplier_invoice_number_refund"
-                    attrs="{'required': [('supplier_invoice_number_refund_required', '=', True)], 'invisible': [('supplier_invoice_number_refund_required', '=', False)]}"
+                    required="supplier_invoice_number_refund_required"
+                    invisible="not supplier_invoice_number_refund_required"
                 />
             </field>
         </field>

odoo/addons/l10n_es_aeat_sii_oca/wizards/account_move_send_sii.py

@@ -8,34 +8,30 @@ class SendSIIWizard(models.TransientModel):
     _name = "wizard.send.sii"
     _description = "Send SII Wizard"
 
-    sending_number = fields.Integer(string="Invoices Jobs Process Sending")
-    sent_number = fields.Integer(string="Invoices SII Sent")
+    sending_number = fields.Integer()
+    not_send_without_errors_number = fields.Integer()
+    with_errors_number = fields.Integer()
+    modified_number = fields.Integer()
     account_move_ids = fields.Many2many("account.move", string="Invoices")
 
     def default_get(self, fields):
         res = super().default_get(fields)
-        # get the records selected
         active_model = self.env.context.get("active_model")
         active_ids = self.env.context.get("active_ids", [])
         account_moves = self.env[active_model].browse(active_ids)
-        # filter the records that have jobs associated
-        invoices_with_jobs_ids = account_moves.filtered(lambda i: (i.invoice_jobs_ids))
-        # and calculate the number of invoices in process of sending or sent
-        sending_number = len(invoices_with_jobs_ids)
-        sent_number = 0
-        for invoice in invoices_with_jobs_ids:
-            if all(invoice.invoice_jobs_ids.mapped("state")) == "failed":
-                sending_number -= 1
-            elif all(invoice.invoice_jobs_ids.mapped("state")) == "cancelled":
-                sending_number -= 1
-            elif any(invoice.invoice_jobs_ids.mapped("state")) == "done":
-                sent_number += 1
-        # update the values of the wizard
+        not_send_without_errors = account_moves.filtered(
+            lambda a: a.aeat_state == "not_sent" and not a.aeat_send_failed
+        )
+        with_errors = account_moves.filtered(lambda a: a.aeat_send_failed)
+        modified = account_moves.filtered(
+            lambda a: a.aeat_state in ["sent_modified", "cancelled_modified"]
+        )
         res.update(
             {
-                "sending_number": sending_number,
-                "sent_number": sent_number,
-                "account_move_ids": [(6, 0, active_ids)],
+                "sending_number": len(account_moves),
+                "not_send_without_errors_number": len(not_send_without_errors),
+                "with_errors_number": len(with_errors),
+                "modified_number": len(modified),
             }
         )
         return res

odoo/addons/l10n_es_aeat_sii_oca/wizards/account_move_send_sii_views.xml

@@ -7,10 +7,21 @@
         <field name="model">wizard.send.sii</field>
         <field name="arch" type="xml">
             <form>
+                <p
+                    class="alert alert-info"
+                    role="alert"
+                    invisible="not_send_without_errors_number == 0"
+                >
+                    <field
+                        name="not_send_without_errors_number"
+                        widget="statinfo"
+                        string="of the selected invoices have not been sent to to the SII yet and will be sent."
+                    />
+                </p>
                 <p
                     class="alert alert-warning"
                     role="alert"
-                    attrs="{'invisible': [('sending_number', '=', 0)]}"
+                    invisible="sending_number == 0"
                 >
                     <field
                         name="sending_number"
@@ -19,14 +30,36 @@
                     />
                 </p>
                 <p
-                    class="alert alert-danger"
+                    class="alert alert-info"
+                    role="alert"
+                    invisible="with_errors_number == 0"
+                >
+                    <field
+                        name="with_errors_number"
+                        widget="statinfo"
+                        string="of the selected invoices failed when trying to send them to the SII. If confirm, they will be resent"
+                    />
+                </p>
+                <p
+                    class="alert alert-info"
+                    role="alert"
+                    invisible="with_errors_number == 0"
+                >
+                    <field
+                        name="with_errors_number"
+                        widget="statinfo"
+                        string="of the selected invoices failed when trying to send them to the SII. If confirm, they will be resent"
+                    />
+                </p>
+                <p
+                    class="alert alert-info"
                     role="alert"
-                    attrs="{'invisible': [('sent_number', '=', 0)]}"
+                    invisible="modified_number == 0"
                 >
                     <field
-                        name="sent_number"
+                        name="modified_number"
                         widget="statinfo"
-                        string="of the selected invoices have been correctly sent to the SII. If you confirm, they will be resent."
+                        string="of the selected invoices have changed but changes have not been sent to the SII yet. If you confirm, they will be sent to sii."
                     />
                 </p>
                 <footer>