Filter parties without parties and filter bank account by owner companies

072165

activity.xml

@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_activity_activity_companies">
-            <field name="domain" eval="[('companies', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="['OR', ('companies', 'in', Eval('companies', [])), ('companies', 'in', [])]" pyson="1"/>
             <field name="rule_group" ref="rule_group_activity_activity"/>
         </record>
     </data>

bank.py

@@ -1,7 +1,8 @@
 # The COPYRIGHT file at the top level of this repository contains the full
 # copyright notices and license terms.
 from trytond.model import fields
-from trytond.pool import PoolMeta
+from trytond.pool import Pool, PoolMeta
+from trytond.transaction import Transaction
 from . import party
 
 
@@ -13,6 +14,15 @@ class BankAccount(metaclass=PoolMeta):
     __name__ = 'bank.account'
     companies = fields.Function(fields.One2Many('company.company', None,
         'Companies'), 'get_companies', searcher='search_companies')
+    owners_by_companies = fields.Function(
+        fields.Many2Many('bank.account-party.party', 'account', 'owner',
+        'Owners'), 'get_owners_by_companies', setter='set_owners_by_companies')
+
+    @classmethod
+    def create(cls, vlist):
+        # allow create bank accounts from party when not select owners
+        with Transaction().set_context(_check_access=False):
+            return super(BankAccount, cls).create(vlist)
 
     def get_companies(self, name):
         if self.bank:
@@ -21,3 +31,31 @@ class BankAccount(metaclass=PoolMeta):
     @classmethod
     def search_companies(cls, name, clause):
         return [('bank.party.companies',) + tuple(clause[1:])]
+
+    @classmethod
+    def get_owners_by_companies(cls, records, name):
+        PartyCompany = Pool().get('party.company.rel')
+
+        user_company = Transaction().context.get('company')
+
+        res = dict((x.id, None) for x in records)
+        for record in records:
+            owners = []
+
+            for owner in record.owners:
+                owner_companies = [o.company for o in PartyCompany.search([
+                    ('party', '=', owner),
+                    ])]
+                if not owner_companies:
+                    owners.append(owner)
+                    continue
+                for company in owner_companies:
+                    if company.id == user_company:
+                        owners.append(owner)
+                        break
+            res[record.id] = [o.id for o in owners]
+        return res
+
+    @classmethod
+    def set_owners_by_companies(cls, records, name, value):
+        cls.write(records, {'owners': value})

bank.xml

@@ -4,13 +4,19 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data depends="bank">
         <!-- bank -->
+        <record model="ir.ui.view" id="bank_account_view_form">
+            <field name="model">bank.account</field>
+            <field name="inherit" ref="bank.bank_account_view_form"/>
+            <field name="name">bank_account_form</field>
+        </record>
+
         <record model="ir.rule.group" id="rule_group_bank">
             <field name="name">Bank Company Rule</field>
             <field name="model" search="[('model', '=', 'bank')]"/>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_bank_companies">
-            <field name="domain" eval="[('companies', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="['OR', ('companies', 'in', Eval('companies', [])), ('companies', 'in', [])]" pyson="1"/>
             <field name="rule_group" ref="rule_group_bank"/>
         </record>
 
@@ -20,7 +26,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_bank_account_companies">
-            <field name="domain" eval="[('companies', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="[['OR', ('companies', 'in', Eval('companies', [])), ('companies', 'in', [])], ['OR', ('owners.companies', 'in', Eval('companies', [])), ('owners.companies', 'in', []), ('owners', 'in', [])]]" pyson="1"/>
             <field name="rule_group" ref="rule_group_bank_account"/>
         </record>
     </data>

carrier.xml

@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_carrier_companies">
-            <field name="domain" eval="[('companies', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="['OR', ('companies', 'in', Eval('companies', [])), ('companies', 'in', [])]" pyson="1"/>
             <field name="rule_group" ref="rule_group_carrier"/>
         </record>
     </data>

commission.xml

@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_commission_companies">
-            <field name="domain" eval="[('agent.company', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="['OR', ('agent.company', 'in', Eval('companies', [])), ('agent.company', 'in', [])]" pyson="1"/>
             <field name="rule_group" ref="rule_group_commission"/>
         </record>
 
@@ -21,7 +21,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_commission_agent_companies">
-            <field name="domain" eval="[('company', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="['OR', ('companies', 'in', Eval('companies', [])), ('companies', 'in', [])]" pyson="1"/>
             <field name="rule_group" ref="rule_group_commission_agent"/>
         </record>
     </data>

employee.xml

@@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <record model="ir.action.act_window" id="company.act_employee_form">
-            <field name="domain" eval="[('company', 'in', Eval('companies', []))]" pyson="1"/>
+            <field name="domain" eval="['OR', ('companies', 'in', Eval('companies', [])), ('companies', 'in', [])]" pyson="1"/>
         </record>
     </data>
 </tryton>

locale/ca.po

@@ -10,6 +10,10 @@ msgctxt "field:bank.account,companies:"
 msgid "Companies"
 msgstr "Empreses"
 
+msgctxt "field:bank.account,owners_by_companies:"
+msgid "Owners"
+msgstr "Titulars"
+
 msgctxt "field:carrier,companies:"
 msgid "Companies"
 msgstr "Empreses"

locale/es.po

@@ -10,6 +10,10 @@ msgctxt "field:bank.account,companies:"
 msgid "Companies"
 msgstr "Empresas"
 
+msgctxt "field:bank.account,owners_by_companies:"
+msgid "Owners"
+msgstr "Titulares"
+
 msgctxt "field:carrier,companies:"
 msgid "Companies"
 msgstr "Empresas"

tests/test_module.py

@@ -24,6 +24,7 @@ def set_company(company):
 class PartyCompanyTestCase(CompanyTestMixin, ModuleTestCase):
     'Test PartyCompany module'
     module = 'party_company'
+    extras = ['bank']
 
     @with_transaction()
     def test_party(self):

view/bank_account_form.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- The COPYRIGHT file at the top level of this repository contains the full
+     copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/field[@name='owners']" position="replace">
+      <field name="owners_by_companies" colspan="6"/>
+    </xpath>
+</data>