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-fix-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-fix-ysa/+merge/55143

[FIX] fix some problem in training related moudle.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-fix-ysa/+merge/55143
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-fix-ysa.

=== modified file 'training/training.py'
--- training/training.py	2011-03-28 06:46:09 +0000
+++ training/training.py	2011-03-28 13:22:29 +0000
@@ -3360,9 +3360,9 @@
         if ocv and 'value' in ocv:
             values.update(ocv['value'])
         ocv = self.on_change_price_list(cr, uid, [], values['session_id'], values.get('price_list_id', False), context=context)
+
         if ocv and 'value' in ocv:
             values.update(ocv['value'])
-
         return values
 
     # training.subscription.line

=== modified file 'training_evaluation/training_evaluation_view.xml'
--- training_evaluation/training_evaluation_view.xml	2011-03-21 10:41:55 +0000
+++ training_evaluation/training_evaluation_view.xml	2011-03-28 13:22:29 +0000
@@ -188,7 +188,7 @@
                     <notebook colspan="4">
                         <page string="Questionnaire">
                             <field name="questionnaire_id"/>
-                            <button name="load_questions" type="object" string="Load Questions" colspan="2" />
+                            <button name="load_questions" type="object" string="Load Questions" colspan="2" icon="gtk-execute"/>
                             <field name="line_ids" colspan="4" nolabel="1" view_mode="tree" mode="tree,form" />
                         </page>
                     </notebook>
@@ -354,11 +354,11 @@
                     <separator colspan="4" />
                     <group colspan="4" col="7">
                         <field name="state" />
-                        <button name="tr_e_signal_validate" string="Validate" icon="gtk-execute" type="workflow"
+                        <button name="tr_e_signal_validate" string="Validate" icon="terp-camera_test" type="workflow"
                             states="draft" />
-                        <button name="tr_e_signal_deprecate" string="Deprecate" icon="gtk-convert" type="workflow"
+                        <button name="tr_e_signal_deprecate" string="Deprecate" icon="gtk-cancel" type="workflow"
                             states="draft,validated"/>
-                        <button name="action_signal_draft" string="Reset to Draft" type="object" states="deprecated" />
+                        <button name="action_signal_draft" string="Reset to Draft" icon="terp-document-new" type="object" states="deprecated" />
                     </group>
                 </form>
             </field>
@@ -511,12 +511,12 @@
         </record>
 
         <menuitem id="training_evaluation_top_lecturer_report_mi"
-            parent="training_report.menu_training_report"
+            parent="base.menu_training_report"
             type="wizard"
             action="training_evaluation_top_lecturer_report_wizard" />
 
         <menuitem id="training_evaluation_top_course_report_mi"
-            parent="training_report.menu_training_report"
+            parent="base.menu_training_report"
             type="wizard"
             action="training_evaluation_top_course_report_wizard" />
 

=== modified file 'training_exam/__openerp__.py'
--- training_exam/__openerp__.py	2011-03-15 10:34:06 +0000
+++ training_exam/__openerp__.py	2011-03-28 13:22:29 +0000
@@ -56,7 +56,7 @@
         'wizard/training_exam_print_questionnaire_raw_view.xml',
         'wizard/training_exam_validate_question_view.xml',
         'wizard/training_seance_generate_view.xml',
-        'wizard/training_seance_generate_view.xml',
+        'wizard/training_subscription_mass_line_view.xml',
         'wizard/training_exam_question_view.xml',
         'wizard/training_exam_questionnaire_view.xml',
     ],

=== modified file 'training_exam/training_exam.py'
--- training_exam/training_exam.py	2011-03-28 06:20:12 +0000
+++ training_exam/training_exam.py	2011-03-28 13:22:29 +0000
@@ -395,10 +395,10 @@
     def copy_data(self, cr, uid, id, default=None, context=None):
         if context is None:
             context = {}
-        data, trans_data = super(training_question, self).copy_data(cr, uid, id, default=default, context=context)
+        data = super(training_question, self).copy_data(cr, uid, id, default=default, context=context)
         if data and 'questionnaire_ids' in data:
             del data['questionnaire_ids']
-        return data, trans_data
+        return data
 
     def action_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'}, context)
@@ -518,7 +518,7 @@
 
         questionnaire_id = context.get('questionnaire_id', False)
         if questionnaire_id:
-            course_id = self.pool.get('training.exam.questionnaire').browse(cr, uid, questionnaire_id).course_id.id
+            course_id = self.pool.get('training.exam.questionnaire').browse(cr, uid, questionnaire_id).main_course_id.id
 
         if course_id:
             cr.execute("SELECT question_id FROM training_question_course_rel WHERE course_id = %s",
@@ -1014,9 +1014,9 @@
             context = {}
         subscription = self.pool.get('training.subscription').browse(cr, uid, subscription_id, context=context)
         session = subscription_mass_line.session_id
-
         def_pricelist_id = job.name.property_product_pricelist.id
 
+
         values = {
             'subscription_id' : subscription_id,
             'job_id' : job.id,
@@ -1089,7 +1089,11 @@
         if context is None:
             context = {}
         # Creation des factures
-        account_id = self.pool.get('account.account').search(cr, uid, [('code', '=', '70828')])[0]
+        account_id = self.pool.get('account.account').search(cr, uid, [('code', '=', '70828')])
+        if not account_id:
+            raise osv.except_osv(_('Warning'),
+                                 _('You must be define account with code = 70828'))
+        account_id = account_id[0]
         # Get journal
         journal_pool = self.pool.get('account.journal')
         journal_sales_srch = journal_pool.search(cr, uid, [('type','=','sale'),('refund_journal','=',False)])

=== modified file 'training_intra/training_intra_view.xml'
--- training_intra/training_intra_view.xml	2011-03-21 09:06:32 +0000
+++ training_intra/training_intra_view.xml	2011-03-28 13:22:29 +0000
@@ -74,7 +74,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Template">
-                    <field name="name" colspan="4" />
+                    <field name="name"/>
                     <field name="line_ids" colspan="4" nolabel="1" />
                     <group colspan="4" col="6">
                         <field name="costs" />