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

[MERGE]

Browse Source 
bzr revid: stephane@tinyerp.com-20081218181532-6miaczdy5aoat2ox
This commit is contained in:
Stephane Wirtel
2008-12-18 19:15:32 +01:00
parent cfd194c028 f4ea93ce26
commit 6a1459d7d0
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/base_update.xml
+2 -2
View File
@@ -257,13 +257,14 @@
<!-- register on configuratuion -->
</data>
<data noupdate="1">
<record id="config_wizard_step_user" model="ir.actions.todo">
<field name="name">Create User</field>
<field name="note">Create your users.
You will be able to assign groups to users. Groups define the access rights of each users on the different objects of the system.
</field>
<field name="action_id" ref="action_config_user_form"/>
<field name="state">open</field>
<field name="sequence">10</field>
</record>
@@ -275,7 +276,6 @@ the simplified interface, which has less options and fields but is easier to
understand. You will be able to switch to the extended view later.
</field>
<field name="action_id" ref="action_config_simple_view_form"/>
<field name="state">open</field>
<field name="sequence">5</field>
</record>
bin/addons/base/ir/ir.xml
+8 -8
View File
@@ -1154,7 +1154,7 @@
<field name="condition" colspan="4"/>
<notebook colspan="4">
<page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
<page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
<separator colspan="4" string="Python Code"/>
<field name="code" colspan="4" nolabel="1"/>
</page>
@@ -1273,28 +1273,28 @@
</record>
<menuitem action="action_model_grid_security" id="menu_ir_access_grid" parent="menu_security_access"/>
<record id="ir_actions_todo_tree" model="ir.ui.view">
<record id="ir_actions_todo_tree" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">Config Wizard Steps</field>
<field name="name">Config Wizard Steps</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree editable="bottom" string="Config Wizard Steps">
<field name="name" select="1"/>
<field name="name" select="1"/>
<field name="action_id" select="1"/>
<field name="sequence"/>
<field name="state"/>
<field name="active" select="1"/>
<field name="active" select="1"/>
</tree>
</field>
</record>
<record id="config_wizard_step_view_form" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">Config Wizard Steps</field>
<field name="name">Config Wizard Steps</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form editable="bottom" string="Config Wizard Steps">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="active" select="1"/>
<field name="action_id" select="1"/>
<field name="sequence"/>
<field name="state"/>
@@ -1307,7 +1307,7 @@
<field name="res_model">ir.actions.todo</field>
<field name="view_id" ref="ir_actions_todo_tree"/>
<field name="view_type">form</field>
<field name="domain">[('type','=','configure')]</field>
<field name="domain">[('type','=','configure')]</field>
</record>
<menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" parent="next_id_11"/>
bin/osv/fields.py
-1
View File
@@ -426,7 +426,6 @@ class one2many(_column):
context = {}
if not values:
return
_table = obj.pool.get(self._obj)._table
obj = obj.pool.get(self._obj)
for act in values: