openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-720247-xrg into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #720247 [6.0] - warning - must init fields
  https://bugs.launchpad.net/bugs/720247

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-720247-xrg/+merge/52030
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-720247-xrg/+merge/52030
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-720247-xrg.

=== modified file 'warning/warning.py'
--- warning/warning.py	2011-01-14 00:11:01 +0000
+++ warning/warning.py	2011-03-03 10:31:16 +0000
@@ -34,20 +34,20 @@
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
-        'sale_warn' : fields.selection(WARNING_MESSAGE, 'Sale Order', help=WARNING_HELP),
+        'sale_warn' : fields.selection(WARNING_MESSAGE, 'Sale Order', help=WARNING_HELP, required=True),
         'sale_warn_msg' : fields.text('Message for Sale Order'),
-        'purchase_warn' : fields.selection(WARNING_MESSAGE, 'Purchase Order', help=WARNING_HELP),
+        'purchase_warn' : fields.selection(WARNING_MESSAGE, 'Purchase Order', help=WARNING_HELP, required=True),
         'purchase_warn_msg' : fields.text('Message for Purchase Order'),
-        'picking_warn' : fields.selection(WARNING_MESSAGE, 'Stock Picking', help=WARNING_HELP),
+        'picking_warn' : fields.selection(WARNING_MESSAGE, 'Stock Picking', help=WARNING_HELP, required=True),
         'picking_warn_msg' : fields.text('Message for Stock Picking'),
-        'invoice_warn' : fields.selection(WARNING_MESSAGE, 'Invoice', help=WARNING_HELP),
+        'invoice_warn' : fields.selection(WARNING_MESSAGE, 'Invoice', help=WARNING_HELP, required=True),
         'invoice_warn_msg' : fields.text('Message for Invoice'),
     }
     _defaults = {
-         'sale_warn' : lambda *a: 'no-message',
-         'purchase_warn' : lambda *a: 'no-message',
-         'picking_warn' : lambda *a: 'no-message',
-         'invoice_warn' : lambda *a: 'no-message',
+         'sale_warn' : 'no-message',
+         'purchase_warn' : 'no-message',
+         'picking_warn' : 'no-message',
+         'invoice_warn' : 'no-message',
     }
 
 res_partner()
@@ -179,15 +179,15 @@
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
-         'sale_line_warn' : fields.selection(WARNING_MESSAGE,'Sale Order Line', help=WARNING_HELP),
+         'sale_line_warn' : fields.selection(WARNING_MESSAGE,'Sale Order Line', help=WARNING_HELP, required=True),
          'sale_line_warn_msg' : fields.text('Message for Sale Order Line'),
-         'purchase_line_warn' : fields.selection(WARNING_MESSAGE,'Purchase Order Line', help=WARNING_HELP),
+         'purchase_line_warn' : fields.selection(WARNING_MESSAGE,'Purchase Order Line', help=WARNING_HELP, required=True),
          'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
      }
 
     _defaults = {
-         'sale_line_warn' : lambda *a: 'no-message',
-         'purchase_line_warn' : lambda *a: 'no-message',
+         'sale_line_warn' : 'no-message',
+         'purchase_line_warn' : 'no-message',
     }
 
 product_product()