[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100708133124-1suo4rspdflfxxcg

addons/account/account.py

@@ -638,6 +638,7 @@ class account_journal(osv.osv):
         'user_id': lambda self,cr,uid,context: uid,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+    
     def write(self, cr, uid, ids, vals, context=None):
         obj=[]
         if 'company_id' in vals:
@@ -719,14 +720,41 @@ class account_journal(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
-    def onchange_type(self, cr, uid, ids, type):
-        res={}
-        for line in self.browse(cr, uid, ids):
-            if type == 'situation':
-                  res= {'value':{'centralisation': True}}
-            else:
-                  res= {'value':{'centralisation': False}}
-        return res
+    def onchange_type(self, cr, uid, ids, type, currency):
+        data_pool = self.pool.get('ir.model.data')
+        user_pool = self.pool.get('res.users')
+        
+        type_map = {
+            'sale':'account_sp_journal_view',
+            'sale_refund':'account_sp_refund_journal_view',
+            'purchase':'account_sp_journal_view',
+            'purchase_refund':'account_sp_refund_journal_view',
+            'expense':'account_sp_journal_view',
+            'cash':'account_journal_bank_view',
+            'bank':'account_journal_bank_view',
+            'general':'account_journal_view',
+            'situation':'account_journal_view'
+        }
+        
+        res = {}
+        
+        view_id = type_map.get(type, 'general')
+        
+        user = user_pool.browse(cr, uid, uid)
+        if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
+            view_id = 'account_journal_bank_view_multi'
+        
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
+        data = data_pool.browse(cr, uid, data_id[0])
+    
+        res.update({
+            'centralisation':type == 'situation',
+            'view_id':data.res_id,
+        })
+        
+        return {
+            'value':res
+        }
 
 account_journal()
 

addons/account/account_view.xml

@@ -332,7 +332,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="type" on_change="onchange_type(type)"/>
+                        <field name="type" on_change="onchange_type(type, currency)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">

addons/base_calendar/base_calendar.py

@@ -793,6 +793,7 @@ class calendar_alarm(osv.osv):
         @param use_new_cursor: False or the dbname
         @param context: A standard dictionary for contextual values
         """
+        return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!!
         if not context:
             context = {}
         current_datetime = datetime.now()

addons/event/security/ir.model.access.csv

@@ -1,6 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_event_type","event.type","model_event_type","event.group_event_subscriber",1,0,0,0
 "access_event_type_manager","event.type manager","model_event_type","event.group_event_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,1
-"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,1
+"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,0
 "access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_subscriber",1,0,0,0
+"access_event_event_manager","event.event manager","model_event_event","event.group_event_manager",1,1,1,1
+"access_event_registration_manager","event.registration manager","model_event_registration","event.group_event_manager",1,1,1,1
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","event.group_event_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","event.group_event_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_manager",1,1,1,1