openerp-dev-web team mailing list archive

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

gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/course_structure_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/course_structure_fix/+merge/58650

Fixed the parent child relation in the course structure
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/course_structure_fix/+merge/58650
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/course_structure_fix.

=== modified file 'training/training.py'
--- training/training.py	2011-04-18 10:48:59 +0000
+++ training/training.py	2011-04-21 10:33:31 +0000
@@ -110,7 +110,8 @@
                                          'partner_id',
                                          'Partners'),
         'price_list_id' : fields.many2one('product.pricelist', 'Pricelist', domain="[('type', '=', 'sale')]"),
-        'child_ids': fields.one2many('training.course', 'parent_id', 'Child Accounts')
+        'parent_id': fields.many2one('training.course_category', 'Parent Accounts'),
+        'child_ids': fields.one2many('training.course_category', 'parent_id', 'Child Accounts')
     }
 
     def name_get(self, cr, uid, ids, context=None):

=== modified file 'training/training_view.xml'
--- training/training_view.xml	2011-04-14 09:07:28 +0000
+++ training/training_view.xml	2011-04-21 10:33:31 +0000
@@ -139,6 +139,7 @@
             <field name="res_model">training.course_category</field>
             <field name="view_type">tree</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('parent_id', '=', False)]</field>
         </record>
 
         <!-- Création d'une vue en arbre pour charger tous les cours appartenant à une catégorie -->
@@ -2506,7 +2507,9 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="group_all_act" parent="training_planning_mi" id="group_all_mi" sequence="51" />
+		<menuitem name="Group" parent="training_planning_mi" id="group_main_mi" sequence="51" />
+
+        <menuitem action="group_all_act" parent="group_main_mi" id="group_all_mi" sequence="52" />
     </data>
 
     <data>

=== modified file 'training_exam/report/training_seance_exam_labels.rml'
--- training_exam/report/training_seance_exam_labels.rml	2009-11-16 13:21:52 +0000
+++ training_exam/report/training_seance_exam_labels.rml	2011-04-21 10:33:31 +0000
@@ -54,16 +54,18 @@
   <story>
     [[ repeatIn(objects,'seance') ]] [[ setLang(seance.course_id and (seance.course_id.lang_id and seance.course_id.lang_id.code or '') or 'fr_FR') ]]
     [[ seance.kind == 'exam' or removeParentNode('story') ]]
-    <blockTable colWidths="19.2cm" style="Standard_Outline" rowHeights="6.0cm">
-      <tr>
-        <td>
-        <para style="terp_default_Bold_Centre_22">[[ repeatIn(ordered_participants(seance), 'participate') ]]</para>
-        <para style="terp_default_Bold_Centre_22">[[ participate.contact_id.name or '' ]] [[ participate.contact_id.first_name or '' ]]</para>
-        <para style="terp_default_Centre_16">[[ participate.partner_id and participate.partner_id.name or '' ]]</para>
-        <para><br/></para>
-        <para style="terp_default_Bold_Centre_22">[[ participate.course_questionnaire_id and participate.course_questionnaire_id.name or '' ]]</para>
-        </td>
-      </tr>
-    </blockTable>
+    <section>
+    	 <para style="terp_default_Bold_Centre_22">[[ repeatIn(ordered_participants(seance), 'participate') ]]</para>
+	    <blockTable colWidths="19.2cm" style="Standard_Outline" rowHeights="6.0cm">
+	      <tr>
+	        <td>
+		        <para style="terp_default_Bold_Centre_22">[[ participate.contact_id.name or '' ]] [[ participate.contact_id.first_name or '' ]]</para>
+		        <para style="terp_default_Centre_16">[[ participate.partner_id and participate.partner_id.name or '' ]]</para>
+		        <para><br/></para>
+		        <para style="terp_default_Bold_Centre_22">[[ participate.course_questionnaire_id and participate.course_questionnaire_id.name or '' ]]</para>
+	        </td>
+	      </tr>
+	    </blockTable>
+	</section>
   </story>
 </document>