openerp-dev-web team mailing list archive

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

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

 board_training_intra :- convert this module into version 6.0.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-board-training-intra-ysa/+merge/55280
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-board-training-intra-ysa.

=== modified file 'board_training_intra/__init__.py'
--- board_training_intra/__init__.py	2011-02-25 12:33:02 +0000
+++ board_training_intra/__init__.py	2011-03-29 05:55:52 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ############################################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
 #    Copyright (C) 2010-2011 Thamini S.Ã .R.L (<http://www.thamini.com>). All Rights Reserved
@@ -23,3 +23,5 @@
 ############################################################################################
 
 import board_training
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'board_training_intra/__terp__.py' => 'board_training_intra/__openerp__.py'
--- board_training_intra/__terp__.py	2011-02-25 12:33:02 +0000
+++ board_training_intra/__openerp__.py	2011-03-29 05:55:52 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ############################################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
 #    Copyright (C) 2010-2011 Thamini S.Ã .R.L (<http://www.thamini.com>). All Rights Reserved
@@ -39,3 +39,5 @@
     'active' : False,
     'installable' : True,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'board_training_intra/board_training.py'
--- board_training_intra/board_training.py	2011-02-25 12:33:02 +0000
+++ board_training_intra/board_training.py	2011-03-29 05:55:52 +0000
@@ -22,3 +22,4 @@
 #
 ############################################################################################
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'board_training_intra/board_training_view.xml'
--- board_training_intra/board_training_view.xml	2011-02-15 10:52:47 +0000
+++ board_training_intra/board_training_view.xml	2011-03-29 05:55:52 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <menuitem parent="board.dashboard_menu" id="intra_board_mi" name="Intra Training"/>  
+        <menuitem parent="board_training.board_mi" id="intra_board_mi" name="Intra Training" sequence="1"/>
 
         <record model="ir.ui.view" id="seance_list_board">
             <field name="name">training.seance.list.dashboard</field>
@@ -121,7 +121,7 @@
             <field name="view_id" ref='seance_list_board_2'/>
             <field name="domain">[('is_intra', '=', 1),('state', 'in', ['inprogress']), ('date','&lt;',time.strftime('%Y-%m-%d 23:59:59'))]</field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="today_training_to_done_act">
             <field name="name">Today's Trainings To Finalize</field>
             <field name="res_model">training.seance</field>
@@ -164,7 +164,7 @@
         </record>
 
         <menuitem parent="intra_board_mi" id="today_board_mi" action="today_board_act" icon="terp-graph" />
-        
+
         <record model="ir.actions.act_window" id="board_sessions_to_confirm_act">
             <field name="name">Future Intra Sessions</field>
             <field name="res_model">training.session</field>
@@ -173,7 +173,7 @@
             <field name="view_id" ref="session_list_min_limit_confirm_board" />
             <field name="domain">[('kind', '=', 'intra'), ('state', 'in', ('opened', 'opened_confirmed', 'closed_confirmed', 'inprogress')),('date','&gt;=', current_date)]</field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="board_seances_to_confirm_act">
             <field name="name">Seances To Confirm</field>
             <field name="res_model">training.seance</field>