openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05184
lp:~openerp-dev/openobject-addons/addons-training-all-imp-code-ysa into lp:~openobject-training/openobject-addons/training
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-all-imp-code-ysa into lp:~openobject-training/openobject-addons/training.
Requested reviews:
OpenObject Training (openobject-training)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-all-imp-code-ysa/+merge/56760
[IMP] improve code in all training related module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-all-imp-code-ysa/+merge/56760
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-all-imp-code-ysa.
=== modified file 'portal/wizard/portal_create_user.py'
--- portal/wizard/portal_create_user.py 2011-03-31 09:17:04 +0000
+++ portal/wizard/portal_create_user.py 2011-04-07 13:21:05 +0000
@@ -73,7 +73,7 @@
user = user_ref.search(cr, uid,[('login', "=", addr.email)])
if user:
- user = user_ref.browse(cr, uid, user[0])
+ user = user_ref.browse(cr, uid, user[0], context=context)
existing += "- %s (Login: %s, Password: %s)\n"%(user.name, addr.email, user.password)
mail = portal_user_data.mail % {'login' : addr.email, 'passwd':user.password}
if portal_user_data.send_mail_existing:
=== modified file 'portal_training/portal_training.py'
--- portal_training/portal_training.py 2011-04-04 12:58:43 +0000
+++ portal_training/portal_training.py 2011-04-07 13:21:05 +0000
@@ -186,7 +186,7 @@
def _user_is_stakeholder_search(self, cr, uid, obj, name, domain, context=None):
if context is None:
context = {}
- user = self.pool.get('res.users').browse(cr, uid, uid)
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if not len(domain):
return []
@@ -213,7 +213,7 @@
def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
- if (context and context.get('portal_search_reverse_order') or False):
+ if context.get('portal_search_reverse_order', False):
order = 'date DESC'
return super(training_seance, self).search(cr, uid, domain, offset=offset,
limit=limit, order=order,context=context, count=count)
@@ -221,7 +221,7 @@
def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
if context is None:
context = {}
- if (context and context.get('portal_search_reverse_order') or False):
+ if context.get('portal_search_reverse_order', False):
res = super(training_seance, self).read(cr, user, ids, fields=fields, context=context,
load=load)
# we juste reverse the list. we don't have problem with offset and limit here because
@@ -320,7 +320,7 @@
if imd_ids:
imd = imd_proxy.browse(cr, uid, imd_ids[0], context=context)
if imd:
- group = self.pool.get(imd.model).browse(cr, uid, imd.res_id)
+ group = self.pool.get(imd.model).browse(cr, uid, imd.res_id, context=context)
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if any(group_id.id == group.id for group_id in user.groups_id):
result2 = super(training_session, self).search(cr, uid, [('kind', '!=', 'intra'),
@@ -495,7 +495,7 @@
def search(self, cr, uid, domain, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
- if (context and context.get('portal_search_reverse_order') or False):
+ if context.get('portal_search_reverse_order', False):
order = 'date DESC'
return super(training_participation_stakeholder_request, self).search(cr, uid, domain, offset=offset,
limit=limit, order=order,context=context, count=count)
@@ -503,7 +503,7 @@
def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
if context is None:
context = {}
- if (context and context.get('portal_search_reverse_order') or False):
+ if context.get('portal_search_reverse_order', False):
res = super(training_participation_stakeholder_request, self).read(cr, user, ids, fields=fields, context=context,
load=load)
res_dict = dict([(x['id'],x) for x in res])
=== modified file 'training/document_price.py'
--- training/document_price.py 2011-03-21 12:26:03 +0000
+++ training/document_price.py 2011-04-07 13:21:05 +0000
@@ -55,7 +55,7 @@
try:
price_list = user.company_id.partner_id.property_product_pricelist_purchase.id
except:
- ids = self.pool.get('product.pricelist').search(cr, uid, [('key', '=', 'purchase')])
+ ids = self.pool.get('product.pricelist').search(cr, uid, [('key', '=', 'purchase')], context=context)
price_list = ids[0]
prices = dict.fromkeys(ids, 0.0)
@@ -132,7 +132,7 @@
course_ids = [course[2]['course_id'] for course in link_course_ids]
return super(document_price, self).search(cr, uid, [('type', '=', 'course_material'),
('res_model', '=', 'training.course'),
- ('res_id', 'in', course_ids)])
+ ('res_id', 'in', course_ids)], context=context)
return super(document_price, self).search(cr, uid, domain, offset=offset,
limit=limit, order=order, context=context, count=count)
=== modified file 'training/invoice.py'
--- training/invoice.py 2011-03-25 10:14:01 +0000
+++ training/invoice.py 2011-04-07 13:21:05 +0000
@@ -38,6 +38,8 @@
return values
def action_workflow_send_email(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
srv = netsvc.LocalService('report.account.invoice')
for invoice in self.browse(cr, uid, ids, context=context):
if invoice.send_to and invoice.type == 'out_invoice':
@@ -102,4 +104,3 @@
purchase_order_analytic_distribution()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'training/partner.py'
--- training/partner.py 2011-03-23 12:38:11 +0000
+++ training/partner.py 2011-04-07 13:21:05 +0000
@@ -141,7 +141,7 @@
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
if context is None:
context = {}
- partner_id = context and context.get('partner_id', False) or False
+ partner_id = context.get('partner_id', False)
job_search_context = 'ignore_past'
if context.get('job_search_context', False):
job_search_context = context.get('job_search_context')
@@ -202,7 +202,7 @@
cr.execute("SELECT course_id FROM training_course_offer_rel WHERE offer_id = %s", (offer_id,))
course_ids = [x[0] for x in cr.fetchall()]
else:
- course_id = context and context.get('course_id', False) or False
+ course_id = context.get('course_id', False)
if course_id:
course_ids = [course_id]
=== modified file 'training/training_content_review.py'
--- training/training_content_review.py 2011-03-28 13:38:58 +0000
+++ training/training_content_review.py 2011-04-07 13:21:05 +0000
@@ -331,6 +331,8 @@
def action_add_content(self, cr, uid, ids, context=None):
if context is None:
context = {}
+ if not ids:
+ return False
wizard = self.browse(cr, uid, ids[0], context=context)
active_id = context.get('active_id')
=== modified file 'training/training_holiday.py'
--- training/training_holiday.py 2011-03-21 12:26:03 +0000
+++ training/training_holiday.py 2011-04-07 13:21:05 +0000
@@ -104,6 +104,8 @@
}
def _check_date(self, cr, uid, ids, context=None):
+ if not ids:
+ return False
return self.browse(cr, uid, ids[0], context=context).year >= int(time.strftime('%Y'))
def action_cancel(self, cr, uid, ids, context=None):
=== modified file 'training/wizard/training_create_block_offer.py'
--- training/wizard/training_create_block_offer.py 2011-03-21 12:26:03 +0000
+++ training/wizard/training_create_block_offer.py 2011-04-07 13:21:05 +0000
@@ -71,7 +71,7 @@
return {}
proxy_course = self.pool.get(active_model)
- form = self.read(cr, uid, ids, [])[0]
+ form = self.read(cr, uid, ids, [], context=context)[0]
offer_id = proxy_offer.create(cr, uid,
{
'name' : form['name'],
=== modified file 'training/wizard/training_create_offer.py'
--- training/wizard/training_create_offer.py 2011-03-21 12:26:03 +0000
+++ training/wizard/training_create_offer.py 2011-04-07 13:21:05 +0000
@@ -31,7 +31,7 @@
context = {}
if context.get('active_id',False):
- course = self.pool.get('training.course').browse(cr, uid, context['active_id'], context=context)
+ course = self.pool.get('training.course').browse(cr, uid, context.get('active_id',[]), context=context)
if course.state_course != 'validated':
raise osv.except_osv(_('Warning'),_("Please, you can create an offer with a validated course"))
=== modified file 'training/wizard/training_subscription_session.py'
--- training/wizard/training_subscription_session.py 2011-03-21 12:26:03 +0000
+++ training/wizard/training_subscription_session.py 2011-04-07 13:21:05 +0000
@@ -34,7 +34,7 @@
if context is None:
context = {}
- form = self.read(cr, uid, ids, [])[0]
+ form = self.read(cr, uid, ids, [], context=context)[0]
subscription_proxy = self.pool.get('training.subscription')
subscription_line_proxy = self.pool.get('training.subscription.line')
partner_obj = self.pool.get('res.partner')
@@ -61,7 +61,7 @@
'view_type': 'form',
"view_mode": 'form',
'res_model': 'training.subscription',
- 'view_id': self.pool.get('ir.ui.view').search(cr,uid,[('name','=','training.subscription.form')]),
+ 'view_id': self.pool.get('ir.ui.view').search(cr, uid, [('name','=','training.subscription.form')], context=context),
'type': 'ir.actions.act_window',
'target': 'current',
'res_id' : int(subscription_id)
=== modified file 'training/wizard/wizard_create_session.py'
--- training/wizard/wizard_create_session.py 2011-03-22 08:49:13 +0000
+++ training/wizard/wizard_create_session.py 2011-04-07 13:21:05 +0000
@@ -37,7 +37,7 @@
}
def _default_get_name(self, cr, uid, context=None):
- if not context:
+ if context is None:
return ''
active_id = context.get('active_id')
if not active_id:
@@ -78,7 +78,8 @@
"""
if not context or not ids:
raise osv.except_osv(_('Error'), _('Context not defined'))
-
+ if context is None:
+ context = {}
wizard = self.browse(cr, uid, ids[0], context=context)
active_id = context.get('active_id')
=== modified file 'training/wizard/wizard_subscription_line_invoice.py'
--- training/wizard/wizard_subscription_line_invoice.py 2009-09-03 20:05:08 +0000
+++ training/wizard/wizard_subscription_line_invoice.py 2011-04-07 13:21:05 +0000
@@ -43,7 +43,7 @@
if not len_ids:
return {}
-
+
def get_view(name):
ima = pool.get('ir.model.data')
imaid = ima._get_id(cr, uid, 'training', name)
=== modified file 'training_degree/__init__.py'
--- training_degree/__init__.py 2009-11-05 19:09:37 +0000
+++ training_degree/__init__.py 2011-04-07 13:21:05 +0000
@@ -1,2 +1,4 @@
import training_degree
import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'training_degree/__openerp__.py'
--- training_degree/__openerp__.py 2011-03-18 08:57:04 +0000
+++ training_degree/__openerp__.py 2011-04-07 13:21:05 +0000
@@ -17,3 +17,5 @@
'active' : False,
'installable' : True,
}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'training_degree/training_degree.py'
--- training_degree/training_degree.py 2011-03-18 08:57:04 +0000
+++ training_degree/training_degree.py 2011-04-07 13:21:05 +0000
@@ -19,11 +19,12 @@
#
##############################################################################
-from osv import osv, orm, fields
+from osv import osv
+from osv import orm
+from osv import fields
import tools
import time
-import csv
import os
import re
import xlwt
@@ -44,11 +45,12 @@
if context is None:
context = {}
- has_validated_questionnaire = context and context.get('has_validated_questionnaire', False) or False
- has_lang_id = context and context.get('has_lang_id', False) or False
+ has_validated_questionnaire = context.get('has_validated_questionnaire', False)
+ has_lang_id = context.get('has_lang_id', False)
if has_validated_questionnaire and has_lang_id:
cr.execute("SELECT course.id "
+
"FROM training_course course "
"WHERE EXISTS ( SELECT * FROM training_exam_questionnaire WHERE main_course_id = course.id) "
" AND course.lang_id = %s", (has_lang_id,))
@@ -75,48 +77,36 @@
_name = 'training.degree'
_columns = {
- 'name' : fields.char('Name', size=64, required=True, select=1),
-
+ 'name' : fields.char('Name', size=64, required=True),
'course_ids' : fields.many2many('training.course',
'training_course_degree_rel',
'degree_id',
'course_id',
'Courses',
- select=1
),
'state' : fields.selection([('draft', 'Draft'),
('validated', 'Validated'),
('deprecated', 'Deprecated')],
'State',
- required=True,
- readonly=True, select=1),
- 'lang_id' : fields.many2one('res.lang', 'Language', required=True, select=1),
+ required=True, readonly=True),
+ 'lang_id' : fields.many2one('res.lang', 'Language', required=True),
}
def action_deprecate(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
return self.write(cr, uid, ids, {'state' : 'deprecated'}, context=context)
def action_validate(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
return self.write(cr, uid, ids, {'state' : 'validated'}, context=context)
def action_draft(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
return self.write(cr, uid, ids, {'state' : 'draft'}, context=context)
def _lang_default(self, cr, uid, context=None):
- if context is None:
- context = {}
lang_proxy = self.pool.get('res.lang')
user_proxy = self.pool.get('res.users')
-
lang = user_proxy.browse(cr, uid, uid, context=context).context_lang
-
- return lang_proxy.search(cr, uid, [('code', '=', lang)], context=context)[0]
+ lang_ids = lang_proxy.search(cr, uid, [('code', '=', lang)], context=context)
+ return lang_ids and lang_ids[0] or False
_defaults = {
#'lang_id' : _lang_default,
@@ -130,7 +120,7 @@
_rec_name = 'degree_id'
def _get_courses_status(self, cr, uid, ids, fieldnames, args, context=None):
- if not context:
+ if context is None:
context = {}
degree_courses_cache = {} # degree_id: [ course_id, course_id, ..]
@@ -176,7 +166,7 @@
def _check_particip_degree(self, cr, uid, ids, context=None):
""" store function with return degree contact to be updated
"""
- if not context:
+ if context is None:
context = {}
contact_set = set()
for p in self.browse(cr, uid, ids, context=context):
@@ -196,7 +186,7 @@
return res
def _state_summary_compute(self, cr, uid, ids, fieldnames, args, context=None):
- if not context:
+ if context is None:
context = {}
res = {}
for obj in self.browse(cr, uid, ids, context=context):
@@ -290,9 +280,6 @@
}
def action_acquire(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
-
return self.write(cr, uid, ids, {'state' : 'acquired', 'date' : time.strftime("%Y-%m-%d")}, context=context)
training_degree_contact()
@@ -300,12 +287,11 @@
class res_partner_contact(osv.osv):
_inherit = 'res.partner.contact'
-
def search(self, cr, uid, domain, offset = 0, limit = None, order = None, context = None, count = False):
if context is None:
context = {}
- eligible_degree = context.get('eligible_degree', False) or False
+ eligible_degree = context.get('eligible_degree', False)
if eligible_degree:
proxy = self.pool.get('training.degree.contact')
@@ -313,6 +299,7 @@
return [dc.contact_id.id for dc in proxy.browse(cr, uid, ids, context=context) if dc.is_eligible == 'yes']
return super(res_partner_contact, self).search(cr, uid, domain, offset=offset, limit=limit, order=order, context=context, count=count)
+
res_partner_contact()
class training_degree_contact_view(osv.osv):
@@ -430,7 +417,7 @@
dc_id = dc.contact_id.id
if dg_id not in dg_cache:
- dg_cache[dg_id] = [ c.id for c in dg_proxy.browse(cr, uid, dg_id).course_ids ]
+ dg_cache[dg_id] = [ c.id for c in dg_proxy.browse(cr, uid, dg_id, context=context).course_ids ]
if dc[obj.kind_search].id == obj[obj.kind_search].id:
if (dc_id, dg_id) not in degree_contacts:
degree_contacts[(dc_id, dg_id)] = dict((c,False) for c in dg_cache[dg_id])
@@ -459,7 +446,6 @@
for obj in self.browse(cr, uid, ids, context=context):
for line in obj.line_ids:
line.write({'subscribe' : 1})
-
return True
def deselect_all_cb(self, cr, uid, ids, context=None):
@@ -468,7 +454,6 @@
for obj in self.browse(cr, uid, ids, context=context):
for line in obj.line_ids:
line.write({'subscribe' : 0})
-
return True
def subscribe_cb(self, cr, uid, ids, context=None):
@@ -483,7 +468,6 @@
elif line.subscribe:
new_id = proxy.create(cr, uid, { 'degree_id' : line.degree_id.id, 'contact_id' : line.contact_id.id, 'state' : 'desired' }, context=context)
dc_ids.append(new_id)
-
if dc_ids:
return {
'domain' : "[('id', 'in', [%s])]" % ",".join(map(str, dc_ids)),
@@ -720,7 +704,7 @@
# If multiple participation, show each participation sorted by date
today = time.time()
- for participation in participation_proxy.browse(cr, uid, list(dc_full_stats[dc_contact.id]['courses_history'])):
+ for participation in participation_proxy.browse(cr, uid, list(dc_full_stats[dc_contact.id]['courses_history']), context=context):
part_date = time.mktime(time.strptime(participation.date, '%Y-%m-%d %H:%M:%S'))
s = 'N/A'
if part_date <= today:
@@ -778,3 +762,6 @@
return {'type' : 'ir.actions.act_window_close'}
training_degree_contact_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
=== modified file 'training_degree/wizard/training_validate_degree.py'
--- training_degree/wizard/training_validate_degree.py 2011-03-18 08:57:04 +0000
+++ training_degree/wizard/training_validate_degree.py 2011-04-07 13:21:05 +0000
@@ -19,9 +19,7 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from osv import osv
class validate_degree(osv.osv_memory):
_name = 'validate.degree'
@@ -37,4 +35,4 @@
validate_degree()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'training_degree/wizard/wizard_eligible_contacts.py'
--- training_degree/wizard/wizard_eligible_contacts.py 2009-11-09 14:17:06 +0000
+++ training_degree/wizard/wizard_eligible_contacts.py 2011-04-07 13:21:05 +0000
@@ -50,7 +50,7 @@
def init(self, cr, uid, data, context=None):
if data['id']:
- degree = pooler.get_pool(cr.dbname).get(data['model']).browse(cr, uid, data['id'])
+ degree = pooler.get_pool(cr.dbname).get(data['model']).browse(cr, uid, data['id'], context=context)
if degree.state != 'validated':
raise wizard.except_wizard(_('Warning'),_("Please, you can only select a validated degree !"))
return {}
=== modified file 'training_diagnostic/report/diagnostic.py'
--- training_diagnostic/report/diagnostic.py 2011-03-31 09:17:04 +0000
+++ training_diagnostic/report/diagnostic.py 2011-04-07 13:21:05 +0000
@@ -122,5 +122,5 @@
'addons/training_diagnostic/report/diagnostic.rml',
parser=diagnostic_report_parser_candidate,
header=False)
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'training_diagnostic/report/diagnostic_synthesis.py'
--- training_diagnostic/report/diagnostic_synthesis.py 2011-03-31 09:17:04 +0000
+++ training_diagnostic/report/diagnostic_synthesis.py 2011-04-07 13:21:05 +0000
@@ -141,4 +141,3 @@
header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'training_evaluation/report/in_construction.py'
--- training_evaluation/report/in_construction.py 2010-09-12 18:03:37 +0000
+++ training_evaluation/report/in_construction.py 2011-04-07 13:21:05 +0000
@@ -159,7 +159,7 @@
# self.training_scan_result = pooler.get_pool(cr.dbname).get('training.scan.result')
def create_source_pdf(self, cr, uid, ids, data, report_xml, context=None):
- if not context:
+ if context is None:
context={}
pool = pooler.get_pool(cr.dbname)
attach = report_xml.attachment
@@ -172,7 +172,7 @@
if report_xml.attachment_use and aname and context.get('attachment_use', True) and 'preview' not in context:
aids = pool.get('ir.attachment').search(cr, uid, [('datas_fname','=',aname+'.pdf'),('res_model','=',self.table),('res_id','=',obj.id)])
if aids:
- brow_rec = pool.get('ir.attachment').browse(cr, uid, aids[0])
+ brow_rec = pool.get('ir.attachment').browse(cr, uid, aids[0], context=context)
if not brow_rec.datas:
continue
d = base64.decodestring(brow_rec.datas)
@@ -212,6 +212,8 @@
return self.create_single_pdf(cr, uid, ids, data, report_xml, context)
def create_single_pdf(self, cr, uid, ids, data, report_xml, context=None):
+ if context is None:
+ context = {}
# TODO regroup in context['report_misc_data']
pool = pooler.get_pool(cr.dbname)
context['checkboxes_position'] = [] # add a reference in context since it can't be modified during next call
@@ -230,11 +232,11 @@
class report_evaluation(report_and_store_checkboxes_position):
def create(self, cr, uid, ids, data, context=None):
- if not context:
- context = {}
return super(report_evaluation, self).create(cr, uid, ids, data, context=context)
- def getObjects(self, cr, uid, ids, context):
+ def getObjects(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
if 'preview' in context:
pool = pooler.get_pool(cr.dbname)
return pool.get('training.evaluation.questionnaire.preview.wizard').browse(cr, uid, ids, context=context)
=== modified file 'training_evaluation/report/report_evaluation.py'
--- training_evaluation/report/report_evaluation.py 2011-03-28 06:20:12 +0000
+++ training_evaluation/report/report_evaluation.py 2011-04-07 13:21:05 +0000
@@ -263,7 +263,6 @@
class contact_own_evaluation(report_sxw.report_sxw):
def getObjects(self, cr, uid, ids, context=None):
- print("GET OBJECTS")
user_pool = pooler.get_pool(cr.dbname).get('res.users')
user = user_pool.browse(cr, uid, uid, context=context)
if user.contact_id:
=== modified file 'training_evaluation/training_evaluation.py'
--- training_evaluation/training_evaluation.py 2011-03-21 10:41:55 +0000
+++ training_evaluation/training_evaluation.py 2011-04-07 13:21:05 +0000
@@ -20,8 +20,8 @@
#
##############################################################################
-from osv import osv, fields
-import tools
+from osv import osv
+from osv import fields
from tools.translate import _
import os
import time
@@ -369,7 +369,7 @@
return [x[0] for x in cr.fetchall()]
- evaluation_course_id = (context and 'evaluation_course_id' in context and context.pop('evaluation_course_id')) or False
+ evaluation_course_id = ('evaluation_course_id' in context and context.pop('evaluation_course_id')) or False
if evaluation_course_id:
cr.execute("""
SELECT teg.id
@@ -544,7 +544,7 @@
if context is None:
context = {}
- active_id = context and context.get('active_id') or False
+ active_id = context.get('active_id')
if active_id:
seance = self.pool.get('training.seance').browse(cr, uid, active_id, context=context)
return seance[['participant_count', 'participant_count_manual'][seance.manual]]
@@ -560,7 +560,7 @@
if context is None:
context = {}
- active_id = context and context.get('active_id')
+ active_id = context.get('active_id')
evg_pool = self.pool.get('training.evaluation.global')
ev_quizz_pool = self.pool.get('training.evaluation.questionnaire')
=== modified file 'training_evaluation/wizard/wizard_organization_report.py'
--- training_evaluation/wizard/wizard_organization_report.py 2011-03-21 10:41:55 +0000
+++ training_evaluation/wizard/wizard_organization_report.py 2011-04-07 13:21:05 +0000
@@ -49,4 +49,7 @@
'report_name': 'training.evaluation.organization.report',
'datas': datas,
}
+
wizard_training_evaluation_organization_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'training_evaluation/wizard/wizard_preview_evaluation.py'
--- training_evaluation/wizard/wizard_preview_evaluation.py 2011-03-21 10:41:55 +0000
+++ training_evaluation/wizard/wizard_preview_evaluation.py 2011-04-07 13:21:05 +0000
@@ -61,3 +61,5 @@
}
wizard_preview_evaluation()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'training_exam/report/exam_sheet.py'
--- training_exam/report/exam_sheet.py 2011-04-06 07:06:20 +0000
+++ training_exam/report/exam_sheet.py 2011-04-07 13:21:05 +0000
@@ -78,8 +78,8 @@
REPORT_CONTEXT_FILTERS = [] # if not empty, remove every REPORT_CONTEXT_OPTIONS not inside this list from context
REPORT_EXTRA_INFOS_FILTERS = [] # if not empty, keep only thoses extra infos types
- def __init__(self, cr, uid, name, context):
- if not context:
+ def __init__(self, cr, uid, name, context=None):
+ if context is None:
context = {}
for k, v in self.REPORT_CONTEXT_FORCE.iteritems():
@@ -299,13 +299,13 @@
quizz_id = ids[0]
if data.get('model', '') == 'training.participation':
- participation = pool.get('training.participation').browse(cr, uid, data['id'])
+ participation = pool.get('training.participation').browse(cr, uid, data['id'], context=context)
quizz_id = participation.questionnaire_id.id
if isinstance(quizz_id, bool) and quizz_id == False:
raise Exception(_('Could not generate exam sheet report, no questionnaire is defined on the participation'))
quizz_proxy = pool.get('training.exam.questionnaire')
- quizz = quizz_proxy.browse(cr, uid, quizz_id)
+ quizz = quizz_proxy.browse(cr, uid, quizz_id, context=context)
def write_orig_document():
r = PdfFileReader(StringIO.StringIO(original_doc[0]))
@@ -379,8 +379,6 @@
class report_preview(report_sxw.report_sxw, report_attachment):
def create(self, cr, uid, ids, data, context=None):
- if not context:
- context = {}
z = super(report_preview, self).create(cr, uid, ids, data, context=context)
return self.create_with_attachment(cr, uid, ids, data, z, context=context)
#
@@ -477,7 +475,7 @@
class report_questionnaire(report_sxw.report_sxw):
def getObjects(self, cr, uid, ids, context):
- if not context:
+ if context is None:
context = {}
if context.get('wizard_print_raw',False) and context.get('active_ids',[]):
# we are printing raw questions: create a fake participation + fake questionnaire
=== modified file 'training_exam/training_exam.py'
--- training_exam/training_exam.py 2011-04-01 10:48:06 +0000
+++ training_exam/training_exam.py 2011-04-07 13:21:05 +0000
@@ -26,7 +26,6 @@
from osv import fields
import netsvc
import random
-import datetime
import tools
from tools.translate import _
import time
@@ -518,7 +517,7 @@
questionnaire_id = context.get('questionnaire_id', False)
if questionnaire_id:
- course_id = self.pool.get('training.exam.questionnaire').browse(cr, uid, questionnaire_id).main_course_id.id
+ course_id = self.pool.get('training.exam.questionnaire').browse(cr, uid, questionnaire_id, context=context).main_course_id.id
if course_id:
cr.execute("SELECT question_id FROM training_question_course_rel WHERE course_id = %s",
@@ -534,6 +533,8 @@
"""
if context is None:
context = {}
+ if report_context is None:
+ report_context = {}
result = []
qn_fields = self.fields_get(cr, uid, fields=['type'], context=context)
qn_type = question.type
@@ -541,7 +542,7 @@
if qn_type_list:
result.append(('type', _('TYPE: %s') % (qn_type_list[0])))
if question.course_ids:
- if report_context and not report_context.get('force_course_id',False):
+ if not report_context.get('force_course_id',False):
course_list = [ c.name for c in question.course_ids ]
result.append(('courses', _('COURSES: %s') % (', '.join(course_list))))
return result
@@ -615,7 +616,7 @@
context = {}
if not course_id:
return {'value' : {'category_id':''}}
- course = self.pool.get('training.course').browse(cr,uid,course_id)
+ course = self.pool.get('training.course').browse(cr, uid, course_id, context=context)
result = self.pool.get('training.course_category').search(cr, uid, [('analytic_account_id','=',course.parent_id.id)], context=context)
return {'value' : {'category_id' : result[0]}}
@@ -639,7 +640,7 @@
if context is None:
context = {}
result = {}
- for quizz in self.browse(cr, uid, ids):
+ for quizz in self.browse(cr, uid, ids, context=context):
type = 'automatic'
for question in quizz.question_ids:
if question.question_type == 'plain':
@@ -968,14 +969,14 @@
# we must apply this pricelist if current partner is one of those
ocv = {'value':{}}
if course_id:
- course = self.pool.get('training.course').browse(cr, uid, course_id)
+ course = self.pool.get('training.course').browse(cr, uid, course_id, context=context)
if course.category_id and course.category_id.price_list_id:
if any(partner.id == partner_id for partner in course.category_id.partner_ids):
price_list_id = course.category_id.price_list_id.id
ocv['value']['price_list_id'] = price_list_id
else:
# get partner default pricelist
- p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+ p = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
pl = p.property_product_pricelist and p.property_product_pricelist.id or False
ocv['value']['price_list_id'] = pl
@@ -1098,7 +1099,7 @@
# Get journal
journal_pool = self.pool.get('account.journal')
journal_sales_srch = journal_pool.search(cr, uid, [('type','=','sale'),('refund_journal','=',False)])
- journal_sales = journal_pool.browse(cr, uid, journal_sales_srch)[0]
+ journal_sales = journal_pool.browse(cr, uid, journal_sales_srch, context=context)[0]
proxy_seance = self.pool.get('training.seance')
proxy_invoice = self.pool.get('account.invoice')
@@ -1107,9 +1108,6 @@
proxy_adistline = self.pool.get('account.analytic.plan.instance.line')
workflow = netsvc.LocalService('workflow')
- if not context:
- context = {}
-
exam_sl_ids = []
other_sl_ids = []
@@ -1157,7 +1155,7 @@
invoice_id = proxy_invoice.create(cr, uid, invoice_values)
fpos_proxy = self.pool.get('account.fiscal.position')
- fpos = invoice_values['fiscal_position'] and fpos_proxy.browse(cr, uid, [invoice_values['fiscal_position']])[0] or False
+ fpos = invoice_values['fiscal_position'] and fpos_proxy.browse(cr, uid, [invoice_values['fiscal_position']], context=context)[0] or False
global_courses = self._get_courses(cr, uid, [sl.id for sl in subscription_lines], context=context)
for sl in subscription_lines:
@@ -1311,7 +1309,7 @@
new_id = tpline.create(cr, uid, new_tpline, context=context)
qdict[str(question_line.question_id.id)] = new_id
- for page_num, page in enumerate(context['checkboxes_context']):
+ for page_num, page in enumerate(context.get('checkboxes_context',False)):
if not len(page):
continue
for qanswer in page:
@@ -1500,7 +1498,7 @@
}
quizz_proxy = self.pool.get('training.exam.questionnaire')
- quizz = quizz_proxy.browse(cr, uid, questionnaire_id)
+ quizz = quizz_proxy.browse(cr, uid, questionnaire_id, context=context)
return {
'value': {
'passing_score': quizz.passing_score,
@@ -1631,7 +1629,7 @@
if context is None:
context = {}
obj = self.browse(cr, uid, ids[0], context=context)
- question = self.pool.get('training.exam.question').browse(cr, uid, obj.question_id.id)
+ question = self.pool.get('training.exam.question').browse(cr, uid, obj.question_id.id, context=context)
return obj.point <=question.point or 0.0
def on_change_question(self, cr, uid, ids, question_id, context=None):
@@ -1639,7 +1637,7 @@
context = {}
if not question_id:
return False
- question = self.pool.get('training.exam.question').browse(cr, uid, question_id)
+ question = self.pool.get('training.exam.question').browse(cr, uid, question_id, context=context)
return {
'value': {
'point_question_id': question.point,
@@ -1682,7 +1680,7 @@
if seance.kind != 'exam':
return super(training_participation_stakeholder, self)._default_price_compute(cr, uid, job, seance, product_id=product_id, context=None)
if product_id and isinstance(product_id, (int,long)):
- product = self.pool.get('product.product').browse(cr, uid, product_id)
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
else:
product = seance._get_product()
if not product:
=== modified file 'training_intra/training_intra.py'
--- training_intra/training_intra.py 2011-04-01 09:47:33 +0000
+++ training_intra/training_intra.py 2011-04-07 13:21:05 +0000
@@ -500,7 +500,7 @@
_("The following course has not a valid duration \"%s\" (%d)") % (course_rel.course_id.name, course_rel.course_id.id))
total_duration += course_rel.course_id.duration
journal_sales_srch = journal_proxy.search(cr, uid, [('type','=','sale'),('refund_journal','=',False)])
- journal_sales = journal_proxy.browse(cr, uid, journal_sales_srch)[0]
+ journal_sales = journal_proxy.browse(cr, uid, journal_sales_srch, context=context)[0]
# Create 'analytic distribution instance'
adist_id = proxy_adist.create(cr, uid, {
=== modified file 'training_report/training_report.py'
--- training_report/training_report.py 2011-04-04 13:15:23 +0000
+++ training_report/training_report.py 2011-04-07 13:21:05 +0000
@@ -678,7 +678,7 @@
subl_pool = self.pool.get('training.subscription.line')
price = 0.0
if theor_cost.get('offer_kind',False) == 'intra':
- offer_data = offer_pool.browse(cr, uid, theor_cost['offer_id'])
+ offer_data = offer_pool.browse(cr, uid, theor_cost['offer_id'], context=context)
participant_count = offer_data.number_of_participants or 12
price = (offer_data.sale_order_id and offer_data.sale_order_id.amount_untaxed or 0.0) / participant_count
else:
Follow ups
