Merge lp:~syleam/openobject-addons/trunk-base-report-creator into lp:~openerp/openobject-addons/old_trunk

[Christophe CHAUVET]

[Christophe CHAUVET (christophe-chauvet)]

Correct bug #345643
Improve to permit user to see only his affect objects

Maybe apply on 5.0 ?

[Husen Daudi (husendaudi)]

Applied changes with this bug post 345643.

Did not apply changes on base_report_creator/wizard/wiz_set_filter_fields.py
Because following code will generate error while search_value is not iterable.
if len(search_value) > 1:

review: Approve

=== modified file 'base_report_creator/base_report_creator.py'
--- base_report_creator/base_report_creator.py	2009-03-06 23:50:10 +0000
+++ base_report_creator/base_report_creator.py	2009-03-20 09:50:13 +0000
@@ -233,7 +233,7 @@
                 ret_str = ret_str[0:len(ret_str)-3]
             if ret_str.endswith('or'):
                 ret_str = ret_str[0:len(ret_str)-2]
-        return ret_str
+        return ret_str % {'uid': uid}
 
     def _id_get(self, cr, uid, id, context):
 #       return 'min(sale_order_line.id)'

=== modified file 'base_report_creator/base_report_creator_view.xml'
--- base_report_creator/base_report_creator_view.xml	2008-11-21 08:46:40 +0000
+++ base_report_creator/base_report_creator_view.xml	2009-03-20 09:50:13 +0000
@@ -86,6 +86,8 @@
                             <field name="condition"/>
                         </form>
                     </field>
+                    <separator string="Legend" colspan="4"/>
+                    <label string="Use %%(uid)s to filter by the connect user" align="0.0"/>
                 </page><page string="Security">
                     <separator string="Authorized Groups (empty for all)" colspan="4"/>
                     <field name="group_ids" colspan="4" nolabel="1"/>

=== modified file 'base_report_creator/wizard/wiz_set_filter_fields.py'
--- base_report_creator/wizard/wiz_set_filter_fields.py	2009-01-18 12:52:45 +0000
+++ base_report_creator/wizard/wiz_set_filter_fields.py	2009-03-20 09:50:13 +0000
@@ -69,28 +69,30 @@
         field_search = [field_name,search_operator,search_value]        
         if search_operator == '=':
             if field_type=='many2one':
-                field_search[1]='in'
-                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+                if len(search_value) > 1:
+                    field_search[1]='in'
+                    field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+                else:
+                    field_search[1]='='
+                    field_search[2] = str(search_value[0])
             elif field_type in char_type or field_type in date_type:
                 field_search[2] = "'"+field_search[2]+"'"
         elif search_operator == '<>':
             if field_type=='many2one':
-                field_search[1]='not in'
-                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+                if len(search_value) > 1:
+                    field_search[1]='not in'
+                    field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+                else:
+                    field_search[1]='<>'
+                    field_search[2] = str(search_value[0])
             elif field_type in char_type or field_type in date_type:
                 field_search[2] = "'"+field_search[2]+"'"
         elif search_operator == 'in':
-            if field_type=='many2one':
-                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
-            else:
-                field_search[1] = 'ilike'
-                field_search[2] = "'%"+str(search_value)+"%'"
+            field_search[1] = 'ilike'
+            field_search[2] = "'%"+str(search_value)+"%'"
         elif search_operator == 'not in':
-            if field_type=='many2one':
-                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
-            else:
-                field_search[1] = 'not ilike'
-                field_search[2] = "'%"+str(search_value)+"%'"
+            field_search[1] = 'not ilike'
+            field_search[2] = "'%"+str(search_value)+"%'"
         elif search_operator == '^':
             if field_type in char_type:
                 field_search[1]='~'
@@ -112,6 +114,7 @@
             elif field_type not in int_type:
                 return False
         return field_search
+
 def _set_filter_value(self, cr, uid, data, context):
     form_data = data['form']
     value_data = form_data.get('value',False)
@@ -171,9 +174,8 @@
         operator.pop(operator.__len__()-1)
         
     if field.ttype == 'many2one':
-        operator.append(('in','Equals'))
-        operator.append(('in','Contains'))
-        operator.append(('not in','Not Contains'))
+        operator.append(('=','Equals'))
+        operator.append(('<>','Not Equals'))
         operator.append(('is','Is Empty'))
         operator.append(('is not','Is Not Empty'))
     elif field.ttype in ('char', 'text'):