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

[MERGE]

Browse Source 
bzr revid: hmo@tinyerp.com-20100826070921-ivmxlkyvgdgmosbe
This commit is contained in:
Harry (OpenERP)
2010-08-26 12:39:21 +05:30
parent cd52eaf4dd a7c77ed348
commit 4c120f3c8b
4 changed files with 414 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir.xml
+226 -42
View File
@@ -10,34 +10,71 @@
<field name="priority">20</field>
<field name="arch" type="xml">
<form string="Connect Events to Actions">
<field name="name" select="1" required="1"/>
<newline/>
<group col="2" colspan="2">
<separator string="Action Source" colspan="2"/>
<field name="model_id" on_change="onchange_object_id(model_id)"/>
<field name="model" select="1" required="1"/>
<field name="res_id"/>
<field name="key2" select="2" required="1"/>
</group>
<group col="2" colspan="2">
<separator string="Action To Launch" colspan="2"/>
<field name="action_id" on_change="onchange_action_id(action_id)"/>
<field name="value_unpickle" required="1"/>
<field name="object" readonly="1"/>
</group>
<field name="name" required="1"/>
<field name="model_id" on_change="onchange_object_id(model_id)"/>
<field name="action_id" on_change="onchange_action_id(action_id)"/>
<field name="key2" required="1"/>
<field name="object" readonly="1"/>
<field name="res_id"/>
<field name="value_unpickle"/>
<field name="meta_unpickle"/>
<field name="user_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</form>
</field>
</record>
<record id="values_view_tree_action" model="ir.ui.view">
<field name="name">ir.values.tree.action</field>
<field name="model">ir.values</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Client Actions">
<field name="name"/>
<field name="model"/>
<field name="action_id"/>
<field name="key2"/>
</tree>
</field>
</record>
<record id="values_view_search_action" model="ir.ui.view">
<field name="name">ir.values.search.action</field>
<field name="model">ir.values</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Client Actions">
<field name="name"/>
<field name="model"/>
<field name="key2"/>
</search>
</field>
</record>
<record id="act_values_form_action" model="ir.actions.act_window">
<field name="name">Connect Actions To Client Events</field>
<field name="name">Client Actions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">ir.values</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" ref="values_view_form_action"/>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="values_view_search_action"/>
<field name="domain">[('key','=','action')]</field>
<field name="context">{'read':'default','default_object':1}</field>
</record>
<record model="ir.actions.act_window.view" id="action_values_tree_view">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="values_view_tree_action"/>
<field name="act_window_id" ref="act_values_form_action"/>
</record>
<record model="ir.actions.act_window.view" id="action_values_form_view">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="values_view_form_action"/>
<field name="act_window_id" ref="act_values_form_action"/>
</record>
<menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
@@ -89,8 +126,6 @@
<field name="context">{'read':'default'}</field>
</record>
<menuitem action="act_values_form" id="menu_values_form" parent="next_id_4"/>
<!-- Sequences -->
<record id="sequence_view" model="ir.ui.view">
@@ -239,8 +274,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action">
<field name="name" select="1"/>
<field name="type" select="1"/>
<field name="name"/>
<field name="type"/>
<field name="usage"/>
</form>
</field>
@@ -256,6 +291,17 @@
</tree>
</field>
</record>
<record id="action_view_search" model="ir.ui.view">
<field name="name">ir.actions.actions.search</field>
<field name="model">ir.actions.actions</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Action">
<field name="name"/>
<field name="type"/>
</search>
</field>
</record>
<record id="ir_sequence_actions" model="ir.actions.act_window">
<field name="name">Actions</field>
@@ -263,6 +309,7 @@
<field name="res_model">ir.actions.actions</field>
<field name="view_type">form</field>
<field name="view_id" ref="action_view_tree"/>
<field name="search_view_id" ref="action_view_search"/>
</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"/>
@@ -276,8 +323,8 @@
<field name="arch" type="xml">
<form string="Filters">
<group colspan="4" >
<field name="name" select="1"/>
<field name="user_id" select="1"/>
<field name="name"/>
<field name="user_id"/>
<field name="model_id"/>
</group>
<group col="4" expand="1">
@@ -298,14 +345,34 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Filters">
<field name="name" select="1"/>
<field name="user_id" select="1"/>
<field name="name"/>
<field name="user_id"/>
<field name="model_id"/>
<field name="domain"/>
<field name="context"/>
</tree>
</field>
</record>
<!--Filters search view-->
<record id="ir_filters_view_search" model="ir.ui.view">
<field name="name">ir.filters.search</field>
<field name="model">ir.filters</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Filters">
<group colspan="4" col="10">
<field name="name"/>
<field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
</group>
</search>
</field>
</record>
<!-- Filters action-->
@@ -315,6 +382,7 @@
<field name="res_model">ir.filters</field>
<field name="view_type">form</field>
<field name="view_id" ref="ir_filters_view_tree"/>
<field name="search_view_id" ref="ir_filters_view_search"/>
</record>
<!-- Filters view menu-->
@@ -329,8 +397,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Report custom">
<field name="name" select="1"/>
<field name="type" select="1"/>
<field name="name"/>
<field name="type"/>
<field name="report_id"/>
<field name="usage"/>
</form>
@@ -347,6 +415,23 @@
</tree>
</field>
</record>
<record id="act_report_custom_search_view" model="ir.ui.view">
<field name="name">ir.actions.report.custom.search</field>
<field name="model">ir.actions.report.custom</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Report custom">
<group colspan="4" col="10">
<field name="name"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group>
</search>
</field>
</record>
<record id="ir_action_report_custom" model="ir.actions.act_window">
<field name="name">Report Custom</field>
@@ -354,6 +439,7 @@
<field name="res_model">ir.actions.report.custom</field>
<field name="view_type">form</field>
<field name="view_id" ref="act_report_custom_view_tree"/>
<field name="search_view_id" ref="act_report_custom_search_view"/>
</record>
<menuitem action="ir_action_report_custom" id="menu_ir_action_report_custom" parent="base.next_id_6"/>
@@ -418,6 +504,26 @@
</tree>
</field>
</record>
<record id="act_report_xml_search_view" model="ir.ui.view">
<field name="name">ir.actions.report.xml.search</field>
<field name="model">ir.actions.report.xml</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Report xml">
<group col="10" colspan="4">
<field name="name"/>
<field name="model"/>
<field name="type"/>
<field name="report_name"/>
<field name="report_type"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'report_type'}"/>
</group>
</search>
</field>
</record>
<record id="ir_action_report_xml" model="ir.actions.act_window">
<field name="name">Report Xml</field>
@@ -425,6 +531,7 @@
<field name="res_model">ir.actions.report.xml</field>
<field name="view_type">form</field>
<field name="view_id" ref="act_report_xml_view_tree"/>
<field name="search_view_id" ref="act_report_xml_search_view"/>
</record>
<menuitem action="ir_action_report_xml" id="menu_ir_action_report_xml" parent="base.next_id_6"/>
@@ -503,11 +610,31 @@
</form>
</field>
</record>
<record id="view_window_action_search" model="ir.ui.view">
<field name="name">ir.actions.windows.search</field>
<field name="model">ir.actions.act_window</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Open a Window">
<group col="10" colspan="4">
<field name="name"/>
<field name="res_model"/>
<field name="view_type"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="View Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'view_type'}"/>
</group>
</search>
</field>
</record>
<record id="ir_action_window" model="ir.actions.act_window">
<field name="name">Window Actions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_window_action_search"/>
</record>
<record id="ir_action_window_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -542,20 +669,38 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Wizards">
<field name="name" select="1"/>
<field name="type" select="1"/>
<field name="wiz_name" select="1"/>
<field name="name"/>
<field name="type"/>
<field name="wiz_name"/>
<field name="multi"/>
<field colspan="4" name="groups_id"/>
<notebook colspan="4">
<page string="Security">
<field colspan="4" name="groups_id" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record id="act_wizard_search_view" model="ir.ui.view">
<field name="name">ir.actions.wizard.search</field>
<field name="model">ir.actions.wizard</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Wizards">
<field name="name"/>
<field name="type"/>
<field name="wiz_name"/>
</search>
</field>
</record>
<record id="ir_action_wizard" model="ir.actions.act_window">
<field name="name">Wizards</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">ir.actions.wizard</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="act_wizard_search_view"/>
</record>
<menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
@@ -821,6 +966,24 @@
</tree>
</field>
</record>
<record id="view_attachment_search" model="ir.ui.view">
<field name="name">ir.attachment.search</field>
<field name="model">ir.attachment</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Attachments">
<group colspan="4" col="10">
<field name="name"/>
<field name="datas_fname"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="File Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group>
</search>
</field>
</record>
<record id="action_attachment" model="ir.actions.act_window">
<field name="name">Attachments</field>
@@ -828,6 +991,7 @@
<field name="res_model">ir.attachment</field>
<field name="view_type">form</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_attachment_search"/>
</record>
<menuitem action="action_attachment" id="menu_action_attachment" parent="base.next_id_4"/>
@@ -1556,10 +1720,10 @@
<field name="arch" type="xml">
<form string="Server Action">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="model_id" select="1"/>
<field name="state" select="1"/>
<field name="sequence" select="2"/>
<field name="name"/>
<field name="model_id"/>
<field name="state"/>
<field name="sequence"/>
<field name="condition"/>
</group>
<notebook colspan="4">
@@ -1570,12 +1734,12 @@
<page string="Trigger" attrs="{'invisible':[('state','!=','trigger')]}">
<separator colspan="4" string="Trigger Configuration"/>
<field name="wkf_model_id" attrs="{'required':[('state','=','trigger')]}"/>
<field name="trigger_obj_id" select="2" context="{'key':''}" domain="[('model_id','=',model_id)]" attrs="{'required':[('state','=','trigger')]}"/>
<field name="trigger_name" select="2" attrs="{'required':[('state','=','trigger')]}"/>
<field name="trigger_obj_id" context="{'key':''}" domain="[('model_id','=',model_id)]" attrs="{'required':[('state','=','trigger')]}"/>
<field name="trigger_name" attrs="{'required':[('state','=','trigger')]}"/>
</page>
<page string="Action to Launch" attrs="{'invisible':[('state','!=','client_action')]}">
<separator colspan="4" string="Client Action Configuration"/>
<field name="action_id" select="2" attrs="{'required':[('state','=','client_action')]}"/>
<field name="action_id" attrs="{'required':[('state','=','client_action')]}"/>
</page>
<page string="Email Configuration" attrs="{'invisible':[('state','!=','email')]}">
<separator colspan="4" string="Email Configuration"/>
@@ -1594,9 +1758,9 @@
</page>
<page string="Create / Write / Copy" attrs="{'invisible':[('state','!=','object_create'), ('state','!=','object_write'), ('state','!=','object_copy')]}">
<separator colspan="4" string="Fields Mapping"/>
<field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_copy'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
<field name="srcmodel_id" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_copy'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
<field name="copy_object" on_change="change_object(copy_object, state)" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_write'), ('state','!=','object_create'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
<field name="fields_lines" nolabel="1" select="2" colspan="4">
<field name="fields_lines" nolabel="1" colspan="4">
<tree string="Field Mappings" editable="top">
<field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
<field name="type"/>
@@ -1641,6 +1805,25 @@
</tree>
</field>
</record>
<record id="view_server_action_search" model="ir.ui.view">
<field name="name">ir.actions.server.search</field>
<field name="model">ir.actions.server</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Server Actions">
<group col="10" colspan="4">
<field name="name"/>
<field name="state"/>
<field name="model_id"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="4">
<filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
</record>
<record id="action_server_action" model="ir.actions.act_window">
<field name="name">Server Actions</field>
@@ -1649,6 +1832,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_server_action_tree"/>
<field name="search_view_id" ref="view_server_action_search"/>
<field name="context">{'key':'server_action'}</field>
</record>
<menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
bin/addons/base/ir/workflow/workflow.py
+11 -5
View File
@@ -146,11 +146,17 @@ class wkf_transition(osv.osv):
_columns = {
'trigger_model': fields.char('Trigger Object', size=128),
'trigger_expr_id': fields.char('Trigger Expression', size=128),
'signal': fields.char('Signal (button Name)', size=64),
'role_id': fields.many2one('res.roles', 'Role Required'),
'condition': fields.char('Condition', required=True, size=128),
'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'),
'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'),
'signal': fields.char('Signal (button Name)', size=64,
help="When the operation of transition comes from a button pressed in the client form, "\
"signal tests the name of the pressed button. If signal is NULL, no button is necessary to validate this transition."),
'role_id': fields.many2one('res.roles', 'Role Required',
help="The role that a user must have to validate this transition."),
'condition': fields.char('Condition', required=True, size=128,
help="Expression to be satisfied if we want the transition done."),
'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade',
help="Source activity. When this activity is over, the condition is tested to determine if we can start the ACT_TO activity."),
'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade',
help="The destination activity."),
'wkf_id': fields.related('act_from','wkf_id', type='many2one', relation='workflow', string='Workflow', select=True),
}
_defaults = {
bin/addons/base/ir/workflow/workflow_view.xml
+122 -57
View File
@@ -92,40 +92,52 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity">
<field colspan="4" name="name" select="1"/>
<field name="wkf_id" select="1"/>
<field name="kind" select="1"/>
<field name="action_id" select="1" colspan="4"/>
<field name="action" select="1" colspan="4" attrs="{'readonly':[('kind','=','dummy')]}"/>
<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
<field name="signal_send"/>
<newline/>
<field name="flow_start"/>
<field name="flow_stop"/>
<field name="split_mode"/>
<field name="join_mode"/>
<separator colspan="4" string="Outgoing transitions"/>
<field colspan="4" name="out_transitions" nolabel="1">
<tree string="Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="role_id"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
<separator colspan="4" string="Incoming transitions"/>
<field colspan="4" name="in_transitions" nolabel="1">
<tree string="Transitions">
<field name="act_from"/>
<field name="signal"/>
<field name="role_id"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
<field name="name"/>
<field name="wkf_id"/>
<group colspan="4" col="7">
<field name="kind" colspan="4"/>
<field name="flow_start"/>
<field name="flow_stop"/>
</group>
<separator string="Properties" colspan="4"/>
<group colspan="4" col="6">
<group colspan="1" col="2">
<separator string="Subflow" colspan="2"/>
<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
<field name="signal_send"/>
</group>
<group colspan="1" col="2">
<separator string="Conditions" colspan="2"/>
<field name="split_mode"/>
<field name="join_mode"/>
</group>
<group colspan="4" col="2">
<separator string="Actions" colspan="2"/>
<field name="action_id"/>
<field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
</group>
</group>
<separator string="Transitions" colspan="4"/>
<group colspan="4" col="4">
<group col="2" colspan="2">
<field name="in_transitions" nolabel="1">
<tree string="Incoming Transitions">
<field name="act_from"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
<group col="2" colspan="2">
<field name="out_transitions" nolabel="1">
<tree string="Outgoing Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
</group>
</form>
</field>
</record>
@@ -138,19 +150,33 @@
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<field name="action"/>
<field name="action_id"/>
<field name="flow_start"/>
<field name="flow_stop"/>
</tree>
</field>
</record>
<record id="view_workflow_activity_search" model="ir.ui.view">
<field name="name">workflow.activity.search</field>
<field name="model">workflow.activity</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<field name="action_id"/>
<field name="action"/>
</search>
</field>
</record>
<record id="action_workflow_activity_form" model="ir.actions.act_window">
<field name="name">Activities</field>
<field name="res_model">workflow.activity</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_activity_tree"/>
<field name="search_view_id" ref="view_workflow_activity_search"/>
</record>
<menuitem action="action_workflow_activity_form" id="menu_workflow_activity" parent="base.menu_workflow_root"/>
@@ -167,8 +193,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition">
<field name="act_from" select="1"/>
<field name="act_to" select="1"/>
<field name="act_from"/>
<field name="act_to"/>
<field colspan="4" name="condition"/>
<field name="signal"/>
<field name="role_id"/>
@@ -186,22 +212,32 @@
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="role_id"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
</record>
<record id="view_workflow_transition_search" model="ir.ui.view">
<field name="name">workflow.transition.search</field>
<field name="model">workflow.transition</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field name="condition"/>
</search>
</field>
</record>
<record id="action_workflow_transition_form" model="ir.actions.act_window">
<field name="name">Transitions</field>
<field name="res_model">workflow.transition</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_transition_tree"/>
</record>
<menuitem action="action_workflow_transition_form" id="menu_workflow_transition" parent="base.menu_workflow_root"/>
<record id="action_workflow_transition_form" model="ir.actions.act_window">
<field name="name">Transitions</field>
<field name="res_model">workflow.transition</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_transition_tree"/>
<field name="search_view_id" ref="view_workflow_transition_search"/>
</record>
<menuitem action="action_workflow_transition_form" id="menu_workflow_transition" parent="base.menu_workflow_root"/>
<!--
================================
@@ -215,11 +251,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Instances">
<field name="wkf_id" select="1"/>
<field name="uid" select="2"/>
<field name="res_id" select="1"/>
<field name="res_type" select="1"/>
<field name="state" select="2"/>
<field name="wkf_id" readonly="1"/>
<field name="uid" readonly="1"/>
<field name="res_id" readonly="1"/>
<field name="res_type" readonly="1"/>
<field name="state" readonly="1"/>
</form>
</field>
</record>
@@ -237,12 +273,27 @@
</tree>
</field>
</record>
<record id="view_workflow_instance_search" model="ir.ui.view">
<field name="name">workflow.instance.search</field>
<field name="model">workflow.instance</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Instances">
<field name="wkf_id"/>
<field name="uid"/>
<field name="res_id"/>
<field name="res_type"/>
<field name="state"/>
</search>
</field>
</record>
<record id="action_workflow_instance_form" model="ir.actions.act_window">
<field name="name">Instances</field>
<field name="res_model">workflow.instance</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_instance_tree"/>
<field name="search_view_id" ref="view_workflow_instance_search"/>
</record>
<menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_low_workflow"/>
@@ -258,10 +309,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Workitems">
<field name="act_id" select="1"/>
<field name="subflow_id" select="1"/>
<field name="inst_id" select="1"/>
<field name="state" select="2"/>
<field name="act_id" readonly="1"/>
<field name="subflow_id" readonly="1"/>
<field name="inst_id" readonly="1"/>
<field name="state" readonly="1"/>
</form>
</field>
</record>
@@ -278,12 +329,26 @@
</tree>
</field>
</record>
<record id="view_workflow_workitem_search" model="ir.ui.view">
<field name="name">workflow.workitem.search</field>
<field name="model">workflow.workitem</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
<field name="state"/>
</search>
</field>
</record>
<record id="action_workflow_workitem_form" model="ir.actions.act_window">
<field name="name">Workitems</field>
<field name="res_model">workflow.workitem</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_workitem_tree"/>
<field name="search_view_id" ref="view_workflow_workitem_search"/>
</record>
<menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_low_workflow"/>
bin/addons/base/res/res_request_view.xml
+55 -31
View File
@@ -23,56 +23,68 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Requests">
<field name="act_from" select="1"/>
<field name="act_to" select="1"/>
<field colspan="4" name="name" select="1"/>
<group colspan="4" col="6">
<field name="name"/>
<field name="create_date" string="Request Date"/>
<newline/>
<field name="act_from"/>
<field name="priority"/>
<field name="active"/>
</group>
<notebook colspan="4">
<page string="Request">
<field name="act_to"/>
<field name="trigger_date"/>
<separator colspan="4" string="Description"/>
<newline/>
<field colspan="4" name="body" select="2"/>
<field name="trigger_date" select="2"/>
<group col="2" colspan="2">
<field colspan="4" name="body" nolabel="1"/>
<group col="4" 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"/>
</group>
<separator colspan="4" string="References"/>
</page>
<page string="References" groups="base.group_extended">
<field name="ref_partner_id"/>
<field name="priority" select="2"/>
<field colspan="4" name="ref_doc1"/>
<field colspan="4" name="ref_doc2"/>
<separator colspan="4" string="Status"/>
<field name="state"/>
<group col="3" colspan="2">
<field name="active" select="2"/>
<button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/>
</group>
</page>
<page string="History">
<page string="History" groups="base.group_extended">
<field colspan="4" name="history" nolabel="1" widget="one2many_list"/>
</page>
</notebook>
</form>
</field>
</record>
<record id="res_request_search_view" model="ir.ui.view">
<field name="name">res.request.search</field>
<field name="model">res.request</field>
<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"/>
<field name="name"/>
<field name="state"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
</record>
<record id="res_request-act" model="ir.actions.act_window">
<field name="name">My Requests</field>
<field name="name">Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.request</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="res_request_search_view"/>
</record>
<menuitem id="next_id_12" name="Requests" parent="base.next_id_4"/>
<menuitem action="res_request-act" id="menu_res_request_act" parent="next_id_12"/>
<record id="res_request-closed" model="ir.actions.act_window">
<field name="name">My Closed Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.request</field>
<field name="domain">[('active','=',False)]</field>
<field name="view_id" eval="False"/>
</record>
<menuitem action="res_request-closed" id="next_id_12_close" parent="menu_res_request_act"/>
<menuitem action="res_request-act" id="menu_res_request_act" parent="next_id_12" sequence="1"/>
<record id="res_request_link-view" model="ir.ui.view">
<field name="name">res.request.link.form</field>
@@ -80,8 +92,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Request Link">
<field name="name" select="1"/>
<field name="object" select="1"/>
<field name="name"/>
<field name="object"/>
<field name="priority"/>
</form>
</field>
@@ -97,15 +109,27 @@
</tree>
</field>
</record>
<record id="res_request_link_search_view" model="ir.ui.view">
<field name="name">res.request.link.search</field>
<field name="model">res.request.link</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Request Link">
<field name="name"/>
<field name="object"/>
</search>
</field>
</record>
<record id="res_request_link-act" model="ir.actions.act_window">
<field name="name">Accepted Links in Requests</field>
<field name="name">References Link</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_12"/>
<menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_12" sequence="4"/>
<record id="res_request_history_tree-view" model="ir.ui.view">