pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: stw@openerp.com-20111003120940-e0i7cgvcxvnxxgf1
This commit is contained in:
Stephane Wirtel
2011-10-03 14:09:40 +02:00
parent b916762b26 56c5b496ba
commit 012164a0ab
128 changed files with 3436 additions and 2084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_setup/base_setup_views.xml
+8 -28
View File
@@ -23,12 +23,6 @@
</record>
<menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
<record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
<field name="name">Add More Features</field>
<field name="resource">ir.ui.menu</field>
<field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="menu_view_base_module_configuration"/>
</record>
<!-- Import or create customers configartion view -->
<record id="action_import_create_installer" model="ir.actions.act_window">
@@ -54,13 +48,13 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Define default users preferences</attribute>
<attribute name="string">Define Users's Preferences</attribute>
</form>
<xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
<attribute name="string">Define default users preferences</attribute>
<attribute name="string">Define Users's Preferences</attribute>
</xpath>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
<attribute name="string">This will set the default preferences for all users. After this, each user will be able to update his own preferences.</attribute>
</xpath>
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
<attribute name="string"/>
@@ -89,6 +83,7 @@
<record id="config_action_user_preferences_config_form" model="ir.actions.todo">
<field name="action_id" ref="action_user_preferences_config_form"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="type">once</field>
</record>
<!-- Create Additional Users -->
@@ -97,14 +92,13 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.users</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="base.view_users_form"/>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="False"/>
</record>
<record id="config_wizard_action_config_user_form" model="ir.actions.todo">
<field name="action_id" ref="action_config_access_other_user"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="sequence">1000</field>
<field name="state">done</field>
</record>
@@ -123,7 +117,7 @@
<attribute name="string">Specify Your Terminology</attribute>
</xpath>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
<attribute name="string">You can use this wizard to change the terminologies for customers in the whole application.</attribute>
</xpath>
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
<attribute name="string"/>
@@ -149,6 +143,7 @@
<record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
<field name="action_id" ref="action_partner_terminology_config_form"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="type">once</field>
</record>
<!-- Company config -->
@@ -166,21 +161,6 @@
<field name="category_id" ref="base.category_administration_config"/>
<field name="sequence">1</field>
</record>
<!-- register Upload Logo configuration wizard -->
<record id="base_setup_company_logo_action" model="ir.actions.act_window">
<field name="name">Upload Your Company Logo</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.company</field>
<field name="view_id" ref="base.view_company_form"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="context">{'res_id': user.company_id.id}</field>
</record>
<record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
<field name="action_id" ref="base_setup_company_logo_action"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="state">done</field>
</record>
</data>
</openerp>