X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;ds=sidebyside;f=openerp%2Faddons%2Fbase%2Fcountry_data.xml;h=d4d880cb8ed19019b8539c496a505c240508828a;hb=5d8f738b886306489ac792cd7d50528c2e00643a;hp=aa5729ae91741370cafce7b614927cc3a7cd2be5;hpb=fc71aeaa7b9d385c09af79adec8f0b4bd6fc171d;p=odoo%2Fodoo.git

diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/country_data.xml
index aa5729a..d4d880c 100644
--- a/openerp/addons/base/country_data.xml
+++ b/openerp/addons/base/country_data.xml
@@ -70,7 +70,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'" />
+            <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">
@@ -106,7 +106,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'" />
+            <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">
@@ -162,7 +162,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'" />
+            <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">
@@ -198,7 +198,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'" />
+            <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">
@@ -350,7 +350,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'" />
+            <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">
@@ -386,7 +386,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'" />
+            <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">
@@ -532,7 +532,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'" />
+            <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">
@@ -838,7 +838,7 @@
         <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">
@@ -1166,14 +1166,15 @@
             <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>
@@ -1185,7 +1186,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'" />
+            <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">
@@ -1268,6 +1269,7 @@
             <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>
@@ -1280,4 +1282,4 @@
             <field name="currency_id" ref="ZWD"/>
         </record>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>