From aaeb24b5414c130ceb0e58586469e45258e4642b Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Thu, 24 Feb 2011 18:35:00 +0200 Subject: [PATCH] warning: set message-selectors as required, to force 'no-message' [Bug 720247] Reported by: Ferdinand Gassauer Original Subject: [6.0] - warning - must init fields (cherry picked from commit 0ff9e4e58e3e46fc5097ad5fd36e7b69cce37cda) bzr revid: p_christ@hol.gr-20110224163500-6x9pbgfvwaton17j --- addons/warning/warning.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/warning/warning.py b/addons/warning/warning.py index a1c74fa5d11..ab7a5926653 100644 --- a/addons/warning/warning.py +++ b/addons/warning/warning.py @@ -34,20 +34,20 @@ WARNING_HELP = _('Selecting the "Warning" option will notify user with the messa 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 @@ stock_picking() 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()