openerp-dev-web team mailing list archive

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

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

Fixed the error on the seance button "regenerate purchase order"
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/fixed_purchase_button_error/+merge/54689
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/fixed_purchase_button_error.

=== modified file 'training/training.py'
--- training/training.py	2011-03-23 12:26:56 +0000
+++ training/training.py	2011-03-24 12:07:23 +0000
@@ -522,16 +522,12 @@
             values['parent_id'] = proxy.browse(cr, uid, values['category_id'], context).analytic_account_id.id
         return super(training_course, self).write(cr, uid, ids, values, context)
 
+
     def copy_data(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
-        data, trans_data = super(training_course, self).copy_data(cr, uid, id, default=default, context=context)
-        to_delete = [ 'theme_ids', 'questionnaire_ids', 'purchase_line_ids', 'pending_ids', 'line_ids', 'lecturer_ids', 'budget_intra_line_ids', 'attachment_ids' ]
-        for key in to_delete:
-            if key in data:
-                del data[key]
-        return data, trans_data
-
+        if not default:
+            default = {}
+        default.update({'theme_ids':[], 'questionnaire_ids':[], 'pending_ids':[], 'line_ids':[], 'purchase_line_ids':[], 'lecturer_ids':[],'budget_intra_line_ids':[], 'attachment_ids':[]})
+        return super(training_course, self).copy_data(cr, uid, id, default=default, context=context)
 
     def on_change_reference(self, cr, uid, ids, reference_id, context=None):
         if context is None:
@@ -2586,7 +2582,7 @@
                 pdf, _r = report.create(cr, uid, [seance.id], {}, context=report_ctx)
                 filename = seance.name.replace('/', ' ') + '.pdf'
                 emails.send_email(cr, uid, 'procurements', 's', to=to, attachments=[(filename, pdf),], context=context, seance=seance, partner=partner)
-
+        return True
     # training.seance
     def action_workflow_confirm(self, cr, uid, ids, context=None):
         self.action_do_confirm(cr, uid, ids, context=context)

=== modified file 'training/training_view.xml'
--- training/training_view.xml	2011-03-23 12:31:18 +0000
+++ training/training_view.xml	2011-03-24 12:07:23 +0000
@@ -1150,7 +1150,7 @@
                     </notebook>
                     <group colspan="4" col="6">
                         <field name="state" />
-                        <button string="Confirm Request" type="workflow" name="signalsubscription_confirm" states="draft"
+                        <button string="Confirm Request" type="workflow" name="signal_confirm" states="draft"
                             confirm="Do you want to confirm the request for this subscription ?" icon="terp-camera_test"/>
                         <button string="Cancel" type="workflow" name="signal_cancel" states="draft"
                             confirm="Do you want to cancel this subscription ?" icon="gtk-cancel"/>
@@ -1556,10 +1556,11 @@
                 <form string="Procurements Update">
                     <group colspan="4" col="2" states="confirm">
                         <label string="Are you sure you want to update procurements all opened seance in all future session?" colspan="2"/>
+                        <separator colspan="4"/>
                         <button string="Cancel" special="cancel" name="action_close" icon='gtk-cancel'/>
                         <button string="Confirm" type="object" name="action_confirm" icon='terp-camera_test'/>
                     </group>
-                    <group colspan="4" col="4" states="update" expand="1">
+                    <group colspan="4" col="2" states="update" expand="1">
                         <field name="name"/>
                         <field name="date"/>
                         <separator string="Log Details" colspan="4"/>