Odoo Server (MOVED TO GITHUB)

Merge lp:~therp-nl/openobject-server/6.1-address_format-nl into lp:openobject-server

  1. 6.1-address_format-nl
  2. Merge into trunk
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 3996
Proposed branch: lp:~therp-nl/openobject-server/6.1-address_format-nl
Merge into: lp:openobject-server
Diff against target: 11 lines (+1/-0)
1 file modified
openerp/addons/base/base_data.xml (+1/-0)
To merge this branch: bzr merge lp:~therp-nl/openobject-server/6.1-address_format-nl
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Elias (community) Approve
Review via email: mp+90984@code.launchpad.net

Description of the change

Hi,

This branch adds the format for addresses in the Netherlands to the base module's country data.

Cheers,
Stefan.

To post a comment you must log in.
Revision history for this message
Elias (rtxehi) wrote :

Looks good to me.

review: Approve
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) :
review: Approve
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Hi guys,

thanks for the speedy review!

Cheers,
Stefan.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/base_data.xml'
2--- openerp/addons/base/base_data.xml 2011-12-29 09:36:03 +0000
3+++ openerp/addons/base/base_data.xml 2012-01-31 23:47:24 +0000
4@@ -674,6 +674,7 @@
5 <record id="nl" model="res.country">
6 <field name="name">Netherlands</field>
7 <field name="code">nl</field>
8+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
9 </record>
10 <record id="no" model="res.country">
11 <field name="name">Norway</field>