Merge lp:~julie-w/unifield-server/US-7812 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2020-08-07 10:12:41 +0000
+++ bin/addons/account/account_view.xml	2020-09-16 07:27:27 +0000
@@ -974,6 +974,36 @@
                 </search>
             </field>
         </record>
+
+        <!-- Tax Search View With Filters. To be used ONLY from the standard tax menu as it allows the selection of inactive taxes -->
+        <record id="view_account_tax_search_with_filters" model="ir.ui.view">
+            <field name="name">account.tax.search.with.filters</field>
+            <field name="model">account.tax</field>
+            <field name="type">search</field>
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <search string="Search Taxes">
+                    <group>
+                        <filter string="Active" name="filter_tax_active"
+                                domain="[('active', '=', True)]" icon="terp-check"/>
+                        <filter string="Inactive" name="filter_tax_inactive"
+                                domain="[('active', '=', False)]" icon="gtk-dialog-error"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Tax Included in Price" name="filter_tax_included"
+                                domain="[('price_include', '=', True)]" icon="gtk-save-as"/>
+                        <filter string="Tax Not Included in Price" name="filter_tax_not_included"
+                                domain="[('price_include', '=', False)]" icon="terp-dialog-close"/>
+                        <label string=""/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <field name="name"/>
+                        <field name="description"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="view_tax_form" model="ir.ui.view">
             <field name="name">account.tax.form</field>
             <field name="model">account.tax</field>
@@ -1046,7 +1076,11 @@
             <field name="res_model">account.tax</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tax_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="search_view_id" ref="view_account_tax_search_with_filters"/>
+            <field name="domain">[('parent_id', '=', False), ('active', 'in', ['t', 'f'])]</field>
+            <field name="context">{'search_default_filter_tax_active': 1,
+                                   'search_default_filter_tax_included': 1,
+                                   'search_default_filter_tax_not_included': 1}</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-08-26 13:50:18 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-09-16 07:27:27 +0000
@@ -11400,7 +11400,7 @@
 msgid "Creation Month"
 msgstr "Creation Month"
 
-#. modules: resource, finance, supplier_catalogue, msf_field_access_rights, msf_instance, msf_button_access_rights, msf_tools, analytic_distribution, financing_contract, sync_client, hr,res_currency_functional,msf_profile, procurement_cycle
+#. modules: resource, finance, supplier_catalogue, msf_field_access_rights, msf_instance, msf_button_access_rights, msf_tools, analytic_distribution, financing_contract, sync_client, hr, res_currency_functional, msf_profile, procurement_cycle, account
 #: view:financing.contract.donor:0
 #: view:msf.instance:0
 #: selection:msf.instance.cloud,state:0
@@ -11422,6 +11422,7 @@
 #: view:product.product:0
 #: view:res.request:0
 #: view:replenishment.location.config:0
+#: view:account.tax:0
 msgid "Inactive"
 msgstr "Inactif"
 
@@ -61245,9 +61246,15 @@
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
+#: view:account.tax:0
 msgid "Tax Included in Price"
 msgstr "Taxe Incluse dans le Prix"
 
+#. module: account
+#: view:account.tax:0
+msgid "Tax Not Included in Price"
+msgstr "Taxe Non Incluse dans le Prix"
+
 #. module: register_accounting
 #: view:account.bank.statement:0
 msgid "Search Cheque Registers"
@@ -71666,6 +71673,7 @@
 #: field:survey.common,active:0
 #: field:sync_client.survey,active:0
 #: field:product.status,active:0
+#: view:account.tax:0
 #, python-format
 msgid "Active"
 msgstr "Actif"