[MERGE]

bzr revid: hmo@tinyerp.com-20101001102457-1cs6ssynbo5iyca4

bin/addons/base/base_update.xml

@@ -167,7 +167,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="context_lang"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date"/>
                 </tree>
             </field>
         </record>

bin/addons/base/ir/ir.xml

@@ -339,7 +339,7 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4" sequence="1"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
         <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 

bin/addons/base/res/res_user.py

@@ -28,6 +28,7 @@ import pooler
 from tools.translate import _
 from service import security
 import netsvc
+import time
 
 class groups(osv.osv):
     _name = "res.groups"
@@ -265,7 +266,7 @@ class users(osv.osv):
                                 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", size=240),
         'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
-
+        'date': fields.datetime('Last Connection', readonly=True),
     }
 
     def on_change_company_id(self, cr, uid, ids, company_id):
@@ -436,12 +437,14 @@ class users(osv.osv):
         cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where login=%s and password=%s and active', (tools.ustr(login), tools.ustr(password)))
         res = cr.fetchone()
-        cr.close()
+
         if res:
+            cr.execute("update res_users set date=%s where id=%s", (time.strftime('%Y-%m-%d %H:%M:%S'),res[0]))
+            cr.commit()
             return res[0]
         else:
             return False
-
+        cr.close()
     def check_super(self, passwd):
         if passwd == tools.config['admin_passwd']:
             return True