From 4ce21feabed3e7cbf3ac77fb1514d669bffe36aa Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 8 Jul 2010 15:08:33 +0200 Subject: [PATCH 1/4] [BREAK] WARNING: base_calendar: had to disable the scheduler until the recursion problem is fixed, to release the CPU!!! bzr revid: odo@openerp.com-20100708130833-hhunfcgm6n2dmq9w --- addons/base_calendar/base_calendar.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index f9f6567747f..7896dfae1ae 100644 --- a/addons/base_calendar/base_calendar.py +++ b/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() From fa56e44dcb40c24582045ca2d2f91ccab02eb241 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 8 Jul 2010 18:47:55 +0530 Subject: [PATCH 2/4] [IMP]: improve onchange_tye for the journal bzr revid: mga@tinyerp.com-20100708131755-vovhfnyt2i8u7y9o --- addons/account/account.py | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 3947cf9d813..4b86938854e 100644 --- a/addons/account/account.py +++ b/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: @@ -720,13 +721,33 @@ class account_journal(osv.osv): 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 + data_pool = self.pool.get('ir.model.data') + 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') + 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() From 52509510855b663552e2453cf8f60d8678a29ef6 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 8 Jul 2010 18:51:16 +0530 Subject: [PATCH 3/4] [ADD] event : access rules for Even/Manager bzr revid: vir@tinyerp.com-20100708132116-nv1j2xtogcug0p4p --- addons/event/security/ir.model.access.csv | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv index c30a8b6aa3d..a59748aa534 100644 --- a/addons/event/security/ir.model.access.csv +++ b/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 From 8628eadf47fd11cad61754a2b08e6954c4107aa5 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 8 Jul 2010 18:58:15 +0530 Subject: [PATCH 4/4] [IMP]: improvement in on_change type for multicurrency journals bzr revid: mga@tinyerp.com-20100708132815-d21kma0rxzdfoq1m --- addons/account/account.py | 9 ++++++++- addons/account/account_view.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 4b86938854e..7f01f60253d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -720,8 +720,10 @@ 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): + 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', @@ -737,6 +739,11 @@ class account_journal(osv.osv): 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]) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6ef38dde583..be77a4d30d5 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -332,7 +332,7 @@ - +