openerp-dev-web team mailing list archive

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

gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/price_calender_fix into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/price_calender_fix/+merge/55488

Fixed the price error and calendar seance problem 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/price_calender_fix/+merge/55488
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/price_calender_fix.

=== modified file 'training/training_view.xml'
--- training/training_view.xml	2011-03-25 13:29:25 +0000
+++ training/training_view.xml	2011-03-30 08:45:52 +0000
@@ -987,7 +987,7 @@
             <field name="model">training.seance</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar string="Seances" date_start="date" color="course_id" date_delay="duration">
+                <calendar string="Seances" date_start="date" color="kind" date_delay="duration">
                     <field name="name" />
                     <field name="group_id" />
                     <field name="date" />

=== modified file 'training_exam/training_exam.py'
--- training_exam/training_exam.py	2011-03-28 06:20:12 +0000
+++ training_exam/training_exam.py	2011-03-30 08:45:52 +0000
@@ -1022,12 +1022,13 @@
             'job_id' : job.id,
             'job_email': job.email,
             'session_id' : session.id,
+            'price' : 0.0,
         }
         ocv = self.on_change_session(cr, uid, [], session.id, def_pricelist_id, job.name.id, context=context)
         if ocv and 'value' in ocv:
             values.update(ocv['value'])
 
-        course_id = subscription_mass_line.course_id and subscription_mass_line.course_id.id
+        course_id = subscription_mass_line.course_id and subscription_mass_line.course_id.id or False
         ocv = self.on_change_exam(cr, uid, [], values['session_id'], values.get('price_list_id', False), course_id, job.name.id, context=context)
         if ocv and 'value' in ocv:
             values.update(ocv['value'])