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

[NEW] new address_format field for country 

bzr revid: dhara_openerp-20110922220823-qaghdh4urgjdtea0
This commit is contained in:
Dhara (OpenERP) 2011-09-22 15:08:23 -07:00
parent 1044d63047
commit 6da1004cf5
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openerp/addons/base/base_data.xml
View File

@ -85,6 +85,7 @@
<record id="au" model="res.country">
<field name="name">Australia</field>
<field name="code">au</field>
<field name="address_format" eval="'%(street)s\n%(street2)s %(state_code)s %(zip)s\n%(country_name)s'" />
</record>
<record id="aw" model="res.country">
<field name="name">Aruba</field>
@ -109,6 +110,7 @@
<record id="be" model="res.country">
<field name="name">Belgium</field>
<field name="code">be</field>
<field name="address_format" eval="'%(street)s\n%(zip)s, %(city)s\n%(country_name)s'" />
</record>
<record id="bf" model="res.country">
<field name="name">Burkina Faso</field>
@ -145,6 +147,7 @@
<record id="br" model="res.country">
<field name="name">Brazil</field>
<field name="code">br</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s%(country_name)s'" />
</record>
<record id="bs" model="res.country">
<field name="name">Bahamas</field>
@ -173,6 +176,7 @@
<record id="ca" model="res.country">
<field name="name">Canada</field>
<field name="code">ca</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
</record>
<record id="cc" model="res.country">
<field name="name">Cocos (Keeling) Islands</field>
@ -254,6 +258,7 @@
<record id="de" model="res.country">
<field name="name">Germany</field>
<field name="code">de</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
</record>
<record id="dj" model="res.country">
<field name="name">Djibouti</field>
@ -298,6 +303,7 @@
<record id="es" model="res.country">
<field name="name">Spain</field>
<field name="code">es</field>
<field name="address_format" eval="'%(street)s\n%(zip)s %(city)s,%(state_name)s\n%(country_name)s'" />
</record>
<record id="et" model="res.country">
<field name="name">Ethiopia</field>
@ -326,6 +332,7 @@
<record id="fr" model="res.country">
<field name="name">France</field>
<field name="code">fr</field>
<field name="address_format" eval="'%(street)s\n%(zip)s %(city)s\n%(country_name)s'" />
</record>
<record id="ga" model="res.country">
<field name="name">Gabon</field>
@ -434,6 +441,7 @@
<record id="in" model="res.country">
<field name="name">India</field>
<field name="code">in</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(zip)s\n%(state_name)s%(country_name)s'" />
</record>
<record id="io" model="res.country">
<field name="name">British Indian Ocean Territory</field>
@ -917,6 +925,7 @@
</record>
<record id="uk" model="res.country">
<field name="name">United Kingdom</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(country_name)s\n%(zip)s'" />
<field name="code">gb</field>
</record>
<record id="um" model="res.country">
@ -926,6 +935,7 @@
<record id="us" model="res.country">
<field name="name">United States</field>
<field name="code">us</field>
<field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
</record>
<record id="uy" model="res.country">
<field name="name">Uruguay</field>

4
openerp/addons/base/res/res_country.py
View File

@ -31,6 +31,7 @@ class Country(osv.osv):
'code': fields.char('Country Code', size=2,
help='The ISO country code in two chars.\n'
'You can use this field for quick search.', required=True),
'address_format': fields.text('Address Format')
}
_sql_constraints = [
('name_uniq', 'unique (name)',
@ -38,6 +39,9 @@ class Country(osv.osv):
('code_uniq', 'unique (code)',
'The code of the country must be unique !')
]
_defaults = {
'address_format': "%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s",
}
def name_search(self, cr, user, name='', args=None, operator='ilike',
context=None, limit=100):

3
openerp/addons/base/res/res_country_view.xml
View File

@ -26,6 +26,9 @@
<form string="Country">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="address_format" nolabel="1" colspan="4"/>
<separator colspan="4" string="Note"/>
<label align="0.0" colspan="4" width="900" string="" />
</form>
</field>
</record>

20
openerp/addons/base/res/res_partner.py
View File

@ -345,6 +345,26 @@ class res_partner_address(osv.osv):
def get_city(self, cr, uid, id):
return self.browse(cr, uid, id).city
def display_address(self, cr, uid, context, address_obj): #,field_list=[]):
# if isinstance(address_id, list):
# address_id = address_id[0]
# address_obj = self.browse(cr, uid, address_id)
address_field = ['title','street','street2','zip','city']
args = {}
for field in address_field :
# args[field] = field_list and field in field_list and getattr(address_obj,field) or getattr(address_obj,field) or ''
args[field] = getattr(address_obj,field) and getattr(address_obj,field) or ''
#TODO
args['state_code'] = address_obj.state_id and address_obj.state_id.code or ''
args['state_name'] = address_obj.state_id and address_obj.state_id.name or ''
args['country_code'] = address_obj.country_id and address_obj.country_id.code or ''
args['country_name'] = address_obj.country_id and address_obj.country_id.name or ''
# If no country is defined - just in case
address_format = address_obj.country_id and address_obj.country_id.address_format or \
'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
return address_format % args
res_partner_address()
class res_partner_category(osv.osv):