openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04390
[Merge] lp:~openerp-dev/openobject-addons/training_improvement into lp:~openobject-training/openobject-addons/training_with_history
gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/training_improvement into lp:~openobject-training/openobject-addons/training_with_history.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/training_improvement/+merge/53984
training module view improvement and warning fixed
--
https://code.launchpad.net/~openerp-dev/openobject-addons/training_improvement/+merge/53984
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/training_improvement.
=== modified file 'training/training.py'
--- training/training.py 2011-03-18 11:19:49 +0000
+++ training/training.py 2011-03-18 13:04:30 +0000
@@ -89,7 +89,7 @@
_columns = {
'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Full Name'),
- 'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', ondelete='cascade'),
+ 'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', ondelete='cascade', required=True),
'partner_ids' : fields.many2many('res.partner',
'training_purchase_line_partner_rel',
@@ -482,7 +482,7 @@
'reference_lang_id' : fields.related('reference_id', 'lang_id', type='many2one', relation='res.lang', string="Master Course's Language", readonly=True),
'reference_type' : fields.related('reference_id', 'course_type_id', type='many2one', relation='training.course_type', string="Master Course's Type", readonly=True),
- 'analytic_account_id' : fields.many2one('account.analytic.account', 'Account'),
+ 'analytic_account_id' : fields.many2one('account.analytic.account', 'Account', ondelete='cascade', required=True),
'course_type_id' : fields.many2one('training.course_type', 'Type', select=1),
'category_id': fields.many2one('training.course_category', 'Product Line', select=1),
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-03-18 12:45:52 +0000
+++ training/training_view.xml 2011-03-18 13:04:30 +0000
@@ -1827,7 +1827,11 @@
<menuitem id="training_library_mi" parent="training_mi" name="Library" sequence="2" />
+<<<<<<< TREE
<menuitem id="training_library_course_mi" parent="training_library_mi" name="Courses" sequence="1"/>
+=======
+ <menuitem id="training_library_course_mi" parent="training_library_mi" name="Courses" sequence="2"/>
+>>>>>>> MERGE-SOURCE
<menuitem id="training_library_course_course_mi" parent="training_library_course_mi" action="training_course_all_act" sequence="1"/>
=== modified file 'training_degree/training_degree_view.xml'
--- training_degree/training_degree_view.xml 2011-03-18 08:57:04 +0000
+++ training_degree/training_degree_view.xml 2011-03-18 13:04:30 +0000
@@ -161,8 +161,8 @@
<field name="state_summary"/>
<newline/>
<group expand="0" string="Group By...">
+ <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'contact_id'}"/>
<filter string="Degree" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'degree_id'}"/>
- <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'contact_id'}"/>
<separator orientation="vertical"/>
<filter string="Date Obtained" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
<separator orientation="vertical"/>
=== modified file 'training_exam/training_exam_view.xml'
--- training_exam/training_exam_view.xml 2011-03-18 12:08:52 +0000
+++ training_exam/training_exam_view.xml 2011-03-18 13:04:30 +0000
@@ -159,7 +159,11 @@
<field name="arch" type="xml">
<search string="Search Exam Question">
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
+<<<<<<< TREE
<filter icon="terp-camera_test" string="Validate" domain="[('state','=', 'validated')]"/>
+=======
+ <filter icon="gtk-apply" string="Validate" domain="[('state','=', 'validated')]"/>
+>>>>>>> MERGE-SOURCE
<filter icon="terp-dialog-close" string="Deprecate" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="type"/>
@@ -168,6 +172,7 @@
<newline/>
<group expand="0" string="Group By..." >
<filter string="Type" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'type'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -377,18 +382,20 @@
<field name="arch" type="xml">
<search string="Search Session">
<filter icon="terp-document-new" string="Draft" domain="[('state', '=', 'draft')]"/>
+<<<<<<< TREE
<filter icon="terp-camera_test" string="Validate" domain="[('state','=', 'validated')]"/>
+=======
+ <filter icon="gtk-apply" string="Validate" domain="[('state','=', 'validated')]"/>
+>>>>>>> MERGE-SOURCE
<filter icon="terp-dialog-close" string="Deprecate" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="kind"/>
<field name="name"/>
<field name="reference"/>
- <field name="printable"/>
- <field name="main_course_id"/>
- <field name="type"/>
<newline/>
<group expand="0" string="Group By...">
- <filter string="type" icon="terp-check" domain="[]" context="{'group_by':'type'}"/>
+ <filter string="Type" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'type'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -697,28 +704,27 @@
<field name="seance_id" position="after">
<field name="kind" invisible="1"/>
</field>
-
<notebook position="inside">
- <page string="Exam Summary" attrs="{'invisible':[('kind', '!=', 'exam')]}" groups="base.group_user">
+ <page string="Exam Summary" attrs="{'invisible':[('kind', '!=', 'exam')]}" groups="base.group_user">
<field name="course_questionnaire_id" colspan="4" link="0" on_change="on_change_course_questionnaire(course_questionnaire_id, questionnaire_id)"/>
- <group colspan="2" col="2">
- <separator string='Result' colspan="2"/>
- <field name="result"/>
- <field name="total_points"/>
- <field name="result_pourcentage"/>
- <separator string='' colspan="2"/>
- <field name="passing_score" groups="training_exam.group_exam_user"/>
- <field name="forced_result" on_change="on_change_forced_result(forced_result)" groups="training_exam.group_exam_user"/>
- </group>
- <group colspan="2" col="2">
- <separator string='Status' colspan="2"/>
- <field name="result_received" groups="training_exam.group_exam_user"/>
- <field name="certif_printed" groups="training_exam.group_exam_user"/>
- <field name="succeeded" />
- <separator string="Configuration" colspan="2"/>
- <field name="forced_noresult" groups="training_exam.group_exam_user"/>
- </group>
- </page>
+ <group colspan="2" col="2">
+ <separator string='Result' colspan="2"/>
+ <field name="result"/>
+ <field name="total_points"/>
+ <field name="result_pourcentage"/>
+ <separator string='' colspan="2"/>
+ <field name="passing_score" groups="training_exam.group_exam_user"/>
+ <field name="forced_result" on_change="on_change_forced_result(forced_result)" groups="training_exam.group_exam_user"/>
+ </group>
+ <group colspan="2" col="2">
+ <separator string='Status' colspan="2"/>
+ <field name="result_received" groups="training_exam.group_exam_user"/>
+ <field name="certif_printed" groups="training_exam.group_exam_user"/>
+ <field name="succeeded" />
+ <separator string="Configuration" colspan="2"/>
+ <field name="forced_noresult" groups="training_exam.group_exam_user"/>
+ </group>
+ </page>
<page string="Exam Participation" attrs="{'invisible':[('kind', '!=', 'exam')]}" groups="base.group_user">
<field name="questionnaire_id" on_change="on_change_course_questionnaire(course_questionnaire_id, questionnaire_id)" domain="[('main_course_id','=',course_questionnaire_id)]" link="0"/>
<field name="duration_questionnaire_id" />
@@ -891,7 +897,7 @@
<menuitem
id="library_exam_mi"
parent="training.training_library_mi"
- name="Exams" sequence="2"/>
+ name="Exams" sequence="5"/>
<!-- Training/ Library/ Exams/ Exams-->
<menuitem
id="library_exam_questionnaire_all_mi"
Follow ups
