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

[MERGE] merged aag branch with data for ir.actions.todo categories + improved views of ir.actions.todo 

bzr revid: qdp-launchpad@openerp.com-20110608084928-3e0vs45o19vrv3qw
This commit is contained in:
Quentin (OpenERP) 2011-06-08 10:49:28 +02:00
parent 95c0d38ec5 12b77a1dea
commit 1b754989c4
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openerp/addons/base/base_update.xml
View File

@ -289,9 +289,15 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="category_administration_config" model="ir.actions.todo.category">
<field name="name">Administration</field>
<field name="sequence">1</field>
</record>
<record id="config_wizard_simple_view" model="ir.actions.todo">
<field name="action_id" ref="action_config_simple_view_form"/>
<field name="category_id" ref="category_administration_config"/>
<field name="type">special</field>
<field name="sequence">1</field>
<field name="state">skip</field>

28
openerp/addons/base/ir/ir.xml
View File

@ -1878,6 +1878,7 @@
<field name="arch" type="xml">
<tree editable="bottom" string="Config Wizard Steps">
<field name="sequence"/>
<field name="category_id"/>
<field name="action_id"/>
<field name="type"/>
<field name="state" readonly="1"/>
@ -1920,11 +1921,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Actions">
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
<separator orientation="vertical"/>
<field name="action_id"/>
<field name="state"/>
<field name="type"/>
<group>
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
<separator orientation="vertical"/>
<field name="category_id"/>
<field name="action_id"/>
<field name="state"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
</group>
</search>
</field>
</record>
@ -1963,6 +1970,7 @@
<form string="Wizard Category">
<field name="name"/>
<field name="sequence"/>
<field name="wizards_ids" nolabel="1" colspan="4"/>
</form>
</field>
</record>
@ -1979,5 +1987,15 @@
</field>
</record>
<record id="category_sales_management_config" model="ir.actions.todo.category">
<field name="name">Sales Management</field>
<field name="sequence">5</field>
</record>
<record id="category_tools_customization_config" model="ir.actions.todo.category">
<field name="name">Tools / Customization</field>
<field name="sequence">5</field>
</record>
</data>
</openerp>

1
openerp/addons/base/ir/ir_actions.py
View File

@ -805,6 +805,7 @@ class ir_actions_todo_category(osv.osv):
_columns = {
'name':fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence'),
'wizards_ids': fields.one2many('ir.actions.todo', 'category_id', 'Configuration Wizards'),
}
ir_actions_todo_category()