[FIX][l10n_it_ricevute_bancarie] fix issue OCA#3216 and add depens fr…

…om account_due_list
odooNextev · Jun 27, 2023 · 26ddf62 · 26ddf62
1 parent 63532d8
commit 26ddf62
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ addon | version | maintainers | summary
 [l10n_it_rea](l10n_it_rea/) | 14.0.1.0.4 |  | Gestisce i campi del Repertorio Economico Amministrativo
 [l10n_it_reverse_charge](l10n_it_reverse_charge/) | 14.0.1.2.2 |  | Inversione contabile
 [l10n_it_riba_sale_commission](l10n_it_riba_sale_commission/) | 14.0.1.0.0 |  | Modulo ponte tra provvigioni agenti e RiBa
-[l10n_it_ricevute_bancarie](l10n_it_ricevute_bancarie/) | 14.0.1.2.3 |  | Ricevute bancarie
+[l10n_it_ricevute_bancarie](l10n_it_ricevute_bancarie/) | 14.0.1.3.0 |  | Ricevute bancarie
 [l10n_it_sdi_channel](l10n_it_sdi_channel/) | 14.0.2.3.0 | [![sergiocorato](https://github.com/sergiocorato.png?size=30px)](https://github.com/sergiocorato) | Aggiunge il canale di invio/ricezione dei file XML attraverso lo SdI
 [l10n_it_split_payment](l10n_it_split_payment/) | 14.0.1.0.7 |  | Scissione pagamenti
 [l10n_it_vat_payability](l10n_it_vat_payability/) | 14.0.1.0.2 |  | ITA - Esigibilità IVA

diff --git a/l10n_it_ricevute_bancarie/__manifest__.py b/l10n_it_ricevute_bancarie/__manifest__.py
@@ -9,7 +9,7 @@
 
 {
     "name": "ITA - Ricevute bancarie",
-    "version": "14.0.1.2.3",
+    "version": "14.0.1.3.0",
     "development_status": "Beta",
     "author": "Odoo Community Association (OCA)",
     "category": "Localization/Italy",
@@ -18,6 +18,7 @@
     "license": "AGPL-3",
     "depends": [
         "account",
+        "account_due_list",
         "l10n_it_fatturapa_out",
         "l10n_it_fiscalcode",
         "base_iban",

diff --git a/l10n_it_ricevute_bancarie/i18n/l10n_it_ricevute_bancarie.pot b/l10n_it_ricevute_bancarie/i18n/l10n_it_ricevute_bancarie.pot
@@ -656,16 +656,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Group By Customer"
-msgstr ""
-
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Group By..."
-msgstr ""
-
 #. module: l10n_it_ricevute_bancarie
 #: model:ir.model.fields,field_description:l10n_it_ricevute_bancarie.field_res_partner__group_riba
 #: model:ir.model.fields,field_description:l10n_it_ricevute_bancarie.field_res_users__group_riba
@@ -790,11 +780,6 @@ msgstr ""
 msgid "Issue Mode"
 msgstr ""
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Issued"
-msgstr ""
-
 #. module: l10n_it_ricevute_bancarie
 #: model:ir.model,name:l10n_it_ricevute_bancarie.model_account_move
 msgid "Journal Entry"
@@ -1180,6 +1165,16 @@ msgstr ""
 msgid "Protest Fee Account"
 msgstr ""
 
+#. module: l10n_it_ricevute_bancarie
+#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
+msgid "RIBA Issued"
+msgstr ""
+
+#. module: l10n_it_ricevute_bancarie
+#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
+msgid "RIBA To Issue"
+msgstr ""
+
 #. module: l10n_it_ricevute_bancarie
 #: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
 msgid "Reconciled"
@@ -1212,16 +1207,6 @@ msgstr ""
 msgid "SMS Delivery error"
 msgstr ""
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Sale Journals"
-msgstr ""
-
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Search Journal Items"
-msgstr ""
-
 #. module: l10n_it_ricevute_bancarie
 #: code:addons/l10n_it_ricevute_bancarie/models/account.py:0
 #, python-format
@@ -1311,11 +1296,6 @@ msgid ""
 "the bank"
 msgstr ""
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "To Issue"
-msgstr ""
-
 #. module: l10n_it_ricevute_bancarie
 #: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
 msgid "To Reconcile"

diff --git a/l10n_it_ricevute_bancarie/views/account_view.xml b/l10n_it_ricevute_bancarie/views/account_view.xml
@@ -72,16 +72,18 @@
     <record id="riba_filter" model="ir.ui.view">
         <field name="name">C/O filter</field>
         <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account_due_list.view_payments_filter" />
         <field name="arch" type="xml">
-            <search string="Search Journal Items">
+            <xpath expr="//search" position="inside">
+                <separator />
                 <filter
                     name="da_emettere"
-                    string="To Issue"
+                    string="RIBA To Issue"
                     domain="[('distinta_line_ids', '=', False)]"
                 />
                 <filter
                     name="emesse"
-                    string="Issued"
+                    string="RIBA Issued"
                     domain="[('distinta_line_ids', '!=', False)]"
                 />
                 <filter
@@ -94,30 +96,13 @@
                     string="To Reconcile"
                     domain="[('reconciled', '=', False)]"
                 />
+                <separator />
                 <filter
                     name="unsolved"
                     string="Past Due"
                     domain="[('unsolved_invoice_ids', '!=', False)]"
                 />
-                <filter
-                    name="sale_journal"
-                    string="Sale Journals"
-                    domain="[('journal_id.type', '=', 'sale')]"
-                />
-                <field name="account_id" />
-                <field name="partner_id" />
-                <field name="move_id" />
-                <!-- TODO: field name="invoice_origin"/-->
-                <field name="date_maturity" />
-                <group expand="0" string="Group By...">
-                    <filter
-                        name="filter_customer"
-                        string="Group By Customer"
-                        context="{'group_by':'partner_id'}"
-                    />
-                    <!-- <filter name="filter_invoice" string="Group By Invoice" context="{'group_by':'stored_invoice_id'}"/> Matteo Boscolo-->
-                </group>
-            </search>
+            </xpath>
         </field>
     </record>