Merge branch '15.0' into 16.0-imp-002-jl

indexa-git · Aug 14, 2023 · 71284c8 · 71284c8
2 parents 848958d + 6018211
commit 71284c8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/l10n_do_accounting/__manifest__.py b/l10n_do_accounting/__manifest__.py
@@ -8,7 +8,7 @@
     "category": "Localization",
     "license": "LGPL-3",
     "website": "https://github.com/odoo-dominicana",
-    "version": "16.0.1.1.2",
+    "version": "16.0.1.1.3",
     # any module necessary for this one to work correctly
     "depends": ["l10n_latam_invoice_document", "l10n_do"],
     # always loaded

diff --git a/l10n_do_accounting/i18n/es_DO.po b/l10n_do_accounting/i18n/es_DO.po
@@ -1334,3 +1334,9 @@ msgstr ""
 #, python-format
 msgid "special from Tax Paying"
 msgstr "Exento"
+
+#. module: l10n_do_accounting
+#: code:addons/l10n_do_accounting/models/account_move.py:0
+#, python-format
+msgid "You cannot cancel a fiscal document that has not been posted before."
+msgstr "No puede cancelar un documento fiscal que no haya sido posteado anteriormente."
diff --git a/l10n_do_accounting/models/account_move.py b/l10n_do_accounting/models/account_move.py
@@ -357,7 +357,6 @@ def button_cancel(self):
             lambda inv: inv.country_code == "DO"
             and self.move_type[-6:] in ("nvoice", "refund")
             and inv.l10n_latam_use_documents
-            and not inv.is_ecf_invoice
         )
 
         if len(fiscal_invoice) > 1:
@@ -370,6 +369,9 @@ def button_cancel(self):
         ):
             raise AccessError(_("You are not allowed to cancel Fiscal Invoices"))
 
+        if fiscal_invoice and not fiscal_invoice.posted_before:
+            raise ValidationError(_("You cannot cancel a fiscal document that has not been posted before."))
+
         if fiscal_invoice and not self.env.context.get("skip_cancel_wizard", False):
             action = self.env.ref(
                 "l10n_do_accounting.action_account_move_cancel"

diff --git a/l10n_do_accounting/views/account_move_views.xml b/l10n_do_accounting/views/account_move_views.xml
@@ -21,16 +21,6 @@
                     Notice. This company is in a transient state of contingency for Electronic Invoice issuing. NCF issuing has been enabled.
                 </div>
             </xpath>
-            <xpath expr="//button[@name='button_cancel']" position="attributes">
-                <attribute name="attrs">{
-                    'invisible': ['|', '|',
-                    ('id', '=', False),
-                    '&amp;', ('state', '!=', 'draft'),
-                    ('country_code', '!=', 'DO'),
-                    '&amp;', ('state', 'in', ('draft', 'cancel')),
-                    ('country_code', '=', 'DO')]
-                }</attribute>
-            </xpath>
             <xpath expr="//button[@name='button_draft']" position="attributes">
                 <attribute name="attrs">{
                     'invisible': ['|', '|',