openerp-dev-web team mailing list archive

["Anup\(OpenERP\)" <ach@xxxxxxxxxxx>]

Anup(OpenERP) has proposed merging lp:~openerp-dev/openobject-server/6.0-opw-5692-ach into lp:openobject-server/6.0.

Requested reviews:
  Jay Vora (OpenERP) (jvo-openerp)
Related bugs:
  Bug #766982 in OpenERP Server: "If you associate 2 or more groups to an ir.rule, rules are not correctly applied"
  https://bugs.launchpad.net/openobject-server/+bug/766982

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-5692-ach/+merge/61101

Hello,

   This fixes the issue. Now the domains of the record rules are being ANDed instead of ORing.

   Please Share your views.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-5692-ach/+merge/61101
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-opw-5692-ach.

=== modified file 'bin/addons/base/ir/ir_rule.py'
--- bin/addons/base/ir/ir_rule.py	2011-03-02 11:08:16 +0000
+++ bin/addons/base/ir/ir_rule.py	2011-05-16 12:25:50 +0000
@@ -126,10 +126,11 @@
                 if group_domain:
                     group_domains += group_domain
                     count += 1
-            if count and global_domain:
-                return ['&'] + global_domain + ['|'] * (count-1) + group_domains
             if count:
-                return ['|'] * (count-1) + group_domains
+                 dom = ['&'] * (count-1) + group_domains
+                 if global_domain:
+                     return ['&'] + global_domain + dom
+                 return dom
             return global_domain
         return []