[MERGE] merged branch with pictures of contacts (demo data)

bzr revid: qdp-launchpad@openerp.com-20120817125835-68mq1lnd1i2n7n4d
2012-08-17 14:58:35 +02:00 · 2012-08-17 14:58:35 +02:00 · 3210d239e6
parent d6ea5a5cc6 dfb9b473a1
commit 3210d239e6
3 changed files with 46 additions and 32 deletions
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@ -1063,7 +1063,7 @@
            <field name="street">45, Rue du Palais</field>
            <field name="city">Paris</field>
            <field name="zip">75016</field>
-            <field ref="base.fr" name="country_id"/>
+            <field name="country_id" ref="base.fr"/>
            <field name="phone">+33 1 49 51 23 94</field>
            <field name="email">info@yourcompany.com</field>
            <field name="website">www.yourcompany.com</field>
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
--- a/openerp/addons/base/res/res_partner_demo.yml
+++ b/openerp/addons/base/res/res_partner_demo.yml