Dev 19 mig igtf 19

l10n_ve_accountant/__manifest__.py

@@ -7,7 +7,7 @@
     "author": "binaural-dev",
     "website": "https://binauraldev.com/",
     "category": "Accounting/Localizations/Account Chart",
-    "version": "1.0",
+    "version": "1.3",
     "depends": [
         "base",
         "web",

l10n_ve_accountant/models/account_move.py

@@ -364,14 +364,6 @@ def _check_taxes_id(self):
                 ):
                     raise ValidationError(_("This product must have only one tax."))
 
-    @api.constrains("currency_id")
-    def _check_currency_id(self):
-        for move in self.filtered(lambda m: m.is_invoice(include_receipts=True)):
-            if move.currency_id.id != self.env.company.currency_id.id:
-                raise ValidationError(
-                    _("You cannot place a currency other than the base of the system.")
-                )
-
     def legacy_compute_line_ids_foreign_debit_and_credit(self):
         """
         This method is used to compute the foreign debit and foreign credit of the line_ids field

l10n_ve_accountant/models/account_tax.py

@@ -251,4 +251,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

@@ -1,7 +1,6 @@
 /** @odoo-module **/
 
-import { formatFloat, formatMonetary } from "@web/views/fields/formatters";
-import { parseFloat } from "@web/views/fields/parsers";
+import { formatMonetary } from "@web/views/fields/formatters";
 import { standardFieldProps } from "@web/views/fields/standard_field_props";
 import { registry } from "@web/core/registry";
 
@@ -10,12 +9,14 @@ import { patch } from "@web/core/utils/patch";
 const { Component, onPatched, onWillUpdateProps, useRef, toRaw, useState } = owl;
 
 patch(TaxTotalsComponent.prototype, {
+
+
   formatData(props) {
     let totals = JSON.parse(JSON.stringify(toRaw(props.record.data[this.props.name])));
     if (!totals) {
       return;
     }
-    const foreignCurrencyFmtOpts = { currencyId: props.record.data.foreign_currency_id && props.record.data.foreign_currency_id[0] };
+    const foreignCurrencyFmtOpts = { currencyId: props.record.data.foreign_currency_id };
     const currencyFmtOpts = { currencyId: props.record.data.currency_id && props.record.data.currency_id[0] };
     if (totals.subtotals && Array.isArray(totals.subtotals)) {
       for (let subtotal of totals.subtotals) {
@@ -35,11 +36,21 @@ patch(TaxTotalsComponent.prototype, {
     totals.formatted_total_amount_currency = formatMonetary(totals.total_amount_currency, currencyFmtOpts);
     this.totals = totals;
     return totals;
+  },
+
+  formatMonetaryForeign(value) {
+      const currency = this.props.record.data.foreign_currency_id;
+      let res = formatMonetary(value, {currencyId: currency.id});
+
+      return res;
   }
+
+
 });
+
 export class TaxTotalsComponents extends TaxTotalsComponent {
 }
-TaxTotalsComponents.template = "l10n_ve_tax.TaxForeignTotalsField";
+TaxTotalsComponents.template = "l10n_ve_accountant.TaxForeignTotalsField";
 TaxTotalsComponents.props = {
   ...standardFieldProps,
 };

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

@@ -1,6 +1,5 @@
-
 <templates xml:space="preserve">
-
+    <!-- Tax Group Component normal -->
     <t 
         t-name="l10n_ve_accountant.TaxGroupComponent" 
         t-inherit="account.TaxGroupComponent" 
@@ -19,18 +18,18 @@
 
                 <td class="o_tax_group">
                     <span class="o_tax_group_amount_value o_list_monetary">
-                        <t t-out="props.taxGroup.formatted_base_amount_currency" style="white-space: nowrap;"/>
+                        <t t-out="formatMonetary(props.taxGroup.base_amount_currency)" style="white-space: nowrap;"/>
                     </span>
                 </td>
             </tr>
         </xpath>
     </t>
-
-    <t t-name="l10n_ve_tax.TaxTotalsField" t-inherit="account.TaxTotalsField" t-inherit-mode="extension" owl="1">
+    <!-- Discounts -->
+    <t t-name="l10n_ve_accountant.TaxTotalsField" t-inherit="account.TaxTotalsField" t-inherit-mode="extension" owl="1">
         <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
@@ -54,18 +53,21 @@
             </tr>
         </xpath>
     </t>
-
-    <t t-name="l10n_ve_tax.TaxForeignTotalsField" owl="1">
-        <table t-if="totals" class="oe_right">
+    <!-- Foreign Currency Totals-->
+    <t t-name="l10n_ve_accountant.TaxForeignTotalsField" owl="1">
+        <table class="oe_right">
             <tbody>
+                <h1>
+                    <span t-out="totals.currency_id.symbol"/>
+                </h1>
                 <t t-foreach="totals.subtotals" t-as="subtotal" t-key="subtotal.name">
                     <tr>
                         <td class="o_td_label">
                             <label class="o_form_label o_tax_total_label" t-esc="subtotal.name"/>
                         </td>
                         <td class="o_list_monetary">
                             <span style="white-space: nowrap; font-weight: bold;"
-                                  t-out="subtotal.formatted_base_amount_foreign_currency"/>
+                                  t-out="formatMonetaryForeign(subtotal.base_amount_foreign_currency)"/>
                         </td>
                     </tr>
                     <t t-foreach="subtotal.tax_groups" t-as="taxGroup" t-key="taxGroup.id">
@@ -75,7 +77,7 @@
                             </td>
                             <td>
                                 <span class="o_tax_group_amount_value o_list_monetary"
-                                      t-out="taxGroup.formatted_base_amount_foreign_currency"
+                                      t-out="formatMonetaryForeign(taxGroup.base_amount_foreign_currency)"
                                       style="white-space: nowrap;"/>
                             </td>
                         </tr>
@@ -85,7 +87,7 @@
                             </td>
                             <td class="o_list_monetary">
                                 <span style="white-space: nowrap;"
-                                      t-out="taxGroup.formatted_tax_amount_foreign_currency"/>
+                                      t-out="formatMonetaryForeign(taxGroup.tax_amount_foreign_currency)"/>
                             </td>
                         </tr>
                     </t>
@@ -96,7 +98,7 @@
                     </td>
                     <td class="o_list_monetary">
                         <span style="font-size: 1.3em; font-weight: bold; white-space: nowrap;"
-                              t-out="totals.formatted_total_amount_foreign_currency"/>
+                              t-out="formatMonetaryForeign(totals.total_amount_foreign_currency)"/>
                     </td>
                 </tr>
             </tbody>

l10n_ve_accountant/views/account_move.xml

@@ -68,12 +68,29 @@
                     </group>
                 </page>
             </xpath>
+
+            <xpath expr="//page[@name='invoice_tab']"
+                position="inside">
+                    <group colspan="2" class="oe_subtotal_footer oe_right">
+                        <field name="currency_id" invisible="0" colspan="2" nolabel="1"
+                             />
+                        <group class="oe_subtotal_footer oe_right"
+                            invisible="move_type not in ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt') or payment_state == 'invoicing_legacy'">
+                            <field name="tax_totals"
+                                widget="account-tax-foreign-totals-field"
+                                nolabel="1"
+                                readonly="state != 'draft' or (move_type not in ('in_invoice', 'in_refund') and not quick_edit_mode)" />
+                        </group>
+                    </group>
+            </xpath>
+
             <xpath expr="//page/field[@name='invoice_line_ids']/list/field[@name='price_unit']"
                 position="after">
                 <field name="foreign_price" readonly="move_type != 'in_invoice'" />
             </xpath>
             <xpath expr="//page/field[@name='invoice_line_ids']/list/field[@name='price_subtotal']"
                 position="after">
+
                 <field name="foreign_currency_id" column_invisible="True" />
                 <field name="foreign_subtotal"
                 />
@@ -88,11 +105,13 @@
                     readonly="1"
                 />
             </xpath>
+
             <xpath
                 expr="//notebook/page/field[@name='invoice_line_ids']/list/field[@name='tax_ids']"
                 position="attributes">
                 <attribute name="readonly">1</attribute>
             </xpath>
+
             <xpath expr="//page/field[@name='journal_line_ids']/list/field[@name='balance']"
                 position="after">
                 <field name="foreign_currency_id" column_invisible="True" />

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):