openerp-dev-web team mailing list archive

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

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

Usability improvement for wizard 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/useablity_issue_imp_wiz/+merge/56928
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/useablity_issue_imp_wiz.

=== modified file 'training/training_view.xml'
--- training/training_view.xml	2011-04-08 09:43:39 +0000
+++ training/training_view.xml	2011-04-08 12:43:23 +0000
@@ -1724,7 +1724,7 @@
                         <button name="signal_validate" string="Validate" type="workflow" states="draft"
                             confirm="Do you want to validate this offer ?" icon="terp-camera_test"/>
                         <button name="signal_deprecate" string="Deprecate" type="workflow" states="validated,draft"
-                            confirm="Do you want to deprecate this offer ?" icon="gtk-cancel"/>
+                            confirm="Do you want to deprecate this offer ?" icon="terp-dialog-close"/>
                         <button name="draft_cb" string="Draft" type="object" states="validated,deprecated"
                             confirm="Are you sure to reset to Draft (Check the sessions for this offer) ?"
                             groups="training.group_offer_manager" icon="terp-document-new"/>

=== modified file 'training_evaluation/report/in_construction.py'
--- training_evaluation/report/in_construction.py	2011-04-07 13:04:11 +0000
+++ training_evaluation/report/in_construction.py	2011-04-08 12:43:23 +0000
@@ -219,7 +219,6 @@
         context['checkboxes_position'] = [] # add a reference in context since it can't be modified during next call
         context['checkboxes_context'] = [] # add a reference in context since it can't be modified during next call
         context['participation_id'] = [] # add a reference in context since it can't be modified during next call
-
         pdf, report_type = super(report_and_store_checkboxes_position, self).create_single_pdf(cr, uid, ids, data, report_xml, context)
         if 'preview' not in context:
             # only store checkboxes position for real print

=== modified file 'training_evaluation/wizard/wizard_organization_report_view.xml'
--- training_evaluation/wizard/wizard_organization_report_view.xml	2011-03-21 10:41:55 +0000
+++ training_evaluation/wizard/wizard_organization_report_view.xml	2011-04-08 12:43:23 +0000
@@ -8,7 +8,11 @@
         <field name="arch" type="xml">
             <form string="Origanization Report" col="2">
                 <field name="partner_id"/>
-                <button name="do_print" type="object" string="Print" colspan="2" icon="gtk-print"/>
+                <separator colspan="4"/>
+                <group colspan="4">
+	                <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+                	<button name="do_print" type="object" string="Print" colspan="2" icon="gtk-print"/>
+                </group>
             </form>
         </field>
     </record>

=== modified file 'training_evaluation/wizard/wizard_preview_evaluation.py'
--- training_evaluation/wizard/wizard_preview_evaluation.py	2011-04-07 13:04:11 +0000
+++ training_evaluation/wizard/wizard_preview_evaluation.py	2011-04-08 12:43:23 +0000
@@ -53,11 +53,18 @@
             return {}
         wizard = self.browse(cr, uid, ids[0], context=context)
 
+        data = self.read(cr, uid, ids)[0]
+
+        datas = {
+             'ids': ids,
+             'model': 'training.evaluation.questionnaire.preview.wizard',
+             'form': data
+        }
+
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'training.evaluation.empty.preview.report',
-            'model': 'training.evaluation.questionnaire.preview.wizard',
-            'ids': ids,
+            'datas': datas,
         }
 
 wizard_preview_evaluation()

=== modified file 'training_evaluation/wizard/wizard_preview_evaluation_view.xml'
--- training_evaluation/wizard/wizard_preview_evaluation_view.xml	2010-08-30 20:21:00 +0000
+++ training_evaluation/wizard/wizard_preview_evaluation_view.xml	2011-04-08 12:43:23 +0000
@@ -9,7 +9,11 @@
             <form string="Preview Evaluation" col="2">
                 <field name="lang_id" domain="[('translatable','=',True)]"/>
                 <field name="eval_quizz_id" invisible="1"/>
-                <button type="object" name="button_print" string="Print" colspan="2"/>
+                <separator colspan="4"/>
+                <group colspan="4">
+	                <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
+	                <button type="object" name="button_print" string="Print" colspan="2"/>
+                </group>
             </form>
         </field>
     </record>

=== modified file 'training_exam/wizard/training_exam_print_questionnaire_raw.py'
--- training_exam/wizard/training_exam_print_questionnaire_raw.py	2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_exam_print_questionnaire_raw.py	2011-04-08 12:43:23 +0000
@@ -55,7 +55,17 @@
             return {}
         if context is None:
             context = {}
+
         wizard = self.browse(cr, uid, ids[0], context=context)
+
+        data = self.read(cr, uid, ids)[0]
+
+        datas = {
+             'ids': ids,
+             'model': 'training.exam.question.print.raw.wizard',
+             'form': data
+        }
+
         if wizard.show_solution:
             report_name = 'training.exam.questionnaire.report'
         else:
@@ -63,7 +73,7 @@
         return {
             'type': 'ir.actions.report.xml',
             'report_name': report_name,
-            'ids': ids,
+            'datas': datas,
         }
 
 wizard_print_raw_questionnaire()