Naresh(OpenERP) has proposed merging
lp:~openerp-dev/openobject-client/trunk-bug-816207-nch into
lp:openobject-client.
Requested reviews:
OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
Bug #816207 in OpenERP GTK Client: "many2one widget issue in search form,
revision 4670"
https://bugs.launchpad.net/openobject-client/+bug/816207
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-816207-nch/+merge/70520
--
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-816207-nch/+merge/70520
Your team OpenERP sa GTK client R&D is requested to review the proposed merge
of lp:~openerp-dev/openobject-client/trunk-bug-816207-nch into
lp:openobject-client.
=== modified file 'bin/widget_search/custom_filter.py'
--- bin/widget_search/custom_filter.py 2011-04-07 05:32:21 +0000
+++ bin/widget_search/custom_filter.py 2011-08-05 06:02:15 +0000
@@ -112,9 +112,10 @@
self.widget_obj.field_left = self.field_selection[field_string][0]
self.widget_obj.selected_oper_text = self.operators_lst[self.combo_op.get_active()]
self.widget_obj.selected_oper = self.op_selection[self.widget_obj.selected_oper_text]
- wid_domain = self.widget_obj._value_get()
- condition = self.condition_next.get_active() == 0 and '&' or '|'
- domain = [condition] + wid_domain
+ domain = self.widget_obj._value_get()
+ condition = self.condition_next.get_active() == 1 and '|' or False
+ if condition:
+ domain = [condition] + domain
return {'domain':domain}
def sig_exec(self, widget):
=== modified file 'bin/widget_search/form.py'
--- bin/widget_search/form.py 2011-07-27 12:55:13 +0000
+++ bin/widget_search/form.py 2011-08-05 06:02:15 +0000
@@ -460,20 +460,6 @@
ordered_gp += self.groupby[val]
if ordered_gp:
context.update({'group_by':ordered_gp})
- if domain:
- pos = False
- if '&' in domain or '|' in domain:
- if domain[-2] in ['&','|']:
- pos = 2
- elif len(domain) >= 4 and domain[-4] in ['&','|']:
- pos = 4
- if len(domain) == 4 and domain[0] in ['&','|'] and domain[1] in ['&','|']:
- domain = domain[1:]
- else:
- if pos:
- res1 = domain[:-pos]
- res2 = domain[-(pos-1):]
- domain = res1 + res2
return {'domain':domain, 'context':context}
def destroy(self):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
