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

…om account_due_list
mktsrl · May 10, 2024 · 844ce25 · 844ce25
1 parent e451d7c
commit 844ce25
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 83 deletions.
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/it.po b/l10n_it_ricevute_bancarie/i18n/it.po
@@ -676,16 +676,6 @@ msgstr "Riconciliazione completa"
 msgid "General"
 msgstr "Generale"
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Group By Customer"
-msgstr "Raggruppa per cliente"
-
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
 #. 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
@@ -810,11 +800,6 @@ msgstr "Emetti RiBa"
 msgid "Issue Mode"
 msgstr "Modalità emissione"
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Issued"
-msgstr "Emessa"
-
 #. module: l10n_it_ricevute_bancarie
 #: model:ir.model,name:l10n_it_ricevute_bancarie.model_account_move
 msgid "Journal Entry"
@@ -1198,6 +1183,16 @@ msgstr "Prodotto usato come servizio per le spese di incasso RiBa"
 msgid "Protest Fee Account"
 msgstr "Conto spese di protesto"
 
+#. 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"
@@ -1230,16 +1225,6 @@ msgstr "Codice SIA"
 msgid "SMS Delivery error"
 msgstr "Errore consegna SMS"
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Sale Journals"
-msgstr "Registri vendite"
-
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "Search Journal Items"
-msgstr "Ricerca movimenti contabili"
-
 #. module: l10n_it_ricevute_bancarie
 #: code:addons/l10n_it_ricevute_bancarie/models/account.py:0
 #, python-format
@@ -1337,11 +1322,6 @@ msgstr ""
 "Questa procedura genera la registrazione contabile relativa all'accredito "
 "ricevuto dalla banca"
 
-#. module: l10n_it_ricevute_bancarie
-#: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
-msgid "To Issue"
-msgstr "Da emettere"
-
 #. module: l10n_it_ricevute_bancarie
 #: model_terms:ir.ui.view,arch_db:l10n_it_ricevute_bancarie.riba_filter
 msgid "To Reconcile"
@@ -1419,6 +1399,24 @@ msgstr "del"
 msgid "{line_name} for {month}-{year}"
 msgstr "{line_name} per {month}-{year}"
 
+#~ msgid "Group By Customer"
+#~ msgstr "Raggruppa per cliente"
+
+#~ msgid "Group By..."
+#~ msgstr "Raggruppa per..."
+
+#~ msgid "Issued"
+#~ msgstr "Emessa"
+
+#~ msgid "Sale Journals"
+#~ msgstr "Registri vendite"
+
+#~ msgid "Search Journal Items"
+#~ msgstr "Ricerca movimenti contabili"
+
+#~ msgid "To Issue"
+#~ msgstr "Da emettere"
+
 #~ msgid "No bank has been specified for partner %s!"
 #~ msgstr "Nessuna banca specificata per il partner %s."
 

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>