Mohammed Shekha(Open ERP) has proposed merging
lp:~openerp-dev/openobject-client-web/6.0-opw-381586-msh into
lp:openobject-client-web.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-381586-msh/+merge/89199
Hello,
Fixed the issue of new filter which does not work when we do anding on same
field, it do the oring by default for same field.
In web we have done a small code which is specifically do oring when there is a
same field but if we do oring on same field then it will not work in greater
than and less then option which is used with same field, here this will always
do an oring so we will not get proper result of anding like less than some date
and greated then some date.
Demo:- Go to any search view and create a new filter and select any one field
now again select the same field which you have previously selected so you will
see it is automatically become OR.
So changed the code accordingly to fix it.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-381586-msh/+merge/89199
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-client-web/6.0-opw-381586-msh.
=== modified file 'addons/openerp/static/javascript/search.js'
--- addons/openerp/static/javascript/search.js 2011-07-27 11:03:26 +0000
+++ addons/openerp/static/javascript/search.js 2012-01-19 09:21:28 +0000
@@ -59,21 +59,6 @@
$new_tr.show();
}
- var index_row;
- var $curr_body = $position_tr.closest('tbody');
- $curr_body.find('#filterlabel').each(function(k, v) {
-
- if (jQuery(v).text() != selected_txt) { return; }
- index_row = k;
- $new_tr.find('select.expr').hide();
- $new_tr_lbl.hide();
- $new_tr.find('label.and_or').remove();
- jQuery('<label>', {'class': 'and_or'}).text('OR').insertBefore($new_tr_qstring);
- });
-
- if(index_row >= 0) {
- $position_tr = $curr_body.find('tr.filter_row_class')[index_row];
- }
jQuery($position_tr).after($new_tr);
}
_______________________________________________
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
