<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="AUD"/>
</record>
<record id="aw" model="res.country">
<record id="az" model="res.country">
<field name="name">Azerbaijan</field>
<field name="code">az</field>
- <field name="currency_id" ref="AZM"/>
+ <field name="currency_id" ref="AZN"/>
</record>
<record id="ba" model="res.country">
<field name="name">Bosnia-Herzegovina</field>
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="bf" model="res.country">
<record id="bg" model="res.country">
<field name="name">Bulgaria</field>
<field name="code">bg</field>
- <field name="currency_id" ref="BGL"/>
+ <field name="currency_id" ref="BGN"/>
</record>
<record id="bh" model="res.country">
<field name="name">Bahrain</field>
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="BRL"/>
</record>
<record id="bs" model="res.country">
<record id="by" model="res.country">
<field name="name">Belarus</field>
<field name="code">by</field>
- <field name="currency_id" ref="BYB"/>
+ <field name="currency_id" ref="BYR"/>
</record>
<record id="bz" model="res.country">
<field name="name">Belize</field>
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="CAD"/>
</record>
<record id="cc" model="res.country">
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="et" model="res.country">
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="ga" model="res.country">
<record id="gh" model="res.country">
<field name="name">Ghana</field>
<field name="code">gh</field>
- <field name="currency_id" ref="GHC"/>
+ <field name="currency_id" ref="GHS"/>
</record>
<record id="gi" model="res.country">
<field name="name">Gibraltar</field>
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />
<field name="currency_id" ref="INR"/>
</record>
<record id="io" model="res.country">
<record id="mg" model="res.country">
<field name="name">Madagascar</field>
<field name="code">mg</field>
- <field name="currency_id" ref="MGF"/>
+ <field name="currency_id" ref="MGA"/>
</record>
<record id="mh" model="res.country">
<field name="name">Marshall Islands</field>
<record id="mt" model="res.country">
<field name="name">Malta</field>
<field name="code">mt</field>
- <field name="currency_id" ref="MTL"/>
+ <field name="currency_id" ref="EUR"/>
</record>
<record id="mu" model="res.country">
<field name="name">Mauritius</field>
<record id="mz" model="res.country">
<field name="name">Mozambique</field>
<field name="code">mz</field>
- <field name="currency_id" ref="MZM"/>
+ <field name="currency_id" ref="MZN"/>
</record>
<record id="na" model="res.country">
<field name="name">Namibia</field>
<record id="ni" model="res.country">
<field name="name">Nicaragua</field>
<field name="code">ni</field>
- <field name="currency_id" ref="NIC"/>
+ <field name="currency_id" ref="NIO"/>
</record>
<record id="nl" model="res.country">
<field name="name">Netherlands</field>
<field name="code">nl</field>
- <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
<field name="currency_id" ref="EUR"/>
</record>
<record id="no" model="res.country">
<record id="si" model="res.country">
<field name="name">Slovenia</field>
<field name="code">si</field>
- <field name="currency_id" ref="SIT"/>
+ <field name="currency_id" ref="EUR"/>
</record>
<record id="sj" model="res.country">
<field name="name">Svalbard and Jan Mayen Islands</field>
<record id="tp" model="res.country">
<field name="name">East Timor</field>
<field name="code">tp</field>
- <field name="currency_id" ref="USD"/>
+ <field name="currency_id" ref="TPE"/>
</record>
<record id="tr" model="res.country">
<field name="name">Turkey</field>
<field name="code">ua</field>
<field name="currency_id" ref="UAG"/>
</record>
+ <!-- DEPRECATED, New currency code of Uganda is UGX ! -->
<record id="ug" model="res.country">
<field name="name">Uganda</field>
<field name="code">ug</field>
- <field name="currency_id" ref="UGS"/>
+ <field name="currency_id" ref="UGX"/>
</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="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />
<field name="code">gb</field>
<field name="currency_id" ref="GBP"/>
</record>
<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'" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
<field name="currency_id" ref="USD"/>
</record>
<record id="uy" model="res.country">
<record id="yu" model="res.country">
<field name="name">Yugoslavia</field>
<field name="code">yu</field>
- <field name="currency_id" ref="YUD"/>
+ <field name="currency_id" ref="YUM"/>
</record>
<record id="za" model="res.country">
<field name="name">South Africa</field>
<field name="code">zm</field>
<field name="currency_id" ref="ZMK"/>
</record>
+
<!-- DEPRECATED, New name of Zaire is Democratic Republic of the Congo ! -->
<record id="zr" model="res.country">
<field name="name">Zaire</field>
<field name="currency_id" ref="ZWD"/>
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>