← Back to branch summary

~openerp-dev/openobject-server/trunk-web-placeholder-rga

« back to all changes in this revision

Viewing changes to openerp/addons/base/res/res_country.py

[MERGE] merged the branch that merges res.partner and res.partner.address objects

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/addons/base/res/res_country.py
63
63
            'The code of the country must be unique !')
64
64
    ]
65
65
    _defaults = {
66
 
        'address_format': "%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
 
66
        'address_format': "%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
67
67
    }
68
68
    _order='name'
69
69