[Merge] Merge with Trunk server

bzr revid: vir@tinyerp.com-20100602123702-rebbcatxfhxee2xs

bin/addons/base/base_update.xml

@@ -143,6 +143,7 @@
                 <tree string="Users">
                     <field name="name"/>
                     <field name="login"/>
+                    <field name="address_id" string="Address" />
                     <field name="company_id"/>
                 </tree>
             </field>
@@ -156,7 +157,7 @@
                 <search string="Users">
                     <field name="name" select="1"/>
                     <field name="login" select="1"/>
-                    <field name="address_id" select="1" string="Partner"/>
+                    <field name="address_id" select="1" string="Address"/>
                     <field name="company_ids" select="1" string="Company"/>
                 </search>
             </field>

bin/addons/base/ir/ir.xml

@@ -18,9 +18,6 @@
                         <field name="model" select="1" required="1"/>
                         <field name="res_id"/>
                         <field name="key2" select="2" required="1"/>
-                        <separator string="Values for Event Type" colspan="2"/>
-                        <label string="client_action_multi, client_action_relate" colspan="2"/>
-                        <label string="tree_but_action, client_print_multi"  colspan="2"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Action To Launch" colspan="2"/>

bin/addons/base/ir/ir_model.py

@@ -68,6 +68,17 @@ class ir_model(osv.osv):
     _constraints = [
         (_check_model_name, 'The Object name must start with x_ and not contain any special character !', ['model']),
     ]
+
+    # overridden to allow searching both on model name (model field)
+    # and model description (name field)
+    def name_search(self, cr, uid, name='', args=None, operator='ilike',  context=None, limit=None):
+        if args is None:
+            args = []
+        domain = args + ['|', ('model', operator, name), ('name', operator, name)]
+        return super(ir_model, self).name_search(cr, uid, None, domain,
+                        operator=operator, limit=limit, context=context)
+
+
     def unlink(self, cr, user, ids, context=None):
         for model in self.browse(cr, user, ids, context):
             if model.state <> 'manual':

bin/addons/base/ir/ir_values.py

@@ -75,8 +75,13 @@ class ir_values(osv.osv):
             method=True, type='text', string='Value'),
         'object': fields.boolean('Is Object'),
         'key': fields.selection([('action','Action'),('default','Default')], 'Type', size=128),
-        'key2': fields.char('Event Type', size=256,
-            help="The kind of action or button in the client side that will trigger the action."),
+        'key2' : fields.selection([('client_action_multi', 'client_action_multi'),
+                                   ('client_action_relate', 'client_action_relate'),
+                                   ('tree_but_open', 'tree_but_open'),
+                                   ('tree_but_action', 'tree_but_action'),
+                                   ('client_print_multi', 'client_print_multi')],
+                                  'Event Type',
+                                  help="The kind of action or button in the client side that will trigger the action."),
         'meta': fields.text('Meta Datas'),
         'meta_unpickle': fields.function(_value_unpickle, fnct_inv=_value_pickle,
             method=True, type='text', string='Metadata'),

bin/addons/base/res/partner/partner_view.xml

@@ -30,8 +30,8 @@
                         <filter string="Customer" name="customer" icon="terp-crm" domain="[('is_customer_add','=','1')]" />
                         <filter string="Supplier" name="supplier"  icon="terp-crm" domain="[('is_supplier_add','=','1')]" />
                         <separator orientation="vertical"/>
-                        <field name="name" />
                         <field name="partner_id" />
+                        <field name="name" />
                         <field name="country_id" />
                     </group>
                     <newline/>

bin/addons/base/res/res_user.py

@@ -245,7 +245,7 @@ class users(osv.osv):
         'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type,
                                 selection=[('simple','Simplified'),('extended','Extended')],
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
-        'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char"),
+        'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
     }
 
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):