diff options
| author | ron@tinyerp.com <> | 2010-09-29 13:28:17 +0530 |
|---|---|---|
| committer | ron@tinyerp.com <> | 2010-09-29 13:28:17 +0530 |
| commit | 1a6eb1e917b78f3dffacf3cc2beb2e29dd0290e2 (patch) | |
| tree | 66bf94867b2e10a8c68c50a4cc5b17dfbdf73484 /bin | |
| parent | 22fe6924aaeb31e7055213ff46784822a96c7ae4 (diff) | |
[IMP]: base:Improvement in base module
bzr revid: ron@tinyerp.com-20100929075817-ve8a7w8gw6e6v7k1
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/addons/base/base_menu.xml | 2 | ||||
| -rw-r--r-- | bin/addons/base/ir/ir_actions.py | 2 | ||||
| -rw-r--r-- | bin/addons/base/ir/ir_filters.py | 2 | ||||
| -rw-r--r-- | bin/addons/base/res/ir_property_view.xml | 2 | ||||
| -rw-r--r-- | bin/addons/base/res/res_request_view.xml | 31 |
5 files changed, 23 insertions, 16 deletions
diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml index 5da97026e48..3fe8e96a352 100644 --- a/bin/addons/base/base_menu.xml +++ b/bin/addons/base/base_menu.xml @@ -5,7 +5,7 @@ <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/> <menuitem id="next_id_4" name="Low Level Objects" parent="base.menu_administration" sequence="3" - groups="base.group_extended"/> + groups="base.group_extended,base.group_no_one" /> <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/> <menuitem id="menu_custom" name="Customization" parent="base.menu_administration" sequence="2" diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index 4b9d59743cb..09469e33450 100644 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -36,7 +36,7 @@ class actions(osv.osv): _table = 'ir_actions' _columns = { 'name': fields.char('Action Name', required=True, size=64), - 'type': fields.char('Action Type', required=True, size=32), + 'type': fields.char('Action Type', required=True, size=32,readonly=True), 'usage': fields.char('Action Usage', size=32), } _defaults = { diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py index 2821d0c94b7..8f9869a6922 100644 --- a/bin/addons/base/ir/ir_filters.py +++ b/bin/addons/base/ir/ir_filters.py @@ -42,7 +42,7 @@ class ir_filters(osv.osv): 'user_id':fields.many2one('res.users', 'User', help='False means for every user'), 'domain': fields.text('Domain Value', required=True), 'context': fields.text('Context Value', required=True), - 'model_id': fields.selection(_list_all_models, 'Model', required=True), + 'model_id': fields.selection(_list_all_models, 'Object', required=True), } ir_filters() diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml index f5a951d0c29..399cac47136 100644 --- a/bin/addons/base/res/ir_property_view.xml +++ b/bin/addons/base/res/ir_property_view.xml @@ -73,7 +73,7 @@ <field name="view_type">form</field> <field name="view_id" ref="ir_property_view_tree"/> </record> - <menuitem id="next_id_15" name="Parameters" parent="base.menu_config"/> + <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" /> <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/> </data> </openerp> diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml index 3e83f6c3e96..2b1195df51c 100644 --- a/bin/addons/base/res/res_request_view.xml +++ b/bin/addons/base/res/res_request_view.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <menuitem name="Requests" id="menu_resquest_ref" parent="base.next_id_4" sequence="1"/> + <record id="res_request_tree-view" model="ir.ui.view"> <field name="name">res.request.tree</field> <field name="model">res.request</field> @@ -40,9 +42,9 @@ <field colspan="4" name="body" nolabel="1"/> <group col="5" colspan="4"> <field name="state"/> - <button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/> - <button name="request_send" states="draft,active" string="Send" type="object"/> - <button name="request_reply" states="waiting" string="Reply" type="object"/> + <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/> + <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/> + <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/> </group> </page> <page string="References" groups="base.group_extended"> @@ -75,12 +77,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Requests"> - <group colspan="4" col="10"> - <field name="act_from"/> - <field name="act_to" select="1"/> - <field name="name"/> - <field name="state"/> - </group> + <filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]" + help="Draft and Active"/> + <separator orientation="vertical"/> + <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/> + <separator orientation="vertical"/> + <field name="act_from"/> + <field name="act_to" select="1"/> + <field name="name"/> + <field name="state"/> <newline/> <group expand="0" string="Group By" colspan="4"> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> @@ -108,7 +113,7 @@ <field name="search_view_id" ref="res_request_search_view"/> <field name="context">{"search_default_act_to":uid}</field> </record> - <menuitem action="res_request-act" id="menu_res_request_act" parent="base.next_id_4" sequence="1"/> + <menuitem action="res_request-act" id="menu_res_request_act" parent="menu_resquest_ref" /> <record id="res_request_link-view" model="ir.ui.view"> <field name="name">res.request.link.form</field> @@ -146,14 +151,16 @@ </record> <record id="res_request_link-act" model="ir.actions.act_window"> - <field name="name">References Link</field> + <field name="name">Request Reference Types</field> <field name="type">ir.actions.act_window</field> <field name="res_model">res.request.link</field> <field name="view_type">form</field> <field name="view_id" eval="False"/> <field name="search_view_id" ref="res_request_link_search_view"/> </record> - <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" sequence="4"/> + <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="menu_resquest_ref" /> + + <record id="res_request_history_tree-view" model="ir.ui.view"> |
