Merge lp:~unifield-team/unifield-server/us-1450 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/object_query/query.py'
--- bin/addons/object_query/query.py	2016-06-24 12:00:57 +0000
+++ bin/addons/object_query/query.py	2016-07-21 08:23:19 +0000
@@ -509,8 +509,8 @@
                     model_obj = self.pool.get(obj.model)
                     for field in obj.field_id:
                         all_fields_ids.append(field.id)
-                        col = model_obj._columns[field.name]
-                        if hasattr(col, '_properties') and col._properties and not col.store:
+                        col = model_obj._columns.get(field.name)
+                        if col and hasattr(col, '_properties') and col._properties and not col.store:
                             if a[0] == 'is_function' or not isinstance(col, fields.related):
                                 field_ids.append(field.id)
                 
@@ -534,6 +534,62 @@
                 res[obj.id] = target_obj._columns[obj.name].help
         return res
 
+    def _is_in_model(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        for f in self.browse(cr, uid, ids, context=context):
+            res[f.id] = True
+            if f.name not in self.pool.get(f.model_id.model)._columns.keys():
+                res[f.id] = False
+
+        return res
+
+    def _search_is_in_model(self, cr, uid, obj, name, args, context=None):
+        '''
+        Return all fields which are a function field
+        '''
+        if not args:
+            return []
+        if context is None:
+            context = {}
+
+        def fill_in_model(model_ids):
+            inherit_model_ids = []
+            for obj in self.pool.get('ir.model').browse(cr, uid, model_ids, context=context):
+                model_obj = self.pool.get(obj.model)
+
+                if model_obj._inherits:
+                    for inh_model_name in model_obj._inherits.keys():
+                        inh_model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', inh_model_name)], context=context)
+                        for inh_model_id in inh_model_ids:
+                            if inh_model_id not in model_ids:
+                                inherit_model_ids.append(inh_model_id)
+
+                for field in obj.field_id:
+                    if field.name not in model_obj._columns.keys():
+                        not_in_model.append(field.id)
+                    else:
+                        in_model.append(field.id)
+
+            if inherit_model_ids:
+                fill_in_model(inherit_model_ids)
+
+        for a in args:
+            if a[0] == 'is_in_model':
+                field_ids = []
+                all_fields_ids = []
+                model_ids = context.get('model_ids', [(6,0,[])])[0][2]
+
+                if not model_ids:
+                    model_ids = self.pool.get('ir.model').search(cr, uid, [], context=context)
+
+                in_model = []
+                not_in_model = []
+                fill_in_model(model_ids)
+
+                if (a[1] == '=' and a[2] == False) or (a[1] == '!=' and a[2] == True):
+                    return [('id', 'in', not_in_model)]
+                else:
+                    return [('id', 'in', in_model)]
 
     _columns = {
         'help': fields.function(_get_help, method=True, type='char', size='10000', string='Help'),
@@ -542,16 +598,23 @@
                                            method=True,
                                            type='many2one', relation='ir.model',
                                            string='Model'),
-        'is_function': fields.function(_is_function, 
-                                       fnct_search=_search_function, 
+        'is_function': fields.function(_is_function,
+                                       fnct_search=_search_function,
                                        method=True,
                                        type='boolean', string='Is function ?'),
-        'is_unsearchable': fields.function(_is_function, 
-                                       fnct_search=_search_function, 
+        'is_unsearchable': fields.function(_is_function,
+                                       fnct_search=_search_function,
                                        method=True,
                                        type='boolean', string='Is searchable ?'),
+        'is_in_model': fields.function(
+            _is_in_model,
+            fnct_search=_search_is_in_model,
+            method=True,
+            type='boolean',
+            string='Is in model ?',
+        ),
     }
-    
+ 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         '''
         Call the view on context if there is.
 
=== modified file 'bin/addons/object_query/query_view.xml'
--- bin/addons/object_query/query_view.xml	2011-12-30 08:41:01 +0000
+++ bin/addons/object_query/query_view.xml	2016-07-21 08:23:19 +0000
@@ -82,7 +82,7 @@
                     <group colspan="4" attrs="{'invisible': [('newquery', '=', True)]}">
                     <notebook colspan="4">
                         <page string="Search fields">
-                            <field name="selection_ids" colspan="4" domain="[('model_search_id', 'in', model_ids), ('is_unsearchable', '=', False)]" nolabel="1" mode="tree" 
+                            <field name="selection_ids" colspan="4" domain="[('model_search_id', 'in', model_ids), ('is_unsearchable', '=', False), ('is_in_model', '=', True)]" nolabel="1" mode="tree" 
                                    context="{'special_tree_id': 'object_query_ir_field_tree', 'special_search_id': 'object_query_ir_field_search', 'model_ids': model_ids}"
                                 >
                                 <tree string="Search fields" noteditable="1" editable="top">
@@ -103,7 +103,7 @@
                         </page>
                         <page string="Result fields">
                            <button name="populate_result" type="object" string="Populate from Search Fields"  icon="terp-stock_effects-object-colorize" colspan="2"/>
-                            <field name="result_simple_ids" colspan="4" nolabel="1" mode="tree" context="{'model_ids': model_ids, 'special_tree_id': 'object_query_ir_field_tree', 'special_search_id': 'object_query_ir_field_search'}" domain="[('model_search_id', 'in', model_ids)]">
+                            <field name="result_simple_ids" colspan="4" nolabel="1" mode="tree" context="{'model_ids': model_ids, 'special_tree_id': 'object_query_ir_field_tree', 'special_search_id': 'object_query_ir_field_search'}" domain="[('model_search_id', 'in', model_ids), ('is_in_model', '=', True)]">
                                 <tree string="Result fields" editable="top" noteditable="1">
                                     <field name="field_description" />
                                     <field name="help" />
@@ -123,7 +123,7 @@
                             </field>
                         </page>
                         <page string="Group by fields">
-                            <field name="group_by_ids" colspan="4" domain="[('model_search_id', 'in', model_ids), ('ttype', 'not in', ('related', 'one2many', 'many2many')), ('is_function', '=', False)]" 
+                            <field name="group_by_ids" colspan="4" domain="[('model_search_id', 'in', model_ids), ('ttype', 'not in', ('related', 'one2many', 'many2many')), ('is_function', '=', False), ('is_in_model', '=', True)]" 
                                    nolabel="1" mode="tree,search" context="{'special_tree_id': 'object_query_ir_field_tree', 'special_search_id': 'object_query_ir_field_search', 'model_ids': model_ids}">
                                 <tree string="Group by fields" noteditable="1" editable="top">
                                     <field name="field_description" />