From 3c31799a0d1fd00f2dfbf7322baf4fd409d29503 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 7 Apr 2010 09:04:19 +0200 Subject: [PATCH] merge bzr revid: fp@tinyerp.com-20100407070419-4cly41c0bvrkd00v --- bin/addons/base/__terp__.py | 3 +- bin/addons/base/data/res.country.state.csv | 52 ++++++++++++++++++++ bin/addons/base/module/module_view.xml | 8 +-- bin/addons/base/res/partner/partner.py | 2 +- bin/addons/base/res/partner/partner_view.xml | 3 +- bin/osv/orm.py | 4 +- 6 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 bin/addons/base/data/res.country.state.csv diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py index 59321884666..533441816f8 100644 --- a/bin/addons/base/__terp__.py +++ b/bin/addons/base/__terp__.py @@ -34,7 +34,8 @@ 'security/base_security.xml', 'res/res_security.xml', 'res/res_config.xml', - 'maintenance/maintenance_security.xml' + 'maintenance/maintenance_security.xml', + 'data/res.country.state.csv' ], 'update_xml': [ 'base_update.xml', diff --git a/bin/addons/base/data/res.country.state.csv b/bin/addons/base/data/res.country.state.csv new file mode 100644 index 00000000000..bdcb745eb08 --- /dev/null +++ b/bin/addons/base/data/res.country.state.csv @@ -0,0 +1,52 @@ +"country_id:id","name","code" +us,"Alabama","AL" +us,"Alaska","AK" +us,"Arizona","AZ" +us,"Arkansas","AR" +us,"California","CA" +us,"Colorado","CO" +us,"Connecticut","CT" +us,"Delaware","DE" +us,"District of Columbia","DC" +us,"Florida","FL" +us,"Georgia","GA" +us,"Hawaii","HI" +us,"Idaho","ID" +us,"Illinois","IL" +us,"Indiana","IN" +us,"Iowa","IA" +us,"Kansas","KS" +us,"Kentucky","KY" +us,"Louisiana","LA" +us,"Maine","ME" +us,"Montana","MT" +us,"Nebraska","NE" +us,"Nevada","NV" +us,"New Hampshire","NH" +us,"New Jersey","NJ" +us,"New Mexico","NM" +us,"New York","NY" +us,"North Carolina","NC" +us,"North Dakota","ND" +us,"Ohio","OH" +us,"Oklahoma","OK" +us,"Oregon","OR" +us,"Maryland","MD" +us,"Massachusetts","MA" +us,"Michigan","MI" +us,"Minnesota","MN" +us,"Mississippi","MS" +us,"Missouri","MO" +us,"Pennsylvania","PA" +us,"Rhode Island","RI" +us,"South Carolina","SC" +us,"South Dakota","SD" +us,"Tennessee","TN" +us,"Texas","TX" +us,"Utah","UT" +us,"Vermont","VT" +us,"Virginia","VA" +us,"Washington","WA" +us,"West Virginia","WV" +us,"Wisconsin","WI" +us,"Wyoming","WY" diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml index ef0cf239042..cd57b59023c 100644 --- a/bin/addons/base/module/module_view.xml +++ b/bin/addons/base/module/module_view.xml @@ -50,10 +50,12 @@ - - + + + + - + diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index a5f76b80390..0cdf3d927d4 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -136,7 +136,7 @@ class res_partner(osv.osv): 'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'), 'ref': fields.char('Code', size=64), 'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."), - 'user_id': fields.many2one('res.users', 'Dedicated Salesman', help='The internal user that is in charge of communicating with this partner if any.'), + 'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'), 'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), 'website': fields.char('Website',size=64), diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index 8c374acb80b..cd19557547f 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -329,7 +329,6 @@ - @@ -344,7 +343,7 @@ - +