projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MERGE] sync with latest trunk
[odoo/odoo.git]
/
openerp
/
addons
/
base
/
base_data.xml
diff --git
a/openerp/addons/base/base_data.xml
b/openerp/addons/base/base_data.xml
index
f1c1b0e
..
aa1d79c
100644
(file)
--- a/
openerp/addons/base/base_data.xml
+++ b/
openerp/addons/base/base_data.xml
@@
-1006,7
+1006,7
@@
</record>
<record id="main_partner" model="res.partner">
</record>
<record id="main_partner" model="res.partner">
- <field name="name">Company Name</field>
+ <field name="name">Your Company</field>
<!-- Address and Company ID will be set later -->
<field name="address" eval="[]"/>
<field name="company_id" eval="None"/>
<!-- Address and Company ID will be set later -->
<field name="address" eval="[]"/>
<field name="company_id" eval="None"/>
@@
-1014,14
+1014,7
@@
</record>
<record id="main_address" model="res.partner.address">
<field name="partner_id" ref="main_partner"/>
</record>
<record id="main_address" model="res.partner.address">
<field name="partner_id" ref="main_partner"/>
- <field name="name">Company contact name</field>
- <field name="street">Company street, number</field>
- <field name="zip">Company zip</field>
- <field name="city">Company city</field>
- <field name="phone">+1-212-555-12345</field>
<field name="type">default</field>
<field name="type">default</field>
- <field model="res.country" name="country_id" ref="us"/>
- <!-- Company ID will be set later -->
<field name="company_id" eval="None"/>
</record>
<field name="company_id" eval="None"/>
</record>
@@
-1042,7
+1035,7
@@
<!-- Basic Company -->
<record id="main_company" model="res.company">
<!-- Basic Company -->
<record id="main_company" model="res.company">
- <field name="name">Company Name</field>
+ <field name="name">Your Company</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_header1">Company business slogan</field>
<field name="rml_footer1">Web: www.companyname.com - Tel: +1-212-555-12345</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_header1">Company business slogan</field>
<field name="rml_footer1">Web: www.companyname.com - Tel: +1-212-555-12345</field>