diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty.py b/openerp/addons/base/publisher_warranty/publisher_warranty.py index 2fa47f150f3..f6fdd04de14 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty.py +++ b/openerp/addons/base/publisher_warranty/publisher_warranty.py @@ -230,7 +230,7 @@ class publisher_warranty_contract(osv.osv): 'date_stop' : fields.date('Ending Date', readonly=True), 'state' : fields.selection([('unvalidated', 'Unvalidated'), ('valid', 'Valid') , ('terminated', 'Terminated'), ('canceled', 'Canceled')], string="State", readonly=True), - 'kind' : fields.char('Kind', size=64, readonly=True), + 'kind' : fields.char('Contract Category', size=64, readonly=True), "check_support": fields.boolean("Support Level 1", readonly=True), "check_opw": fields.boolean("OPW", readonly=True, help="Checked if this is an OpenERP Publisher's Warranty contract (versus older contract types"), } diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 83574218889..0b059fb60c1 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -159,7 +159,7 @@ class res_partner(osv.osv): 'street2': fields.char('Street2', size=128), 'zip': fields.char('Zip', change_default=True, size=24), 'city': fields.char('City', size=128), - 'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"), + 'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"), 'country_id': fields.many2one('res.country', 'Country'), 'country': fields.related('country_id', type='many2one', relation='res.country', string='Country'), # for backward compatibility 'email': fields.char('E-Mail', size=240),