odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

configuration wizard : 

* improvement on user configuration wizard
* account journal for bank account wizard
* remove comment on install module wizard on profile_service module

bzr revid: hmo@tinyerp.com-06c4675c4a1b8ef32f28f543df69a3c3cad5193a
This commit is contained in:
Harshad Modi 2008-07-02 08:42:47 +00:00
parent 88238fee78
commit 9020c5e4db
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bin/addons/base/base_update.xml
View File

@ -26,7 +26,7 @@
<field name="view_type">form</field>
</record>
<menuitem id="next_id_2" name="Interface" parent="base.menu_custom"/><menuitem action="action_lang" id="menu_action_lang" parent="next_id_2"/>
<!--
======================
Groups
@ -65,7 +65,7 @@
</form>
</field>
</record>
<!--
======================
Users
@ -87,7 +87,7 @@
</form>
</field>
</record>
<record id="view_users_form" model="ir.ui.view">
<field name="name">res.users.form</field>
<field name="model">res.users</field>
@ -127,7 +127,7 @@
</tree>
</field>
</record>
<!--
======================
Company
@ -173,10 +173,10 @@
</tree>
</field>
</record>
<record id="view_users_configuration_form" model="ir.ui.view">
<field name="name">res.users.confirm.form</field>
<field name="model">res.users</field>
@ -197,11 +197,11 @@
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
<field colspan="4" name="signature"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" name="action_create" string="Save" type="object"/>
<button icon="gtk-ok" name="action_create_new" string="Save + New" type="object"/>
<button icon='gtk-cancel' name="action_next" type='object' string='Skip &amp; Continue'/>
<button name='action_new' icon='gtk-ok' type='object' string='Add Other User'/>
<button name='action_continue' icon='gtk-ok' type='object' string='Continue'/>
</group>
</page>
<page string="Security">
<field colspan="4" name="groups_id"/>
@ -211,7 +211,7 @@
</form>
</field>
</record>
<record id="action_config_user_form" model="ir.actions.act_window">
<field name="name">Configure User</field>
<field name="type">ir.actions.act_window</field>
@ -221,8 +221,8 @@
<field name="view_id" ref="view_users_configuration_form"/>
<field name="target">new</field>
</record>
<record id="view_confirm_simple_view_form" model="ir.ui.view">
<field name="name">res.users.confirm.simple_view</field>
<field name="model">res.config.view</field>
@ -244,16 +244,16 @@ to understand." colspan="2"/>
<newline/>
<separator string=""/>
<newline/>
<group>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" name="action_set" string="Set" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_config_simple_view_form" model="ir.actions.act_window">
<field name="name">Configure Simple View</field>
<field name="type">ir.actions.act_window</field>
@ -262,11 +262,11 @@ to understand." colspan="2"/>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<!-- register on configuratuion -->
<record id="config_wizard_step_user" model="ir.module.module.configuration.step">
<field name="name">Create User</field>
<field name="note">Create some users</field>
@ -274,7 +274,7 @@ to understand." colspan="2"/>
<field name="state">open</field>
<field name="sequence">10</field>
</record>
<record id="config_wizard_simple_view" model="ir.module.module.configuration.step">
<field name="name">Select between the simplified views or the extended views.</field>
<field name="note">Select between the simplified views or the extended views.
@ -285,6 +285,6 @@ to understand." colspan="2"/>
<field name="state">open</field>
<field name="sequence">5</field>
</record>
</data>
</terp>

13
bin/addons/base/res/res_user.py
View File

@ -196,7 +196,16 @@ class users(osv.osv):
data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
return dataobj.browse(cr, uid, data_id, context).res_id
def action_create(self,cr,uid,ids,context={}):
def action_next(self,cr,uid,ids,context=None):
return{
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
def action_continue(self,cr,uid,ids,context={}):
return {
'view_type': 'form',
"view_mode": 'form',
@ -204,7 +213,7 @@ class users(osv.osv):
'type': 'ir.actions.act_window',
'target':'new',
}
def action_create_new(self,cr,uid,ids,context={}):
def action_new(self,cr,uid,ids,context={}):
return {
'view_type': 'form',
"view_mode": 'form',