Merge lp:~openerp-commiter/openobject-training/6.1-migration-kbh into lp:~openerp-commiter/openobject-training/6.1

[Khushboo Bhatt(openerp)]

Hello,

  I have improved yml in training module.

Thank you,
KBH.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Made small fix on yml file and merged.

Thanks,
Mustufa (mra)

review: Approve

=== modified file 'training/test/training.yml'
--- training/test/training.yml	2012-07-10 12:03:11 +0000
+++ training/test/training.yml	2012-07-11 08:08:31 +0000
@@ -53,6 +53,9 @@
     purchase_ok: True
     standard_price: 1
     procurement_price: from_attachment
+    seller_ids:
+     - name: base.res_partner_asus
+       min_qty: 1
 -
   I create a product for stapling
 -
@@ -65,6 +68,9 @@
     purchase_ok: True
     standard_price: 0.5
     procurement_price: from_product
+    seller_ids:
+     - name: base.res_partner_asus
+       min_qty: 1
 
 -
   I Create "Test Open ERP Technical" Training course theme record.
@@ -681,9 +687,14 @@
     assert len(offer_record.purchase_line_ids) == 0, "before 1st procurements import, we should have no purchase lines on offer"
     assert len(course_record.purchase_line_ids) > 0, "course should have purchase lines"
     self.action_load_procurements(cr, uid, [offer_id], context=context)
+-
+  !python {model: training.offer}: |
+    course_id = ref('training.training_course_openerpmoduledevelopment0')
+    course_record = self.pool.get('training.course').browse(cr, uid, course_id, context=context)
+    offer_id = ref('training.training_offer_openerpmoduledevelopment0')
+    offer_record = self.browse(cr, uid, offer_id, context=context)
     assert len(offer_record.purchase_line_ids) == len(course_record.purchase_line_ids), \
                 "after procurement import, offer should have exact same number of purchase line than course"
-
 -
   I validate 'Test OpenERP Module Development' offer
 -
@@ -852,7 +863,7 @@
     import time
     session_id = self.pool.get('training.session').search(cr, uid, [('name','=', "%s (%s)" % ('Test OpenERP Module Development', str(time.strftime('%Y-%m-%d'))) )] )
     parti_requst_id = self.pool.get('training.participation.stakeholder.request').search(cr, uid, [('session_id','in', session_id)])
-    self.pool.get('training.participation.stakeholder.request').write(cr, uid, parti_requst_id, {'payment_mode':'contract'})
+    self.pool.get('training.participation.stakeholder.request').write(cr, uid, parti_requst_id, {'payment_mode_id':2})
     seance_id = self.pool.get('training.seance').search(cr, uid, [('original_session_id','in',session_id)])
     value = self.on_change_seance(cr, uid, '_', ref("res_partner_job_0"), seance_id[0], context)
     vals = value.get('value',{})

=== modified file 'training/training.py'
--- training/training.py	2012-07-11 05:26:06 +0000
+++ training/training.py	2012-07-11 08:08:31 +0000
@@ -4126,7 +4126,7 @@
             unit_price = product.standard_price
         else:
             pricelists = self.pool.get('product.pricelist')
-            unit_price = pricelists.price_get(cr, uid, [pricelist.id], product.id, seance.duration, job.name)[pricelist.id]
+            unit_price = pricelists.price_get(cr, uid, [pricelist.id], product.id, seance.duration, job.name.id)[pricelist.id]
 
         return unit_price * seance.duration