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

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_mcdb.py'
--- bin/addons/account_mcdb/account_mcdb.py	2019-07-12 14:19:43 +0000
+++ bin/addons/account_mcdb/account_mcdb.py	2019-09-27 12:27:07 +0000
@@ -162,6 +162,26 @@
 
     _order = 'user, description, id'
 
+    def search(self, cr, uid, dom, *a, **b):
+        """
+        Ignores the filter on "Active Users" once a specific user has been selected
+        """
+        new_dom = []
+        active_user_dom = []
+        user_filter = False
+        for x in dom:
+            if x[0] == 'user.active':
+                active_user_dom = x
+            elif x[0] == 'user':
+                user_filter = True
+                new_dom.append(x)
+            else:
+                new_dom.append(x)
+        if not user_filter and active_user_dom:
+            new_dom.append(active_user_dom)
+
+        return super(account_mcdb, self).search(cr, uid, new_dom, *a, **b)
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if  context is None:
             context = {}
@@ -1491,4 +1511,27 @@
         return {'type': 'ir.actions.act_window_close', 'context': context}
 
 account_mcdb()
+
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+    _name = 'res.users'
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        """
+        For Search Views: in case "user_with_active_filter" is set in context, displays a Search View with a filter to
+        select/de-select active users
+        """
+        if context is None:
+            context = {}
+        model_data_obj = self.pool.get('ir.model.data')
+        if view_type == 'search' and context.get('user_with_active_filter'):
+            view_id = model_data_obj.get_object_reference(cr, uid, 'account_mcdb', 'user_search_with_active_filter')
+            view_id = view_id and view_id[1] or False
+        res = super(res_users, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context,
+                                                     toolbar=toolbar, submenu=submenu)
+        return res
+
+
+res_users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/account_mcdb/account_mcdb_view.xml'
--- bin/addons/account_mcdb/account_mcdb_view.xml	2019-07-12 13:17:02 +0000
+++ bin/addons/account_mcdb/account_mcdb_view.xml	2019-09-27 12:27:07 +0000
@@ -364,6 +364,24 @@
         </record>
 
     <!-- Search view -->
+        <!-- related User Search View -->
+        <record id="user_search_with_active_filter" model="ir.ui.view">
+            <field name="name">user.search.with.active.filter</field>
+            <field name="model">res.users</field>
+            <field name="type">search</field>
+            <field name="priority" eval="105" />
+            <field name="arch" type="xml">
+                <search>
+                    <filter name="user_active" icon="terp-check" string="Active" domain="[('active', '=', True)]" />
+                    <newline/>
+                    <field name="name"/>
+                    <field name="login"/>
+                    <field name="address_id"/>
+                    <field name="synchronize"/>
+                </search>
+            </field>
+        </record>
+
         <record id="account_mcdb_search" model="ir.ui.view">
             <field name="name">account.mcdb.search</field>
             <field name="model">account.mcdb</field>
@@ -371,8 +389,12 @@
             <field name="priority" eval="17"/>
             <field name="arch" type="xml">
                 <search string="Selector">
+                    <filter name="user_active" icon="terp-check" string="Active Users" domain="[('user.active', '=', True)]" />
+                    <newline/>
                     <field name="description" select="1"/>
-                    <field name="user" select="1"/>
+                    <field name="user" select="1" domain="[('active', 'in', ['t', 'f'])]"
+                           context="{'user_with_active_filter': True,
+                                     'search_default_user_active': True}"/>
                     <field name="hq_template" />
                 </search>
             </field>
 
=== modified file 'bin/addons/account_mcdb/mcdb_view_general.xml'
--- bin/addons/account_mcdb/mcdb_view_general.xml	2018-11-07 16:25:55 +0000
+++ bin/addons/account_mcdb/mcdb_view_general.xml	2019-09-27 12:27:07 +0000
@@ -4,7 +4,9 @@
                         <field name="display_mcdb_load_button" invisible="1" />
                         <field name="template" on_change="onchange_template()" string="Select an existing template"
                                domain="[('description', '!=', False), ('description', '!=', ''),
-                                        ('model', '=', context.get('from', 'account.move.line'))]"/>
+                                        ('model', '=', context.get('from', 'account.move.line'))]"
+                               context="{'search_default_user_active': 1}"
+                        />
                         <button icon="gtk-save" name="load_mcdb_template" string="Load" type="object"
                                 attrs="{'invisible': [('display_mcdb_load_button', '=', False)]}" />
                         <button icon="gtk-edit" name="edit_mcdb_template" string="Replace" type="object"
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-09-27 12:22:32 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-09-27 12:27:07 +0000
@@ -72250,7 +72250,7 @@
 msgid "Navajo"
 msgstr "Navajo"
 
-#. modules: product_nomenclature, process, financing_contract, mission_stock, procurement_cycle, sync_client, supplier_catalogue, analytic_distribution, product, finance, hr, msf_instance, kit, base, msf_tools, res_currency_functional, procurement_report, threshold_value, purchase, account, resource, msf_partner, procurement_auto, msf_field_access_rights, sale, procurement, msf_button_access_rights, stock, product_attributes, account_period_closing_level
+#. modules: product_nomenclature, process, financing_contract, mission_stock, procurement_cycle, sync_client, supplier_catalogue, analytic_distribution, product, finance, hr, msf_instance, kit, base, msf_tools, res_currency_functional, procurement_report, threshold_value, purchase, account, resource, msf_partner, procurement_auto, msf_field_access_rights, sale, procurement, msf_button_access_rights, stock, product_attributes, account_period_closing_level, account_mcdb
 #: field:account.account,active:0
 #: field:account.analytic.journal,active:0
 #: field:account.journal.period,active:0
@@ -72315,6 +72315,7 @@
 #: field:account.period,active:0
 #: report:addons/kit/report/kit_mass_import_export_xls.mako:114
 #: view:msf.instance:0
+#: view:res.users:0
 #: field:automated.export,active:0
 #: field:product.heat_sensitive,active:0
 #: field:sync.client.message_rule,active:0
@@ -107379,6 +107380,11 @@
 msgid "Functional total cost :"
 msgstr "Total Coût Fonctionnel :"
 
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Active Users"
+msgstr "Utilisateurs Actifs"
+
 #. module: account_period_closing_level
 #: code:addons/account_period_closing_level/account_period.py:203
 #, python-format