openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-missing-return-value-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-missing-return-value-ysa/+merge/57122

[IMP] training_* :- retrun value in method. some method missing return value.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-missing-return-value-ysa/+merge/57122
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-missing-return-value-ysa.

=== modified file 'training/training.py'
--- training/training.py	2011-04-08 07:24:10 +0000
+++ training/training.py	2011-04-11 09:04:30 +0000
@@ -1206,6 +1206,7 @@
                         fp = file(filename, 'w')
                         fp.write(res)
                         fp.close()
+        return True
 
 training_seance_generate_pdf_wizard()
 
@@ -1788,6 +1789,7 @@
                 participation_id = proxy_seance._create_participation(cr, uid, seance, subscription_line, context=context)
                 #if seance.state == 'confirmed':
                 #    proxy.create_procurements(cr, uid, [participation_id], delayed=True, context=context)
+        return True
 
     # training.session
     def action_workflow_draft(self, cr, uid, ids, context=None):
@@ -1897,6 +1899,7 @@
                         objs.setdefault(contact.id, {}).setdefault('seances', []).append(seance)
 
             proxy.send_email(cr, uid, objs.keys(), 'session_confirm_cancelled', session, context, objs)
+        return True
 
     # training.session
     def action_workflow_cancel(self, cr, uid, ids, context=None):
@@ -3023,6 +3026,7 @@
         for subscription in self.browse(cr, uid, ids, context=context):
             for sl in subscription.subscription_line_ids:
                 workflow.trg_validate(uid, 'training.subscription.line', sl.id, signal, cr)
+        return True
 
     # training.subscription
     def action_workflow_cancel(self, cr, uid, ids, context=None):
@@ -3506,7 +3510,7 @@
 
     # training.subscription.line
     def action_workflow_invoice_and_send_emails(self, cr, uid, ids, context=None):
-        self.action_create_invoice_and_refund(cr, uid, ids, context)
+        return self.action_create_invoice_and_refund(cr, uid, ids, context)
 
     # training.subscription.line
     def _delete_participations(self, cr, uid, ids, context=None):
@@ -3604,7 +3608,7 @@
         if discount_invoices:
             ctx['discount'] = DISCOUNT_PERCENT
             self.action_create_invoice(cr, uid, discount_invoices, context=ctx)
-
+        return True
 
     def _invoice_min_max(self, cr, uid, values, context=None):
         if context is None:
@@ -3630,7 +3634,7 @@
 
         values['price_unit'] = price
         values['discount'] = discount
-
+        return values
 
     def _get_courses(self, cr, uid, ids, context=None):
         if context is None:
@@ -3820,6 +3824,7 @@
                 hremail = sl.partner_hr_email
                 # do not group HR emails...
                 email_proxy.send_email(cr, uid, trigger, 'hr', hremail, session=sl.session_id, stylegroup=sl.session_id.stylegroup_id, context=context, subline=sl, **objects)
+        return True
 
 training_subscription_line()
 
@@ -3944,7 +3949,7 @@
         if context is None:
             context = {}
         po_proxy = self.pool.get('purchase.order')
-
+        po_id = False
         for this in self.browse(cr, uid, ids, context=context):
             if not this.job_id.name.property_product_pricelist_purchase:
                 raise osv.except_osv(_('No Pricelist'),_('You have to select a  pricelist for this contact'))
@@ -3963,6 +3968,7 @@
 
             for sh in this.participation_ids:
                 sh.create_purchase_order_line(po_id)
+        return po_id
 
     def action_create_purchase_order(self, cr, uid, ids, context=None):
         if context is None:
@@ -3986,6 +3992,7 @@
         workflow = netsvc.LocalService('workflow')
         for this in self.browse(cr, uid, ids, context=context):
             workflow.trg_validate(uid, 'purchase.order', this.purchase_order_id.id, 'purchase_confirm', cr)
+        return True
 
     def _approve_PO(self,cr, uid, ids, context=None):
         workflow = netsvc.LocalService('workflow')
@@ -3993,25 +4000,28 @@
         for this in self.browse(cr, uid, ids, context=context):
             if this.purchase_order_id:
                 workflow.trg_validate(uid, 'purchase.order', this.purchase_order_id.id, 'purchase_approve', cr)
+        return True
 
     def _cancel_PO(self, cr, uid, ids, context=None):
         workflow = netsvc.LocalService('workflow')
         for this in self.browse(cr, uid, ids, context=context):
             if this.purchase_order_id:
                 workflow.trg_validate(uid, 'purchase.order', this.purchase_order_id.id, 'purchase_cancel', cr)
-
+        return True
 
     def _spread_wkf_signal(self, cr, uid, ids, signal, context=None):
         workflow = netsvc.LocalService('workflow')
         for this in self.browse(cr, uid, ids, context):
             for sh in this.participation_ids:
                 workflow.trg_validate(uid, 'training.participation.stakeholder', sh.id, signal, cr)
+        return True
 
 
     def action_wkf_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
         self._cancel_PO(cr, uid, ids, context)
         self._spread_wkf_signal(cr, uid, ids, 'signal_cancel', context)
+        return True
 
     def test_wkf_valid(self, cr, uid, ids, context=None):
         res = all(bool(request.purchase_order_id) != False for request in self.browse(cr, uid, ids, context=context))
@@ -4255,6 +4265,7 @@
         pol_proxy = self.pool.get('purchase.order.line')
         workflow = netsvc.LocalService('workflow')
 
+        pol_id = False
         for obj in self.browse(cr, uid, ids, context=context):
             product = obj.seance_id._get_product()
             if not product:
@@ -4279,6 +4290,7 @@
 
             pol_id = pol_proxy.create(cr, uid, values, context=context)
             obj.write({'purchase_order_line_id' : pol_id})
+        return pol_id
 
     def _check_disponibility(self, cr, uid, ids, context=None):
         if context is None:
@@ -4312,9 +4324,11 @@
         if objects_by_ids is None:
             objects_by_ids = {}
         email_proxy = self.pool.get('training.email')
+        send_mail = False
         for sh in self.browse(cr, uid, ids, context=context):
             if sh.request_id and sh.request_id.email:
-                email_proxy.send_email(cr, uid, trigger, 'sh', sh.request_id.email, session=session, context=context, sh=sh, **objects_by_ids.get(sh.id, {}))
+                send_mail = email_proxy.send_email(cr, uid, trigger, 'sh', sh.request_id.email, session=session, context=context, sh=sh, **objects_by_ids.get(sh.id, {}))
+        return send_mail
 
     def _test_wkf(self, cr, uid, ids, state, context=None):
         for this in self.browse(cr, uid, ids, context):

=== modified file 'training_evaluation/training_evaluation.py'
--- training_evaluation/training_evaluation.py	2011-04-07 13:04:11 +0000
+++ training_evaluation/training_evaluation.py	2011-04-11 09:04:30 +0000
@@ -320,6 +320,7 @@
             value = questions.get(eval_line.question_id.id, None)
             if value is not None:
                 eval_line.write({'response_value': value})
+        return True
 
     _columns = {
         'name' : fields.char('Reference', size=64, required=True, select=1, readonly=True),
@@ -589,7 +590,7 @@
                     fp.write(res)
                     fp.close()
 
-        super(training_seance_generate_pdf_wizard, self).add_selections(cr, uid, ids, directory, log, context=context)
+        return super(training_seance_generate_pdf_wizard, self).add_selections(cr, uid, ids, directory, log, context=context)
 
 training_seance_generate_pdf_wizard()
 

=== modified file 'training_evaluation/wizard/wizard_preview_evaluation.py'
--- training_evaluation/wizard/wizard_preview_evaluation.py	2011-04-08 11:07:04 +0000
+++ training_evaluation/wizard/wizard_preview_evaluation.py	2011-04-11 09:04:30 +0000
@@ -40,6 +40,7 @@
         ids = lang_pool.search(cr, uid, [('code','=', context.get('lang', 'en_US'))])
         if ids:
             return ids[0]
+        return False
 
     _defaults = {
         'lang_id': _get_default_language,

=== modified file 'training_exam/training_exam.py'
--- training_exam/training_exam.py	2011-04-08 09:43:39 +0000
+++ training_exam/training_exam.py	2011-04-11 09:04:30 +0000
@@ -868,7 +868,7 @@
         for quizz in self.browse(cr, uid, ids, context=context):
             if not all([ x.question_id.state == 'validated' for x in quizz.question_ids]):
                 raise osv.except_osv(_('Error'), _('You cannot validate a questionnaire which don\'t have all their questions validated'))
-        self.write(cr, uid, ids, {'state': 'validated'})
+        return self.write(cr, uid, ids, {'state': 'validated'})
 
 exam_questionnaire()
 
@@ -1332,6 +1332,7 @@
                     qdict[qid] = new_id
                 else:
                     tpline.write(cr, uid, qdict[qid], new_tpline, context=context)
+        return True
 
     def _result_compute(self, cr, uid, ids, fieldnames, args, context=None):
         if context is None:
@@ -1540,6 +1541,7 @@
             ocv = self.on_change_course_questionnaire(cr, uid, [], course.id, final_quizz_id, context=context)
             vals.update(ocv.get('value',{}))
             self.write(cr, uid, [p.id], vals)
+        return True
 
     _columns = {
         'exam_id': fields.related('subscription_line_id', 'course_id', type='many2one', relation='training.course', readonly=True, string="Exam"),

=== modified file 'training_exam/wizard/training_seance_generate.py'
--- training_exam/wizard/training_seance_generate.py	2011-04-08 09:04:59 +0000
+++ training_exam/wizard/training_seance_generate.py	2011-04-11 09:04:30 +0000
@@ -77,7 +77,7 @@
                     fp.write(res)
                     fp.close()
 
-        super(training_seance_generate_pdf_wizard, self).add_selections(cr, uid, ids, directory, log, context=context)
+        return super(training_seance_generate_pdf_wizard, self).add_selections(cr, uid, ids, directory, log, context=context)
 
 training_seance_generate_pdf_wizard()
 

=== modified file 'training_exam_processing/training_exam_processing.py'
--- training_exam_processing/training_exam_processing.py	2011-03-31 13:22:18 +0000
+++ training_exam_processing/training_exam_processing.py	2011-04-11 09:04:30 +0000
@@ -407,6 +407,7 @@
         else:
             raise osv.except_osv(_('Error'), _('Unable to find an active Analytic Purchase Journal'))
 
+        pol_id = False
         for obj in self.browse(cr, uid, ids, context=context):
             price = 0 #obj.price
             qty = 1.0 #obj.seance_id.duration * 1.0
@@ -442,6 +443,7 @@
 
             # update correction request line
             obj.write({'pol_id' : pol_id})
+        return pol_id
 
 exam_correction()
 
@@ -470,10 +472,10 @@
             title_data.append("(%08d) [%s] %s" % (r[0], r[2] and 'x' or ' ', r[1]))
             user_data.append("(%08d) [%s] %s" % (r_user[i][0], r_user[i][2] and 'x' or ' ', r_user[i][1]))
         linesep = "----- ----- -----"
-        s = "To question %s (id:%d) on page %d\n%s\n%s\nGood responses:\n%s\n%s\nUser respones:\n%s\n%s\n" % (
+        result = "To question %s (id:%d) on page %d\n%s\n%s\nGood responses:\n%s\n%s\nUser respones:\n%s\n%s\n" % (
             q['name'], q['id'], page_num, q['question'], linesep, '\n'.join(title_data), linesep, '\n'.join(user_data), linesep
         )
-        return s
+        return result
 
     def do_correction_auto(self, cr, uid, res_id, page_num, scanner, context=None):
         if context is None:
@@ -591,6 +593,7 @@
             #particip.write({'result_received': True})
 
         position_storage_proxy.save_checkboxes_value(cr, uid, self._name, res_id, page_num, values, context)
+        return True
 
 training_participation()
 

=== modified file 'training_intra/training_intra.py'
--- training_intra/training_intra.py	2011-04-07 11:11:57 +0000
+++ training_intra/training_intra.py	2011-04-11 09:04:30 +0000
@@ -290,8 +290,7 @@
                     ORDER BY
                         toff.id""")
         result_ids = [ x['id'] for x in cr.dictfetchall() ]
-        r = [('id',(cond and 'in' or 'not in'), result_ids)]
-        return r
+        return [('id',(cond and 'in' or 'not in'), result_ids)]
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if context is None:
@@ -547,7 +546,7 @@
 
                 proxy_line.create(cr, uid, new_values, context=context)
 
-        this.write({'sale_order_id' : order_id})
+        return this.write({'sale_order_id' : order_id})
 
         #return {
         #    'view_type': 'form',
@@ -559,7 +558,6 @@
         #    'res_id' : order_id,
         #}
 
-        return True
 
 training_offer()