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

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_mcdb.py'
--- bin/addons/account_mcdb/account_mcdb.py	2019-09-26 12:44:53 +0000
+++ bin/addons/account_mcdb/account_mcdb.py	2022-06-13 12:48:12 +0000
@@ -52,7 +52,7 @@
         'account_ids': fields.many2many(obj='account.account', rel='account_account_mcdb', id1='mcdb_id', id2='account_id', string="Account Code"),
         'partner_id': fields.many2one('res.partner', string="Partner"),  # not used since US-3427
         'partner_ids': fields.many2many(obj='res.partner', rel='partner_mcdb', id1='mcdb_id', id2='partner_id',
-                                        string='Partners', order_by='name, id'),
+                                        string='Partners', order_by='name, id', display_inactive=True),
         'employee_id': fields.many2one('hr.employee', string="Employee"),  # not used since US-3427
         'employee_ids': fields.many2many(obj='hr.employee', rel='employee_mcdb', id1='mcdb_id', id2='employee_id',
                                          string='Employees', order_by='employee_type, identification_id, id'),
 
=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2022-01-19 15:47:14 +0000
+++ bin/addons/account_mcdb/account_view.xml	2022-06-13 12:48:12 +0000
@@ -162,7 +162,7 @@
                         </group>
                         <newline/>
                         <group>
-                            <field name="partner_id" select='1' string="3RD Party Partner"/>
+                            <field name="partner_id" select='1' string="3RD Party Partner" context="{'show_button_show_inactive': True}"/>
                             <field name="employee_id" select='1' string="3RD Party Employee"/>
                             <field name="transfer_journal_id" select='1' string="3RD Party Journal"
                                    context="{'exclude_journals': ['IB'], 'search_default_filter_is_active': 1}"/>
@@ -189,7 +189,7 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="4" col="20">
-                            <filter string="3rd party Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                            <filter string="3rd party Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id', 'show_button_show_inactive': True}"/>
                             <filter string="3rd party Employee" icon="terp-personal-" domain="[]" context="{'group_by': 'employee_id'}"/>
                             <filter string="3rd party Journal" icon="terp-dolar" domain="[]" context="{'group_by': 'transfer_journal_id', 'exclude_journals': ['IB']}"/>
                             <separator orientation="vertical"/>
@@ -354,7 +354,7 @@
                             </group>
                             <newline/>
                             <group col='8' colspan='4'>
-                                <field name="partner_id" select="1" string="3RD Party Partner"/>
+                                <field name="partner_id" select="1" string="3RD Party Partner" context="{'show_button_show_inactive': True}"/>
                                 <field name="employee_id" select="1" string="3RD Party Employee"/>
                                 <field name="transfer_journal_id" select="1" string="3RD Party Journal"
                                        context="{'exclude_journals': ['IB'], 'search_default_filter_is_active': 1}"/>
@@ -367,7 +367,7 @@
                             </group>
                             <newline/>
                             <group expand="0" string="Group By..." colspan="12" col="10">
-                                <filter string="3rd party Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                                <filter string="3rd party Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id', 'show_button_show_inactive': True}"/>
                                 <filter string="3rd party Employee" icon="terp-personal-" domain="[]" context="{'group_by': 'employee_id'}"/>
                                 <filter string="3rd party Journal" icon="terp-dolar" domain="[]" context="{'group_by': 'transfer_journal_id'}"/>
                                 <separator orientation="vertical"/>
 
=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2021-12-30 15:59:43 +0000
+++ bin/osv/fields.py	2022-06-13 12:48:12 +0000
@@ -592,6 +592,7 @@
     _prefetch = False
     _type = 'many2many'
     def __init__(self, obj, rel, id1, id2, string='unknown', limit=None, **args):
+        self.display_inactive = False
         _column.__init__(self, string=string, **args)
         self._obj = obj
         if '.' in rel:
@@ -625,9 +626,10 @@
         # FIXME: make this distinction explicit in API!
         domain = isinstance(self._domain, list) and self._domain or []
 
-        wquery = obj._where_calc(cr, user, domain, context=context)
+        wquery = obj._where_calc(cr, user, domain, active_test=not self.display_inactive, context=context)
         obj._apply_ir_rules(cr, user, wquery, 'read', context=context)
         from_c, where_c, where_params = wquery.get_sql()
+
         if where_c:
             where_c = ' AND ' + where_c