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-imp-demo-tranining-room-add-demo-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-imp-demo-tranining-room-add-demo-ysa/+merge/59461

[IMP] training:- improve demo data of training module. training_room :- remove required attribute in python and add in view file of trainig.seance object. also add demo data.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-imp-demo-tranining-room-add-demo-ysa/+merge/59461
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-imp-demo-tranining-room-add-demo-ysa.

=== modified file 'training/__openerp__.py'
--- training/__openerp__.py	2011-04-20 13:24:36 +0000
+++ training/__openerp__.py	2011-04-29 07:25:49 +0000
@@ -68,7 +68,7 @@
         'demo/training_course.xml',
         'demo/training_offer.xml',
         'demo/training_catalog.xml',
-#        'demo/training_session.xml',
+        'demo/training_session.xml',
 #        'demo/training_seance.xml',
     ],
     'update_xml' : [

=== modified file 'training/demo/training_session.xml'
--- training/demo/training_session.xml	2009-08-31 17:54:15 +0000
+++ training/demo/training_session.xml	2011-04-29 07:25:49 +0000
@@ -14,7 +14,7 @@
             <field name="offer_id" ref="training.training_offer_openerpintegrator0"/>
             <field name="name">Open ERP 5.0 - Integrator</field>
             <field name="catalog_id" ref="training.training_catalog_0"/>
-            <field eval="(DateTime.now() + DateTime.RelativeDateTime(months=1)).strftime('%Y-%m-%d 08:30:00')" name="date" />
+            <field eval="time.strftime('%Y-%m-%d 08:30:00')" name="date" />
             <field name="user_id" ref="base.user_root"/>
         </record>
     </data>
@@ -30,7 +30,7 @@
             <field name="offer_id" ref="training.training_offer_openerpbusiness0"/>
             <field name="name">Open ERP 5.0 - Business</field>
             <field name="catalog_id" ref="training.training_catalog_0"/>
-            <field eval="(DateTime.now() + DateTime.RelativeDateTime(days=25)).strftime('%Y-%m-%d 08:30:00')" name="date" />
+            <field eval="time.strftime('%Y-%m-%d 08:30:00')" name="date" />
             <field name="user_id" ref="base.user_root"/>
         </record>
     </data>
@@ -45,7 +45,7 @@
             <field name="offer_id" ref="training.training_offer_openerpbusiness0"/>
             <field name="name">Open ERP 5.0 - Business</field>
             <field name="catalog_id" ref="training.training_catalog_0"/>
-            <field eval="(DateTime.now() + DateTime.RelativeDateTime(days=15)).strftime('%Y-%m-%d 08:30:00')" name="date" />
+            <field eval="time.strftime('%Y-%m-%d 08:30:00')" name="date" />
             <field name="user_id" ref="base.user_root"/>
         </record>
     </data>

=== modified file 'training/test/training.yml'
--- training/test/training.yml	2011-04-27 11:17:43 +0000
+++ training/test/training.yml	2011-04-29 07:25:49 +0000
@@ -69,8 +69,10 @@
 -
   !python {model: training.holiday.year.wizard}: |
     import time
-    year_id = self.create(cr, uid, {'year': int(time.strftime('%Y'))})
-    self.action_apply(cr, uid, [year_id], {"active_model": "training.holiday.year.wizard", "tz": False,})
+    year_id = self.pool.get('training.holiday.year').search(cr, uid, [('year','=', int(time.strftime('%Y')))])
+    if not year_id:
+        year_id = self.create(cr, uid, {'year': int(time.strftime('%Y'))})
+        self.action_apply(cr, uid, [year_id], {"active_model": "training.holiday.year.wizard", "tz": False,})
 
 -
   I Create "Test OpenERP Module Development" Course.
@@ -332,14 +334,3 @@
         wf_service.trg_validate(uid, 'training.subscription.line',id,'signal_confirm', cr)
     for id in line_ids:
         wf_service.trg_validate(uid, 'training.subscription.line',id,'signal_done', cr)
-
--
-  Assign the account code "X2001" in configuaration of training.subscription.invoice.default.account in ir.config object For create invoice of subscription line.
--
-  !python {model: training.subscription.line}: |
-    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'))) )] )
-    line_ids = self.pool.get('training.subscription.line').search(cr, uid, [('session_id','in',session_id)])
-    config_id = self.pool.get('ir.config').search(cr, uid, [('name','=','training.subscription.invoice.default.account')])
-    self.pool.get('ir.config').write(cr, uid, config_id, {'value': 'X2001'})
-    self.action_create_invoice(cr, uid, line_ids)

=== modified file 'training_room/__openerp__.py'
--- training_room/__openerp__.py	2011-03-15 09:12:30 +0000
+++ training_room/__openerp__.py	2011-04-29 07:25:49 +0000
@@ -32,7 +32,9 @@
         'training',
     ],
     'init_xml' : [ ],
-    'demo_xml' : [ ],
+    'demo_xml' : [
+        'training_room_demo.xml'
+     ],
     'update_xml' : [
         'training_room_view.xml',
         'wizard/training_create_session_wizard_view.xml',

=== modified file 'training_room/training_room.py'
--- training_room/training_room.py	2011-04-01 07:25:34 +0000
+++ training_room/training_room.py	2011-04-29 07:25:49 +0000
@@ -106,9 +106,9 @@
     _inherit = 'training.seance'
 
     _columns = {
-        'location_id' : fields.many2one('training.location', 'Training Location', select=1,help='The location where the training will take place', required=True),
+        'location_id' : fields.many2one('training.location', 'Training Location', select=1,help='The location where the training will take place'),
         'location_note': fields.text('Training Location Note', help='Give some extra informations about the training location'),
-        'delivery_location_id': fields.many2one('training.location', 'Training Delivery Location', select=1, help='The location where training procurements (ex: support of course) will be delivered', required=True),
+        'delivery_location_id': fields.many2one('training.location', 'Training Delivery Location', select=1, help='The location where training procurements (ex: support of course) will be delivered'),
         'delivery_location_note': fields.text('Training Delivery Location Note', help='Give some extra informations about the training delivery location'),
         'reserved' : fields.boolean('Reserved',help='Location is reserved '),
         'seats' : fields.related('location_id', 'seats', type='integer', string='Maximum Seats',

=== modified file 'training_room/training_room_view.xml'
--- training_room/training_room_view.xml	2011-03-15 09:12:30 +0000
+++ training_room/training_room_view.xml	2011-04-29 07:25:49 +0000
@@ -77,12 +77,12 @@
                     <separator string="Location" colspan="4" />
                     <group col="2" colspan="2">
                         <field name="reserved" />
-                        <field name="location_id" />
+                        <field name="location_id" required="True"/>
                         <field name="location_note"/>
                     </group>
                     <group col="2" colspan="2">
                         <label string="" colspan="2"/>
-                        <field name="delivery_location_id"/>
+                        <field name="delivery_location_id" required="True"/>
                         <field name="delivery_location_note"/>
                     </group>
                 </field>