Dev 19 mig igtf 19

l10n_ve_accountant/__manifest__.py

@@ -13,9 +13,9 @@
         "web",
         "account",
         "account_reports",
-        "purchase", 
-        "sale", 
-        "l10n_ve_base", 
+        "purchase",
+        "sale",
+        "l10n_ve_base",
         "l10n_ve_rate",
         "l10n_ve_contact",
     ],
@@ -54,5 +54,5 @@
         "web.assets_backend": ["l10n_ve_accountant/static/src/components/**/*"],
     },
     "application": True,
-    "pre_init_hook": "pre_init_hook"
+    "pre_init_hook": "pre_init_hook",
 }

l10n_ve_accountant/models/account_move.py

@@ -18,6 +18,76 @@
 class AccountMove(models.Model):
     _inherit = "account.move"
 
+    _sql_constraints = [
+        (
+            "unique_name",
+            "",
+            "Another entry with the same name already exists.",
+        ),
+        (
+            "unique_name_ve",
+            "",
+            "Another entry with the same name already exists.",
+        ),
+    ]
+
+    def _auto_init(self):
+        res = super()._auto_init()
+        if not index_exists(self.env.cr, "account_move_unique_name_ve"):
+            drop_index(self.env.cr, "account_move_unique_name", self._table)
+            # Make all values of `name` different (naming them `name (1)`, `name (2)`...) so that
+            # we can add the following UNIQUE INDEX
+            self.env.cr.execute(
+                """
+                WITH duplicated_sequence AS (
+                    SELECT name, partner_id, state, journal_id
+                    FROM account_move
+                    WHERE state = 'posted'
+                    AND name != '/'
+                    AND move_type IN ('in_invoice', 'in_refund', 'in_receipt')
+                GROUP BY partner_id, journal_id, name, state
+                    HAVING COUNT(*) > 1
+                ),
+                to_update AS (
+                    SELECT move.id,
+                        move.name,
+                        move.state,
+                        move.date,
+                        row_number() OVER(PARTITION BY move.name, move.partner_id, move.partner_id, move.date) AS row_seq
+                        FROM duplicated_sequence
+                        JOIN account_move move ON move.name = duplicated_sequence.name
+                                            AND move.partner_id = duplicated_sequence.partner_id
+                                            AND move.state = duplicated_sequence.state
+                                            AND move.journal_id = duplicated_sequence.journal_id
+                ),
+                new_vals AS (
+                    SELECT id,
+                            name || ' (' || (row_seq-1)::text || ')' AS name
+                        FROM to_update
+                        WHERE row_seq > 1
+                )
+                UPDATE account_move
+                SET name = new_vals.name
+                FROM new_vals
+                WHERE account_move.id = new_vals.id;
+            """
+            )
+
+            self.env.cr.execute(
+                """
+                CREATE UNIQUE INDEX account_move_unique_name
+                    ON account_move(
+                        name, partner_id, company_id, journal_id
+                    )
+                WHERE state = 'posted' AND name != '/';
+                CREATE UNIQUE INDEX account_move_unique_name_ve
+                    ON account_move(
+                        name, partner_id, company_id, journal_id
+                    )
+                WHERE state = 'posted' AND name != '/';
+            """
+            )
+        return res
     def _get_fields_to_compute_lines(self):
         return ["invoice_line_ids", "line_ids", "foreign_inverse_rate", "foreign_rate"]
 
@@ -304,19 +374,6 @@ def create(self, vals_list):
         Ensure that the foreign_rate and foreign_inverse_rate are computed and computes the foreign
         debit and foreign credit of the line_ids fields (journal entries) when the move is created.
         """
-        for vals in vals_list:
-
-            if 'name' in vals and vals['name'] != "/":
-
-                domain = [
-                    ('name', '=', vals['name']),
-                    ('partner_id', '=', vals.get('partner_id'))
-                ]
-                existing_record = self.search(domain, limit=1)
-
-                if existing_record:
-                    raise ValidationError(_("The operation cannot be completed: Another entry with the same name already exists."))
-
         moves = super().create(vals_list)
 
         for move in moves:

l10n_ve_accountant/models/account_tax.py

@@ -101,6 +101,7 @@ def _get_tax_totals_summary(
             currency_obj=ves_currency
         )
 
+
         # Foraneos
         res['formatted_base_amount_foreign_currency'] = formatLang(
             env=self.env,
@@ -183,7 +184,6 @@ def _get_tax_totals_summary(
                     value=res_tax_group.get('base_amount', 0.0),
                     currency_obj=ves_currency
                 )
-
                 res_tax_group['formatted_tax_amount_currency_ves'] = formatLang(
                     env=self.env,
                     value=res_tax_group.get('tax_amount', 0.0),
@@ -210,7 +210,6 @@ def _get_tax_totals_summary(
                     value=res_tax_group.get('display_base_amount_foreign_currency', 0.0),
                     currency_obj=foreign_currency_id
                 )
-        _logger.warning("TOTALES FINALES CON MONEDAS: %s", res)
         return res
 
     @api.model
@@ -289,4 +288,12 @@ def load(field, fallback, from_base_line=False):
                 if k.startswith('_') and k not in base_line:
                     base_line[k] = v
 
+        manual_fields = (
+            'manual_total_excluded',
+            'manual_total_excluded_currency',
+            'manual_total_included',
+            'manual_total_included_currency',
+        )
+        for field in manual_fields:
+            base_line.setdefault(field, None)
         return base_line

l10n_ve_accountant/models/purchase_order_line.py

@@ -17,7 +17,7 @@ def _prepare_foreign_base_line_for_taxes_computation(self):
         return self.env['account.tax']._prepare_foreign_base_line_for_taxes_computation(
             self,
             price_unit=self.foreign_price,
-            tax_ids=self.taxes_id,
+            tax_ids=self.tax_ids,
             quantity=self.product_qty,
             partner_id=self.order_id.partner_id,
             currency_id=self.order_id.foreign_currency_id,

l10n_ve_accountant/static/src/components/tax_totals/tax_totals.js

@@ -23,7 +23,6 @@ patch(TaxTotalsComponent.prototype, {
       for (let subtotal of totals.subtotals) {
         subtotal.formatted_base_amount_foreign_currency = formatMonetary(subtotal.base_amount_foreign_currency, foreignCurrencyFmtOpts);
         subtotal.formatted_base_amount_currency = formatMonetary(subtotal.base_amount_currency, currencyFmtOpts);
-        // Solo VEES
         subtotal.formatted_base_amount_currency_ves = totals.formatted_base_amount_currency_ves
 
         if (subtotal.tax_groups && Array.isArray(subtotal.tax_groups)) {

l10n_ve_accountant/static/src/components/tax_totals/tax_totals.xml

@@ -1,4 +1,3 @@
-
 <templates xml:space="preserve">
     <!-- Tax Group Component normal -->
     <t 
@@ -30,7 +29,7 @@
         <xpath expr="//table[1]/tbody[1]/t[1]" position="before">
             <tr t-if="totals.discount_amount and totals.show_discount">
                 <td class="o_td_label">
-                    <label class="o_form_label o_tax_total_label">Subtotal pinga</label>
+                    <label class="o_form_label o_tax_total_label">Subtotal</label>
                 </td>
                 <td>
                     <span

l10n_ve_igtf/__init__.py

@@ -2,7 +2,7 @@
 from . import wizard
 from . import tests
 
-from odoo.tools import column_exists, create_column
+from odoo.tools.sql import column_exists, create_column
 
 
 def pre_init_hook(env):