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

[IMP]: Usability improvements on base for "Configuration" and "Customization" menus 

bzr revid: rpa@tinyerp.com-20100927071229-0sy4e7s2j7cfv54a
This commit is contained in:
RON (OpenERP) 2010-09-27 12:42:29 +05:30 committed by rpa (Open ERP)
parent 4c92d5d416
commit 9c78dc1b91
5 changed files with 130 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
bin/addons/base/ir/ir.xml
View File

@ -10,14 +10,22 @@
<field name="priority">20</field> <field name="priority">20</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Connect Events to Actions"> <form string="Connect Events to Actions">
<group col="6" colspan="4">
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="model_id" on_change="onchange_object_id(model_id)"/> <field name="model_id" on_change="onchange_object_id(model_id)"/>
<field name="action_id" on_change="onchange_action_id(action_id)"/> <field name="action_id" on_change="onchange_action_id(action_id)"/>
<field name="key2" required="1"/> <field name="key2" required="1"/>
<field name="object" readonly="1"/>
<field name="res_id"/> <field name="res_id"/>
<field name="value_unpickle"/> <field name="object" readonly="1"/>
<field name="meta_unpickle"/> </group>
<group col="2" colspan="2">
<separator colspan="2" string="Value"/>
<field name="value_unpickle" nolabel="1"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Metadata"/>
<field name="meta_unpickle" nolabel="1"/>
</group>
<field name="user_id"/> <field name="user_id"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</form> </form>
@ -47,12 +55,17 @@
<field name="name"/> <field name="name"/>
<field name="model"/> <field name="model"/>
<field name="key2"/> <field name="key2"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
<record id="act_values_form_action" model="ir.actions.act_window"> <record id="act_values_form_action" model="ir.actions.act_window">
<field name="name">Client Actions</field> <field name="name">Client Events</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ir.values</field> <field name="res_model">ir.values</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -76,7 +89,9 @@
<field name="act_window_id" ref="act_values_form_action"/> <field name="act_window_id" ref="act_values_form_action"/>
</record> </record>
<menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/> <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
<menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
<!-- Values --> <!-- Values -->
@ -254,7 +269,7 @@
</record> </record>
<record id="ir_sequence_type" model="ir.actions.act_window"> <record id="ir_sequence_type" model="ir.actions.act_window">
<field name="name">Sequence Types</field> <field name="name">Sequence Codes</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ir.sequence.type</field> <field name="res_model">ir.sequence.type</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -310,7 +325,8 @@
<field name="view_id" ref="action_view_tree"/> <field name="view_id" ref="action_view_tree"/>
<field name="search_view_id" ref="action_view_search"/> <field name="search_view_id" ref="action_view_search"/>
</record> </record>
<menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
<menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/> <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
<!--Filters form view--> <!--Filters form view-->
@ -857,21 +873,25 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Views"> <form string="Views">
<group colspan="2" col="2"> <group colspan="4" col="6">
<separator string="General" colspan="2"/> <field name="name" select="1" colspan="6"/>
<field name="name" select="1"/> <field name="type" select="1"/>
<field name="type" select="1"/> <field name="model" select="1"/>
<field name="model" select="1"/> <field name="priority"/>
<field name="priority"/> </group>
</group> <notebook colspan="4">
<group colspan="2" col="2"> <page string="Architecture">
<separator string="Advanced" colspan="2"/> <field colspan="4" nolabel="1" name="arch"/>
<field name="field_parent"/> </page>
<field name="inherit_id" select="1"/> <page string="Extra Info">
<field name="xml_id" select="1"/> <separator string="Advanced" colspan="4"/>
</group> <newline/>
<separator string="View architecture" colspan="4"/> <field name="field_parent"/>
<field colspan="4" nolabel="1" name="arch"/> <field name="inherit_id" select="1"/>
<field name="xml_id" select="1"/>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>
@ -898,6 +918,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Views"> <search string="Views">
<filter icon="terp-stock_zoom" string="Search"
domain="[('type', '=', 'search')]" />
<filter icon="gtk-indent" string="Tree"
domain="[('type', '=', 'tree')]" />
<filter icon="gtk-new" string="Form"
domain="[('type', '=','form')]" />
<separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>
<field name="model"/> <field name="model"/>
@ -905,7 +932,7 @@
<field name="xml_id"/> <field name="xml_id"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group> </group>
</search> </search>
@ -1208,12 +1235,18 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Model Description"> <search string="Model Description">
<filter icon="terp-camera_test" string="In Memory"
domain="[('osv_memory', '=', True)]" />
<separator orientation="vertical" />
<filter icon="terp-stock_symbol-selection"
string="Custom" domain="[('state', '=', 'manual')]" />
<separator orientation="vertical" />
<filter icon="terp-stock_align_left_24" string="Base"
domain="[('state', '=', 'base')]" />
<separator orientation="vertical" />
<field name="name"/> <field name="name"/>
<field name="model"/> <field name="model"/>
<field name="osv_memory"/> <newline/>
<field name="state"/>
<field name="access_ids"/>
<field name="info"/>
</search> </search>
</field> </field>
</record> </record>
@ -1225,12 +1258,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Fields"> <form string="Fields">
<group colspan="4" col="4"> <group colspan="4" col="6">
<field name="name" select="1"/> <field name="name" select="1" />
<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/> <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
<field name="field_description"/> <field name="field_description"/>
<field name="state"/> <field name="state"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Properties"> <page string="Properties">
<group colspan="2" col="2"> <group colspan="2" col="2">
@ -1280,12 +1313,29 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Fields"> <search string="Fields">
<filter icon="terp-camera_test"
string="Required"
domain="[('required', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_align_left_24"
string="Readonly"
domain="[('readonly', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-translate"
string="Translate"
domain="[('translate', '=', True)]"/>
<newline/>
<field name="name"/> <field name="name"/>
<field name="field_description"/> <field name="field_description"/>
<field name="model_id"/> <field name="model_id"/>
<field name="ttype"/> <field name="ttype"/>
<field name="required"/> <field name="required"/>
<field name="readonly"/> <field name="readonly"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -1328,6 +1378,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Module Data"> <search string="Module Data">
<filter icon="terp-stock_effects-object-colorize"
string="Updatable"
domain="[('noupdate', '=', False)]"/>
<separator orientation="vertical"/>
<field name="module"/> <field name="module"/>
<field name="name"/> <field name="name"/>
<field name="model"/> <field name="model"/>
@ -1335,8 +1389,8 @@
<field name="noupdate"/> <field name="noupdate"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/> <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
<filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -1568,7 +1622,8 @@
<separator string="Action to Trigger" colspan="4"/> <separator string="Action to Trigger" colspan="4"/>
<field name="model" groups="base.group_extended"/> <field name="model" groups="base.group_extended"/>
<field name="function"/> <field name="function"/>
<field colspan="4" name="args"/> <separator string="Arguments" colspan="4"/>
<field colspan="4" name="args" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -1587,8 +1642,8 @@
<field name="active"/> <field name="active"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Next Call" icon="terp-go-month" <filter string="Execution" icon="terp-go-month"
domain="[]" context="{'group_by':'nextcall'}" /> domain="[]" context="{'group_by':'nextcall'}" />
</group> </group>
</search> </search>
@ -1888,7 +1943,7 @@
<field name="search_view_id" ref="view_server_action_search"/> <field name="search_view_id" ref="view_server_action_search"/>
<field name="context">{'key':'server_action'}</field> <field name="context">{'key':'server_action'}</field>
</record> </record>
<menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/> <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
<record model="ir.actions.act_window" id="action_model_grid_security"> <record model="ir.actions.act_window" id="action_model_grid_security">
<field name="name">Access Controls Grid</field> <field name="name">Access Controls Grid</field>
@ -1944,8 +1999,8 @@
<search string="Search Actions"> <search string="Search Actions">
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/> <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="state"/> <field name="state"/>
<field name="restart"/> <field name="restart"/>
</search> </search>
</field> </field>
</record> </record>

2
bin/addons/base/ir/ir_cron.py
View File

@ -52,7 +52,7 @@ class ir_cron(osv.osv, netsvc.Agent):
('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'), ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'), 'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
'doall' : fields.boolean('Repeat Missed'), 'doall' : fields.boolean('Repeat Missed'),
'nextcall' : fields.datetime('Next Call Date', required=True), 'nextcall' : fields.datetime('Next Execution Date', required=True),
'model': fields.char('Object', size=64), 'model': fields.char('Object', size=64),
'function': fields.char('Function', size=64), 'function': fields.char('Function', size=64),
'args': fields.text('Arguments'), 'args': fields.text('Arguments'),

4
bin/addons/base/ir/ir_ui_view.py
View File

@ -55,7 +55,7 @@ class view(osv.osv):
_columns = { _columns = {
'name': fields.char('View Name',size=64, required=True), 'name': fields.char('View Name',size=64, required=True),
'model': fields.char('Object', size=64, required=True), 'model': fields.char('Object', size=64, required=True),
'priority': fields.integer('Priority', required=True), 'priority': fields.integer('Sequence', required=True),
'type': fields.selection(( 'type': fields.selection((
('tree','Tree'), ('tree','Tree'),
('form','Form'), ('form','Form'),
@ -212,7 +212,7 @@ class view_sc(osv.osv):
_sql_constraints = [ _sql_constraints = [
('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'), ('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
] ]
view_sc() view_sc()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

44
bin/addons/base/ir/workflow/workflow_view.xml
View File

@ -15,9 +15,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Workflow"> <form string="Workflow">
<field name="name"/> <group col="6" colspan="4" >
<field name="osv"/> <field name="name"/>
<field name="on_create"/> <field name="osv"/>
<field name="on_create"/>
</group>
<separator colspan="4" string="Activities"/> <separator colspan="4" string="Activities"/>
<field colspan="4" name="activities" nolabel="1"/> <field colspan="4" name="activities" nolabel="1"/>
</form> </form>
@ -92,10 +94,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Activity"> <form string="Activity">
<field name="name"/> <group col="6" colspan="4">
<field name="wkf_id"/> <field name="name"/>
<group colspan="4" col="7"> <field name="wkf_id"/>
<field name="kind" colspan="4"/> <field name="kind"/>
</group>
<group colspan="2">
<field name="flow_start"/> <field name="flow_start"/>
<field name="flow_stop"/> <field name="flow_stop"/>
</group> </group>
@ -166,11 +170,20 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Workflow Activity"> <search string="Workflow Activity">
<filter icon="terp-camera_test" string="Flow Start"
domain="[('flow_start', '=',True)]" />
<filter icon="terp-gtk-stop" string="Flow Stop"
domain="[('flow_stop', '=',True)]" />
<separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="wkf_id"/> <field name="wkf_id"/>
<field name="kind"/> <field name="kind"/>
<field name="action_id"/> <field name="action_id"/>
<field name="action"/> <field name="action"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -197,13 +210,15 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Transition"> <form string="Transition">
<field name="act_from"/> <group col="6" colspan ="4">
<field name="act_to"/> <field name="act_from"/>
<field colspan="4" name="condition"/> <field name="act_to"/>
<field name="signal"/> <field name="signal"/>
<field name="role_id"/> <field name="condition"/>
<field name="trigger_model"/> <field name="trigger_model"/>
<field name="trigger_expr_id"/> <field name="trigger_expr_id"/>
<field name="role_id"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -229,6 +244,7 @@
<search string="Transition"> <search string="Transition">
<field name="act_from"/> <field name="act_from"/>
<field name="act_to"/> <field name="act_to"/>
<field name="signal"/>
<field name="condition"/> <field name="condition"/>
</search> </search>
</field> </field>

2
bin/addons/base/module/wizard/base_module_configuration_view.xml
View File

@ -27,7 +27,7 @@
<menuitem name="Start Configuration" <menuitem name="Start Configuration"
action="action_start_configurator" action="action_start_configurator"
id="menu_view_base_module_configuration" parent="next_id_11" id="menu_view_base_module_configuration" parent="next_id_11"
type="server" icon="STOCK_EXECUTE" sequence="2" /> type="server" icon="STOCK_EXECUTE" sequence="100" />
<record model="ir.values" id="action_todo_config"> <record model="ir.values" id="action_todo_config">
<field name="model_id" ref="model_ir_actions_todo" /> <field name="model_id" ref="model_ir_actions_todo" />