diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-06-13 19:39:00 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-06-13 19:39:00 +0200 |
| commit | a61e7cb0c80ae773cab9753bd8a4e7e888bbf415 (patch) | |
| tree | 019a235869a5e087055700895d4584c80e2f9afb /openerp/addons/base/base_data.xml | |
| parent | 5ed0ac2614b9430e61dae472d657a21c037d6ee9 (diff) | |
| parent | 180e6e41d81e28df43b41e3cb6131225d4169a28 (diff) | |
[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf
bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
Diffstat (limited to 'openerp/addons/base/base_data.xml')
| -rw-r--r-- | openerp/addons/base/base_data.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 2922dd82dc4..6a47325db39 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -49,8 +49,6 @@ <field name="symbol">€</field> <field name="rounding">0.01</field> <field name="accuracy">4</field> - <!-- Company ID will be set later --> - <field name="company_id" eval="None"/> </record> <record id="rateEUR" model="res.currency.rate"> <field name="rate">1.0</field> @@ -86,10 +84,6 @@ Administrator</field> <field name="company_id" ref="main_company"/> </record> - <record id="EUR" model="res.currency"> - <field name="company_id" ref="main_company"/> - </record> - <record id="ir_mail_server_localhost0" model="ir.mail_server"> <field name="name">localhost</field> <field name="smtp_host">localhost</field> |