odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] bug fix lp:720247 

bzr revid: tfr@openerp.com-20110309111913-y14gkw6et9mf5946
This commit is contained in:
Thibault Francois 2011-03-09 12:19:13 +01:00
parent a7b73bbb33 aaeb24b541
commit 9c3fc1c226
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/warning/warning.py
View File

@ -34,20 +34,20 @@ WARNING_HELP = _('Selecting the "Warning" option will notify user with the messa
class res_partner(osv.osv): class res_partner(osv.osv):
_inherit = 'res.partner' _inherit = 'res.partner'
_columns = { _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'), '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'), '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'), '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'), 'invoice_warn_msg' : fields.text('Message for Invoice'),
} }
_defaults = { _defaults = {
'sale_warn' : lambda *a: 'no-message', 'sale_warn' : 'no-message',
'purchase_warn' : lambda *a: 'no-message', 'purchase_warn' : 'no-message',
'picking_warn' : lambda *a: 'no-message', 'picking_warn' : 'no-message',
'invoice_warn' : lambda *a: 'no-message', 'invoice_warn' : 'no-message',
} }
res_partner() res_partner()
@ -179,15 +179,15 @@ stock_picking()
class product_product(osv.osv): class product_product(osv.osv):
_inherit = 'product.product' _inherit = 'product.product'
_columns = { _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'), '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'), 'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
} }
_defaults = { _defaults = {
'sale_line_warn' : lambda *a: 'no-message', 'sale_line_warn' : 'no-message',
'purchase_line_warn' : lambda *a: 'no-message', 'purchase_line_warn' : 'no-message',
} }
product_product() product_product()