openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04708
[Merge] lp:~openerp-dev/openobject-addons/fixed_trace_error into lp:~openobject-training/openobject-addons/training
gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/fixed_trace_error 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/fixed_trace_error/+merge/55148
Fixed onchange error
--
https://code.launchpad.net/~openerp-dev/openobject-addons/fixed_trace_error/+merge/55148
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/fixed_trace_error.
=== modified file 'training/training.py'
--- training/training.py 2011-03-28 06:46:09 +0000
+++ training/training.py 2011-03-28 13:45:00 +0000
@@ -73,7 +73,7 @@
function_list = []
done_list = []
for r in res:
- if not r['function'] in function_list:
+ if not r['function'] in function_list and r['function'] <> False:
function_list.append(r['function'])
done_list.append(r)
return [(r['function'], r['function']) for r in done_list]
=== modified file 'training/training_content_review.py'
--- training/training_content_review.py 2011-03-21 12:26:03 +0000
+++ training/training_content_review.py 2011-03-28 13:45:00 +0000
@@ -374,7 +374,7 @@
class training_content_review_purchase_line(osv.osv):
_name = 'training.content.review.purchase.line'
- def on_change_product(self, cr, uid, ids, product_id, context=None):
+ def onchange_product(self, cr, uid, ids, product_id, context=None):
if not product_id:
return {'value' : {'unit_price' : 0.0,
'product_uom' : 0}
=== modified file 'training_degree/wizard/training_validate_degree.xml'
--- training_degree/wizard/training_validate_degree.xml 2011-03-18 10:48:37 +0000
+++ training_degree/wizard/training_validate_degree.xml 2011-03-28 13:45:00 +0000
@@ -9,6 +9,7 @@
<form string="Eligible Contacts">
<label string="Do you want to confirm all selected degrees ?" />
<newline/>
+ <separator colspan="4"/>
<group colspan="2" col="2">
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
<button type="object" name="validate_all_degrees" string="Validate Assigned Degrees" icon="gtk-apply"/>
Follow ups