Merge lp:~mukunde/unifield-server/US-6844 into lp:unifield-server

[jftempo]

[lp:~mukunde/unifield-server/US-6844]

6242. By Gaël Mukunde on 2022-09-16

US-6844 [IMP] French Translation

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2022-04-27 14:25:25 +0000
+++ bin/addons/account/account_invoice_view.xml	2022-09-16 12:32:47 +0000
@@ -636,12 +636,18 @@
                         <filter name="imported" icon="gtk-apply" string="Imported" domain="[('imported_state', '=', 'imported')]"/>
                         <separator orientation="vertical"/>
                         <filter name="open_fy" icon="terp-go-year" string="Open FY" domain="[('open_fy', '=', True)]"/>
+                        <separator orientation="vertical"/>
+                        <filter name="draft_cp" icon="terp-document-new" string="Draft Counterparts" domain="[('counterpart_inv_status','=','draft')]" help="Draft Counterparts Invoices"/>
+                        <filter name="open_cp" icon="terp-dolar_ok!" string="Open Counterparts" domain="[('counterpart_inv_status','=','open')]" help="Open Counterparts Invoices"/>
+                        <filter name="paid_cp" icon="terp-dolar" string="Paid Counterparts" domain="[('counterpart_inv_status', '=', 'paid')]"/>
+                        <filter name="closed_cp" icon="terp-dialog-close" string="Closed Counterparts" domain="[('counterpart_inv_status', '=', 'inv_close')]" />
 
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
                         <field name="origin"/>
                     </group>
+
                     <newline/>
                     <group col="10" colspan="4">
                         <field name="journal_id" select='1' context="{'search_default_filter_is_active': 1}"/>

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2022-07-12 16:11:39 +0000
+++ bin/addons/account/invoice.py	2022-09-16 12:32:47 +0000
@@ -438,12 +438,37 @@
                 if filter_node:
                     filter_node[0].getparent().remove(filter_node[0])
                 res['arch'] = etree.tostring(doc)
-            # remove the Open FY filter in all invoices but IVO, STV, IVI and ISI
+            # remove the Open FY and counterparts status filters in all invoices but IVO, STV, IVI and ISI
             if not context.get('doc_type', '') in ('ivo', 'stv', 'ivi', 'isi'):
                 doc = etree.XML(res['arch'])
                 filter_node = doc.xpath("/search/group[1]/filter[@name='open_fy']")
+                draft_node = doc.xpath("/search/group[1]/filter[@name='draft_cp']")
+                open_node = doc.xpath("/search/group[1]/filter[@name='open_cp']")
+                paid_node = doc.xpath("/search/group[1]/filter[@name='paid_cp']")
+                closed_node = doc.xpath("/search/group[1]/filter[@name='closed_cp']")
                 if filter_node:
                     filter_node[0].getparent().remove(filter_node[0])
+                if draft_node:
+                    draft_node[0].getparent().remove(draft_node[0])
+                if open_node:
+                    open_node[0].getparent().remove(open_node[0])
+                if paid_node:
+                    paid_node[0].getparent().remove(paid_node[0])
+                if closed_node:
+                    closed_node[0].getparent().remove(closed_node[0])
+                res['arch'] = etree.tostring(doc)
+            # remove Import status filters for IVO, STV, IVI and ISI
+            if context.get('doc_type', '') in ('ivo', 'stv', 'ivi', 'isi'):
+                doc = etree.XML(res['arch'])
+                not_imp_node = doc.xpath("/search/group[1]/filter[@name='not_imported']")
+                partial_node = doc.xpath("/search/group[1]/filter[@name='partial']")
+                imp_node = doc.xpath("/search/group[1]/filter[@name='imported']")
+                if not_imp_node:
+                    not_imp_node[0].getparent().remove(not_imp_node[0])
+                if partial_node:
+                    partial_node[0].getparent().remove(partial_node[0])
+                if imp_node:
+                    imp_node[0].getparent().remove(imp_node[0])
                 res['arch'] = etree.tostring(doc)
         if view_type in ('tree', 'search') and (context.get('type') in ['out_invoice', 'out_refund'] or context.get('doc_type') == 'str'):
             doc = etree.XML(res['arch'])

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-08-23 13:15:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-09-16 12:32:47 +0000
@@ -42058,11 +42058,12 @@
 msgid "Create additional users and assign them groups that will allow them to have access to selected functionalities within the system. Click on 'Done' if you do not wish to add more users at this stage, you can always do this later."
 msgstr "Créez des utilisateurs en plus et assignez-les à des groupes, ce qui leur permettra d'avoir accès à des fonctionnalités choisies dans le système. Cliquez sur 'Terminé' si vous ne désirez pas ajouter d'autres utilisateurs pour l'instant, vous pourrez toujours en ajouter plus tard."
 
-#. modules: msf_accrual, analytic_distribution
+#. modules: msf_accrual, analytic_distribution, account
 #: field:analytic.distribution.wizard,accrual_line_id:0
 #: field:msf.accrual.line.expense,accrual_line_id:0
 #: field:account.move.line,accrual_line_id:0
 #: view:msf.accrual.line.expense:0
+#: selection:account.journal.column,field:0
 msgid "Accrual Line"
 msgstr "Ligne de Régularisation"
 
@@ -115376,6 +115377,7 @@
 #, python-format
 msgid "Cannot update these products, ED/BN attributes have not changed since the KCL creation"
 msgstr "Impossible de mettre à jour ces produits. Les attributs NL/DE n'ont pas changé depuis la création du Kit"
+<<<<<<< TREE
 
 #. module: board
 #: report:addons/board/report/integrity.mako:83
@@ -115817,3 +115819,35 @@
 msgid "Force Date and time of next execution"
 msgstr "Date et heure forcée de la prochiane exécution plannifiée"
 
+=======
+
+#. module: account
+#: view:account.invoice:0
+msgid "Closed Counterparts"
+msgstr "Contreparties Fermées"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Counterparts"
+msgstr "Brouillons de Contreparties"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Counterparts Invoices"
+msgstr "Brouillons de Factures Contreparties"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Open Counterparts"
+msgstr "Contreparties Ouvertes"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Open Counterparts Invoices"
+msgstr "Factures Contreparties Ouvertes"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Paid Counterparts"
+msgstr "Contreparties Payées"
+>>>>>>> MERGE-SOURCE