Merge remote-tracking branch 'origin/15.0' into 15.0

dhongu · Oct 25, 2023 · 8f29604 · 8f29604
2 parents 4c54d59 + 11c2bb1
commit 8f29604
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 13,526 deletions.
diff --git a/README.md b/README.md
@@ -7,47 +7,6 @@ This repository hosts official romanian localization provided by OCA.
 It extends ODOO/OpenERP functionalities to be usable in Romania.
 
 
-List of Modules
----------------
 
-* OCA
-    - Se gasesc si in OCA/l10n-romania
-        + currency_rate_update_RO_BNR 
-        + l10n_ro_account_period_close 
-        + l10n_ro_vat_on_payment
-        + l10n_ro_stock
-        + l10n_ro_partner_unique
-        + l10n_ro_city
-        - l10n_ro_account_report_invoice
-        - 
-
-    - Sunt in Pool Request la OCA/l10n-romania
-        - l10n_ro_account_report_journal  
-        - l10n_ro_dvi 
-        - l10n_ro_siruta
-
-     - sunt divergente
-        - l10n_ro_config 
-        - l10n_ro_partner_create_by_vat
-
-* Terrabit - 
-    - Functionale
-        - l10n_ro_config   
-        - l10n_ro_dvi
-        - l10n_ro_intrastat
-        - l10n_ro_invoice_report
-        - l10n_ro_partner_create_by_vat
-        - l10n_ro_report_trial_balance
-        - l10n_ro_stock_picking_report
-        - l10n_ro_stock_report
-        - l10n_ro_stock_account
-
-
-ToDo:
-    - de dus in OCA:
-
-    - l10n_ro_intrastat
-    - de adus din OCA
-
 
-
+
diff --git a/l10n_ro_account_report/i18n/ro.po b/l10n_ro_account_report/i18n/ro.po
@@ -154,4 +154,4 @@ msgstr "Sold"
 #. module: l10n_ro_account_report
 #: model:ir.model,name:l10n_ro_account_report.model_report_l10n_ro_account_report_report_statement
 msgid "report.l10n_ro_account_report.report_statement"
-msgstr ""
+msgstr ""
diff --git a/l10n_ro_balance_confirmation/i18n/ro.po b/l10n_ro_balance_confirmation/i18n/ro.po
@@ -268,4 +268,4 @@ msgid ""
 "                    dumneavoastră.\n"
 "                    <br/>\n"
 "                    Prezentul extras de cont ține cont de conciliere conform procedurii arbitrale."
-msgstr ""
+msgstr ""
diff --git a/l10n_ro_intrastat/data/report.intrastat.code.csv b/l10n_ro_intrastat/data/report.intrastat.code.csv
diff --git a/l10n_ro_intrastat/data/test.xml b/l10n_ro_intrastat/data/test.xml
diff --git a/l10n_ro_intrastat/views/report_invoice.xml b/l10n_ro_intrastat/views/report_invoice.xml
diff --git a/l10n_ro_intrastat_xml/tests/test_intrastat.py b/l10n_ro_intrastat_xml/tests/test_intrastat.py
@@ -12,9 +12,11 @@ def setUp(self):
         super(TestIntrastat, self).setUp()
         self.env.user.company_id.write({"vat": "RO20603502"})
         self.intrastat = self.env["account.intrastat.code"].create(
-            {"name": "test", "code": "84221100",
-             # "suppl_unit_code": "p/st",
-             }
+            {
+                "name": "test",
+                "code": "84221100",
+                # "suppl_unit_code": "p/st",
+            }
         )
 
         self.product_1 = self.env["product.product"].create(

diff --git a/l10n_ro_invoice_report/__manifest__.py b/l10n_ro_invoice_report/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Romania - Invoice Report Terrabit",
     "summary": "Localizare Terrabit - Facturi, Chitanta",
-    "version": "15.0.3.2.0",
+    "version": "15.0.3.2.2",
     "author": "Dorin Hongu," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/l10n-romania",
     "license": "AGPL-3",

diff --git a/l10n_ro_invoice_report/i18n/hu.po b/l10n_ro_invoice_report/i18n/hu.po
@@ -436,4 +436,4 @@ msgstr ""
 #. module: l10n_ro_invoice_report
 #: model_terms:ir.ui.view,arch_db:l10n_ro_invoice_report.l10n_ro_report_invoice_document
 msgid "from"
-msgstr "tól"
+msgstr "tól"
diff --git a/l10n_ro_invoice_report/i18n/ro.po b/l10n_ro_invoice_report/i18n/ro.po
@@ -387,4 +387,4 @@ msgstr "Chitanță"
 #. module: l10n_ro_invoice_report
 #: model_terms:ir.ui.view,arch_db:l10n_ro_invoice_report.l10n_ro_report_invoice_document
 msgid "from"
-msgstr "de la"
+msgstr "de la"
diff --git a/l10n_ro_invoice_report/views/invoice_report.xml b/l10n_ro_invoice_report/views/invoice_report.xml
@@ -86,8 +86,8 @@
                             <strong>Share Capital:</strong>
                             <span t-esc="int(res_company.l10n_ro_share_capital)" />
                         </div>
-                        <div t-if="'vat_on_payment' in res_company._fields">
-                            <div t-if="res_company.vat_on_payment">
+                        <div t-if="'l10n_ro_vat_on_payment' in res_company.partner_id._fields">
+                            <div t-if="res_company.partner_id.l10n_ro_vat_on_payment">
                                 <span>Vat on payment</span>
                             </div>
                         </div>
@@ -207,7 +207,23 @@
                     </thead>
                     <!-- display_type -->
                     <tbody class="invoice_tbody">
-                        <t t-foreach="o.invoice_line_ids" t-as="l">
+                        <t t-set="current_subtotal" t-value="0" />
+                        <t
+                            t-set="lines"
+                            t-value="o.invoice_line_ids.sorted(key=lambda l: (-l.sequence, l.date, l.move_name, -l.id), reverse=True)"
+                        />
+                        <t t-foreach="lines" t-as="l">
+
+                            <t
+                                t-set="current_subtotal"
+                                t-value="current_subtotal + l.price_subtotal"
+                                groups="account.group_show_line_subtotals_tax_excluded"
+                            />
+                            <t
+                                t-set="current_subtotal"
+                                t-value="current_subtotal + l.price_total"
+                                groups="account.group_show_line_subtotals_tax_included"
+                            />
                             <tr t-if="not l.display_type">
                                 <td>
                                     <t t-esc="nr_crt" />
@@ -296,6 +312,24 @@
                                     <span t-field="l.name" t-options="{'widget': 'text'}" />
                                 </td>
                             </tr>
+                            <tr t-if="l.display_type == 'line_section'">
+                                <td colspan="99">
+                                    <strong t-field="l.name" t-options="{'widget': 'text'}" />
+                                </td>
+                                <t t-set="current_section" t-value="l" />
+                                <t t-set="current_subtotal" t-value="0" />
+                            </tr>
+                            <t t-if="current_section and (l_last or lines[l_index+1].display_type == 'line_section')">
+                                <tr class="is-subtotal text-right">
+                                    <td colspan="99">
+                                        <strong class="mr16">Subtotal:</strong>
+                                        <span
+                                            t-esc="current_subtotal"
+                                            t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"
+                                        />
+                                    </td>
+                                </tr>
+                            </t>
                         </t>
 
                         <t t-foreach="range(nr_crt,5)" t-as="l">

diff --git a/l10n_ro_invoice_report/views/res_partner_view.xml b/l10n_ro_invoice_report/views/res_partner_view.xml
diff --git a/l10n_ro_sale_order_report/i18n/ro.po b/l10n_ro_sale_order_report/i18n/ro.po
@@ -147,4 +147,4 @@ msgstr ""
 #. module: l10n_ro_sale_order_report
 #: model_terms:ir.ui.view,arch_db:l10n_ro_sale_order_report.saleorder_proforma_percent_document
 msgid "on"
-msgstr "la"
+msgstr "la"
diff --git a/l10n_ro_stock_account_check/views/stock_move_view.xml b/l10n_ro_stock_account_check/views/stock_move_view.xml
diff --git a/l10n_ro_stock_picking_report/i18n/ro.po b/l10n_ro_stock_picking_report/i18n/ro.po
@@ -626,4 +626,4 @@ msgstr ""
 #. module: l10n_ro_stock_picking_report
 #: model_terms:ir.ui.view,arch_db:l10n_ro_stock_picking_report.report_reception_text
 msgid "from the city"
-msgstr "din localitatea"
+msgstr "din localitatea"
diff --git a/l10n_ro_stock_picking_report/report/stock_picking_cumulative_view.xml b/l10n_ro_stock_picking_report/report/stock_picking_cumulative_view.xml
diff --git a/l10n_ro_stock_picking_report/security/ir.model.access.csv b/l10n_ro_stock_picking_report/security/ir.model.access.csv
diff --git a/l10n_ro_stock_picking_report/views/res_config_view.xml b/l10n_ro_stock_picking_report/views/res_config_view.xml
diff --git a/l10n_ro_stock_picking_report_product_expiry/i18n/ro.po b/l10n_ro_stock_picking_report_product_expiry/i18n/ro.po
@@ -18,4 +18,4 @@ msgstr ""
 #. module: l10n_ro_stock_picking_report_product_expiry
 #: model_terms:ir.ui.view,arch_db:l10n_ro_stock_picking_report_product_expiry.report_delivery
 msgid "Expiration Date"
-msgstr "Dată expirare"
+msgstr "Dată expirare"