summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2017-10-17 17:01:45 +0200
committerThibault Delavallée <tde@odoo.com>2017-11-27 11:15:13 +0100
commit22f02af6bf002324ebafc38d4eefeda60063247a (patch)
treedfe7981090db11a5c866812aa3d1a2410117d385
parent52dc556a154df85ffee5b4d79ede4afde7483433 (diff)
[SPLIT] base: split base_data
-rw-r--r--odoo/addons/base/__manifest__.py8
-rw-r--r--odoo/addons/base/data/base_data.xml135
-rw-r--r--odoo/addons/base/data/ir_mail_server_data.xml11
-rw-r--r--odoo/addons/base/data/report_paperformat_data.xml52
-rw-r--r--odoo/addons/base/data/res_company_data.xml14
-rw-r--r--odoo/addons/base/data/res_lang_data.xml6
-rw-r--r--odoo/addons/base/data/res_partner_data.xml24
-rw-r--r--odoo/addons/base/data/res_users_data.xml30
-rw-r--r--odoo/addons/base/views/ir_ui_menu_views.xml12
9 files changed, 154 insertions, 138 deletions
diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 5918587e7cb..84e7b172a9c 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -13,7 +13,12 @@ The kernel of Odoo, needed for all installation.
'depends': [],
'data': [
'data/res.lang.csv',
- 'data/base_data.xml',
+ 'data/res_lang_data.xml',
+ 'data/res_partner_data.xml',
+ 'data/res_company_data.xml',
+ 'data/res_users_data.xml',
+ 'data/ir_mail_server_data.xml',
+ 'data/report_paperformat_data.xml',
'data/res_currency_data.xml',
'data/res_country_data.xml',
'security/base_security.xml',
@@ -57,7 +62,6 @@ The kernel of Odoo, needed for all installation.
'views/res_country_views.xml',
'views/res_currency_views.xml',
'views/res_users_views.xml',
- 'data/res_partner_data.xml',
'views/ir_property_views.xml',
'views/res_config_settings_views.xml',
'views/report_paperformat_views.xml',
diff --git a/odoo/addons/base/data/base_data.xml b/odoo/addons/base/data/base_data.xml
deleted file mode 100644
index 94ec6672cd1..00000000000
--- a/odoo/addons/base/data/base_data.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
- <data noupdate="1">
- <record id="view_menu" model="ir.ui.view">
- <field name="name">ir.ui.menu.tree</field>
- <field name="model">ir.ui.menu</field>
- <field name="arch" type="xml">
- <tree string="Menu" toolbar="1">
- <field icon="icon" name="name"/>
- </tree>
- </field>
- <field name="field_parent">child_id</field>
- </record>
-
- <function name="install_lang" model="res.lang"/>
-
- <record id="main_partner" model="res.partner" context="{'default_is_company': True}">
- <field name="name">My Company</field>
- <field name="company_id" eval="None"/>
- <field name="customer" eval="False"/>
- <field name="is_company" eval="True"/>
- <field name="street"></field>
- <field name="city"></field>
- <field name="zip"></field>
- <field name="phone"></field>
- <field name="email">info@yourcompany.com</field>
- <field name="website">www.yourcompany.com</field>
- </record>
-
- <!-- Basic Company -->
- <record id="main_company" model="res.company">
- <field name="name">My Company</field>
- <field name="partner_id" ref="main_partner"/>
- <field name="currency_id" ref="base.EUR"/>
- </record>
-
- <record model="res.partner" id="base.partner_root">
- <field name="name">Administrator</field>
- <field name="company_id" ref="main_company"/>
- <field name="customer" eval="False"/>
- <field name="email">admin@example.com</field>
- </record>
-
- <record model="res.users" id="base.user_root">
- <field name="partner_id" ref="base.partner_root"/>
- <field name="company_id" ref="main_company"/>
- <field name="company_ids" eval="[(4, ref('main_company'))]"/>
- <field name="signature"><![CDATA[<span>-- <br/>
-Administrator</span>]]></field>
- </record>
-
- <!-- Default user with full access rights for newly created users -->
- <record id="default_user" model="res.users">
- <field name="name">Default User Template</field>
- <field name="login">default</field>
- <field name="active" eval="False"/>
- </record>
-
- <record id="main_partner" model="res.partner">
- <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>
- <field eval="25" name="smtp_port"/>
- <field eval="10" name="sequence"/>
- </record>
-
- <record id="public_partner" model="res.partner">
- <field name="name">Public user</field>
- <field name="active" eval="False"/>
- </record>
-
- <record id="public_user" model="res.users">
- <field name="name">Public user</field>
- <field name="login">public</field>
- <field name="password"></field>
- <!-- Avoid auto-including this demo user in any default group -->
- <field name="groups_id" eval="[(6,0,[])]"/>
- <field name="image" type="base64" file="base/static/img/public_user-image.png"/>
- <field name="partner_id" ref="public_partner"/>
- <field name="active" eval="False"/>
- </record>
-
- <record id="paperformat_euro" model="report.paperformat">
- <field name="name">European A4</field>
- <field name="default" eval="True" />
- <field name="format">A4</field>
- <field name="page_height">0</field>
- <field name="page_width">0</field>
- <field name="orientation">Portrait</field>
- <field name="margin_top">40</field>
- <field name="margin_bottom">28</field>
- <field name="margin_left">7</field>
- <field name="margin_right">7</field>
- <field name="header_line" eval="False" />
- <field name="header_spacing">35</field>
- <field name="dpi">90</field>
- </record>
-
- <record id="paperformat_us" model="report.paperformat">
- <field name="name">US Letter</field>
- <field name="default" eval="True" />
- <field name="format">Letter</field>
- <field name="page_height">0</field>
- <field name="page_width">0</field>
- <field name="orientation">Portrait</field>
- <field name="margin_top">40</field>
- <field name="margin_bottom">25</field>
- <field name="margin_left">7</field>
- <field name="margin_right">7</field>
- <field name="header_line" eval="False" />
- <field name="header_spacing">35</field>
- <field name="dpi">90</field>
- </record>
-
- <record id="paperformat_batch_deposit" model="report.paperformat">
- <field name="name">US Batch Deposit</field>
- <field name="default" eval="False" />
- <field name="format">Letter</field>
- <field name="page_height">0</field>
- <field name="page_width">0</field>
- <field name="orientation">Portrait</field>
- <field name="margin_top">15</field>
- <field name="margin_bottom">10</field>
- <field name="margin_left">10</field>
- <field name="margin_right">10</field>
- <field name="header_line" eval="False" />
- <field name="header_spacing">0</field>
- <field name="dpi">90</field>
- </record>
-
- </data>
-</odoo>
diff --git a/odoo/addons/base/data/ir_mail_server_data.xml b/odoo/addons/base/data/ir_mail_server_data.xml
new file mode 100644
index 00000000000..475b59a15e1
--- /dev/null
+++ b/odoo/addons/base/data/ir_mail_server_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <record id="ir_mail_server_localhost0" model="ir.mail_server">
+ <field name="name">localhost</field>
+ <field name="smtp_host">localhost</field>
+ <field eval="25" name="smtp_port"/>
+ <field eval="10" name="sequence"/>
+ </record>
+ </data>
+</odoo> \ No newline at end of file
diff --git a/odoo/addons/base/data/report_paperformat_data.xml b/odoo/addons/base/data/report_paperformat_data.xml
new file mode 100644
index 00000000000..28d69f53863
--- /dev/null
+++ b/odoo/addons/base/data/report_paperformat_data.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <record id="paperformat_euro" model="report.paperformat">
+ <field name="name">European A4</field>
+ <field name="default" eval="True" />
+ <field name="format">A4</field>
+ <field name="page_height">0</field>
+ <field name="page_width">0</field>
+ <field name="orientation">Portrait</field>
+ <field name="margin_top">40</field>
+ <field name="margin_bottom">28</field>
+ <field name="margin_left">7</field>
+ <field name="margin_right">7</field>
+ <field name="header_line" eval="False" />
+ <field name="header_spacing">35</field>
+ <field name="dpi">90</field>
+ </record>
+
+ <record id="paperformat_us" model="report.paperformat">
+ <field name="name">US Letter</field>
+ <field name="default" eval="True" />
+ <field name="format">Letter</field>
+ <field name="page_height">0</field>
+ <field name="page_width">0</field>
+ <field name="orientation">Portrait</field>
+ <field name="margin_top">40</field>
+ <field name="margin_bottom">25</field>
+ <field name="margin_left">7</field>
+ <field name="margin_right">7</field>
+ <field name="header_line" eval="False" />
+ <field name="header_spacing">35</field>
+ <field name="dpi">90</field>
+ </record>
+
+ <record id="paperformat_batch_deposit" model="report.paperformat">
+ <field name="name">US Batch Deposit</field>
+ <field name="default" eval="False" />
+ <field name="format">Letter</field>
+ <field name="page_height">0</field>
+ <field name="page_width">0</field>
+ <field name="orientation">Portrait</field>
+ <field name="margin_top">15</field>
+ <field name="margin_bottom">10</field>
+ <field name="margin_left">10</field>
+ <field name="margin_right">10</field>
+ <field name="header_line" eval="False" />
+ <field name="header_spacing">0</field>
+ <field name="dpi">90</field>
+ </record>
+ </data>
+</odoo> \ No newline at end of file
diff --git a/odoo/addons/base/data/res_company_data.xml b/odoo/addons/base/data/res_company_data.xml
new file mode 100644
index 00000000000..3759ae13143
--- /dev/null
+++ b/odoo/addons/base/data/res_company_data.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <record id="main_company" model="res.company">
+ <field name="name">My Company</field>
+ <field name="partner_id" ref="main_partner"/>
+ <field name="currency_id" ref="base.EUR"/>
+ </record>
+
+ <record id="main_partner" model="res.partner">
+ <field name="company_id" ref="main_company"/>
+ </record>
+ </data>
+</odoo>
diff --git a/odoo/addons/base/data/res_lang_data.xml b/odoo/addons/base/data/res_lang_data.xml
new file mode 100644
index 00000000000..712991c1ebf
--- /dev/null
+++ b/odoo/addons/base/data/res_lang_data.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <function name="install_lang" model="res.lang"/>
+ </data>
+</odoo> \ No newline at end of file
diff --git a/odoo/addons/base/data/res_partner_data.xml b/odoo/addons/base/data/res_partner_data.xml
index 9f37ed5c004..263c368b75e 100644
--- a/odoo/addons/base/data/res_partner_data.xml
+++ b/odoo/addons/base/data/res_partner_data.xml
@@ -1,6 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="True">
+ <record id="main_partner" model="res.partner" context="{'default_is_company': True}">
+ <field name="name">My Company</field>
+ <field name="company_id" eval="None"/>
+ <field name="customer" eval="False"/>
+ <field name="is_company" eval="True"/>
+ <field name="street"></field>
+ <field name="city"></field>
+ <field name="zip"></field>
+ <field name="phone"></field>
+ <field name="email">info@yourcompany.com</field>
+ <field name="website">www.yourcompany.com</field>
+ </record>
+
+ <record model="res.partner" id="base.partner_root">
+ <field name="name">Administrator</field>
+ <field name="company_id" ref="main_company"/>
+ <field name="customer" eval="False"/>
+ <field name="email">admin@example.com</field>
+ </record>
+
+ <record id="public_partner" model="res.partner">
+ <field name="name">Public user</field>
+ <field name="active" eval="False"/>
+ </record>
<!--
Resource: res.partner.title
diff --git a/odoo/addons/base/data/res_users_data.xml b/odoo/addons/base/data/res_users_data.xml
new file mode 100644
index 00000000000..70482bf1893
--- /dev/null
+++ b/odoo/addons/base/data/res_users_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+ <record model="res.users" id="base.user_root">
+ <field name="partner_id" ref="base.partner_root"/>
+ <field name="company_id" ref="main_company"/>
+ <field name="company_ids" eval="[(4, ref('main_company'))]"/>
+ <field name="signature"><![CDATA[<span>-- <br/>
+Administrator</span>]]></field>
+ </record>
+
+ <!-- Default user with full access rights for newly created users -->
+ <record id="default_user" model="res.users">
+ <field name="name">Default User Template</field>
+ <field name="login">default</field>
+ <field name="active" eval="False"/>
+ </record>
+
+ <record id="public_user" model="res.users">
+ <field name="name">Public user</field>
+ <field name="login">public</field>
+ <field name="password"></field>
+ <!-- Avoid auto-including this demo user in any default group -->
+ <field name="groups_id" eval="[(6,0,[])]"/>
+ <field name="image" type="base64" file="base/static/img/public_user-image.png"/>
+ <field name="partner_id" ref="public_partner"/>
+ <field name="active" eval="False"/>
+ </record>
+ </data>
+</odoo>
diff --git a/odoo/addons/base/views/ir_ui_menu_views.xml b/odoo/addons/base/views/ir_ui_menu_views.xml
index 8a42b511e66..06651af015f 100644
--- a/odoo/addons/base/views/ir_ui_menu_views.xml
+++ b/odoo/addons/base/views/ir_ui_menu_views.xml
@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
-
+ <record id="view_menu" model="ir.ui.view">
+ <field name="name">ir.ui.menu.tree</field>
+ <field name="model">ir.ui.menu</field>
+ <field name="arch" type="xml">
+ <tree string="Menu" toolbar="1">
+ <field icon="icon" name="name"/>
+ </tree>
+ </field>
+ <field name="field_parent">child_id</field>
+ </record>
+
<record id="edit_menu_access" model="ir.ui.view">
<field name="model">ir.ui.menu</field>
<field name="arch" type="xml">