[MERGE]:merged with latest addons

bzr revid: ssu@tinyerp.com-20121012062337-4cjzskoxb77d5dme

diff --cc addons/event/event.py
index 73836f4,b3aee24..e30dda7
--- 1/addons/event/event.py
--- 2/addons/event/event.py
+++ b/addons/event/event.py
@@@ -268,36 -267,20 +268,29 @@@ class event_event(osv.osv)
              return {'value': dic}
  
      def on_change_address_id(self, cr, uid, ids, address_id, context=None):
-         values = {
-             'street' : False,
-             'street2' : False,
-             'city' : False,
-             'zip' : False,
-             'country_id' : False,
-             'state_id' : False,
-         }
-         if isinstance(address_id, (long, int)):
-             address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
-             values.update({
-                 'street' : address.street,
-                 'street2' : address.street2,
-                 'city' : address.city,
-                 'country_id' : address.country_id and address.country_id.id,
-                 'state_id' : address.state_id and address.state_id.id,
-                 'zip' : address.zip,
-             })
- 
+         values = {}
+         if not address_id:
+             return values
+         address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
+         values.update({
+             'street' : address.street,
+             'street2' : address.street2,
+             'city' : address.city,
+             'country_id' : address.country_id and address.country_id.id or False,
+             'state_id' : address.state_id and address.state_id.id or False,
+             'zip' : address.zip,
+         })
          return {'value' : values}
  
 +    def onchange_start_date(self, cr, uid, ids, date_begin=False, date_end=False, context=None):
 +        res = {'value':{}}
 +        if date_end:
 +            return res
 +        if date_begin and isinstance(date_begin, str):
 +            date_begin = datetime.strptime(date_begin, "%Y-%m-%d %H:%M:%S")
 +            date_end = date_begin + timedelta(hours=1)
 +            res['value'] = {'date_end': date_end.strftime("%Y-%m-%d %H:%M:%S")}
 +        return res
  
      # ----------------------------------------
      # OpenChatter methods and notifications

diff --cc addons/event/event_view.xml
Simple merge