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

[Merge] 

bzr revid: vir@tinyerp.com-20100913095609-lpvaem22onbub325
bzr revid: vir@tinyerp.com-20100915043759-um560kpvxgrjls9s
bzr revid: vir@tinyerp.com-20100916044220-ot7i50ampczg74zc
This commit is contained in:
Vir (Open ERP) 2010-09-16 10:12:20 +05:30
parent 417d27a0df 3b7bc55e1f
commit 2a638a5e23
8 changed files with 392 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,9 +238,17 @@
<form position="attributes">
<attribute name="string">Create User</attribute>
</form>
<xpath expr='//separator[@string="title"]' position='attributes'>
<attribute name='string'>New User</attribute>
</xpath>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">Create additional users and assign them groups that will allow them to have access to selected functionalities within the system. Click on 'Done' if you do not wish to add more users at this stage, you can always do this later.</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<group string="res_config_contents" position="replace">
<separator string="New User" colspan="4"/>
<field name="name"/>
<field name="email"/>
<field name="login"/>
@ -293,21 +301,21 @@
</record>
<record id="view_confirm_simple_view_form" model="ir.ui.view">
<field name="name">res.users.confirm.simple_view</field>
<field name="name">Configure Your Interface</field>
<field name="model">res.config.view</field>
<field name="type">form</field>
<field name="inherit_id" ref="res_config_view_base"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Choose Your Interface</attribute>
<attribute name="string">Configure Your Interface</attribute>
</form>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">We suggest simplified interface, It has less options and fields but is easier to start with OpenERP. You will be able to switch to the extended interface later from your user preferences.</attribute>
<attribute name="string">OpenERP allows you to select between a simplified and extended interface. If you use OpenERP for the first time we strongly advise you to select the simplified interface. You can always switch later from the user preferences.</attribute>
</xpath>
<xpath expr='//separator[@string="title"]' position='attributes'>
<attribute name='string'>Choose Your Interface</attribute>
<attribute name='string'>Configure Your Interface</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
@ -319,15 +327,12 @@
</group>
</group>
<xpath expr='//button[@name="action_skip"]' position='replace'/>
<xpath expr='//button[@name="action_next"]' position='attributes'>
<attribute name='string'>Set</attribute>
</xpath>
</data>
</field>
</record>
<record id="action_config_simple_view_form" model="ir.actions.act_window">
<field name="name">Select Your Interface</field>
<field name="name">Configure Your Interface</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.config.view</field>
<field name="view_type">form</field>

18
bin/addons/base/i18n/fr.po
View File

@ -8208,24 +8208,6 @@ msgstr ""
msgid "Integrity Error"
msgstr ""
#. module: base
#: code:addons/osv/osv.py:0
#, python-format
msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
msgstr "L'opération ne peut être mené, sans doute pour les raisons suivantes: \n-suppression: vous pouvez essayer de supprimer un enregistrement alors que d'autres documents de référence, il reste \n-création / mise à jour: un champ obligatoire n'est pas correctement configurée"
#. module: base
#: code:addons/osv/osv.py:0
#, python-format
msgid "\n\n[object with reference: %s - %s]"
msgstr "\n\n[Objet avec de référence: %s - %s]"
#. module: base
#: code:addons/osv/osv.py:0
#, python-format
msgid "Integrity Error"
msgstr "Défaut d'intégrité"
#~ msgid "Others Partners"
#~ msgstr "Autres partenaires"

3
bin/addons/base/ir/ir_actions.py
View File

@ -286,7 +286,8 @@ class act_window_view(osv.osv):
('form', 'Form'),
('graph', 'Graph'),
('calendar', 'Calendar'),
('gantt', 'Gantt')), string='View Type', required=True),
('gantt', 'Gantt'),
('gallery', 'Gallery')), string='View Type', required=True),
'act_window_id': fields.many2one('ir.actions.act_window', 'Action', ondelete='cascade'),
'multi': fields.boolean('On Multiple Doc.',
help="If set to true, the action will not be displayed on the right toolbar of a form view."),

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

@ -64,6 +64,7 @@ class view(osv.osv):
('calendar', 'Calendar'),
('diagram','Diagram'),
('gantt', 'Gantt'),
('gallery', 'Gallery'),
('search','Search')), 'View Type', required=True),
'arch': fields.text('View Architecture', required=True),
'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade'),

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

@ -1,360 +1,360 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_workflow_root" name="Workflow Definitions" parent="base.menu_custom" groups="base.group_extended"/>
<data>
<menuitem id="menu_workflow_root" name="Workflow Definitions" parent="base.menu_custom" groups="base.group_extended"/>
<!--
================================
Workflows
================================
-->
<!--
================================
Workflows
================================
-->
<record id="view_workflow_form" model="ir.ui.view">
<field name="name">workflow.form</field>
<field name="model">workflow</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow">
<field name="name"/>
<field name="osv"/>
<field name="on_create"/>
<separator colspan="4" string="Activities"/>
<field colspan="4" name="activities" nolabel="1"/>
</form>
</field>
</record>
<record id="view_workflow_form" model="ir.ui.view">
<field name="name">workflow.form</field>
<field name="model">workflow</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow">
<field name="name"/>
<field name="osv"/>
<field name="on_create"/>
<separator colspan="4" string="Activities"/>
<field colspan="4" name="activities" nolabel="1"/>
</form>
</field>
</record>
<record id="view_workflow_search" model="ir.ui.view">
<field name="name">workflow.search</field>
<field name="model">workflow</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow">
<field name="name"/>
<field name="osv"/>
</search>
</field>
</record>
<record id="view_workflow_search" model="ir.ui.view">
<field name="name">workflow.search</field>
<field name="model">workflow</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow">
<field name="name"/>
<field name="osv"/>
</search>
</field>
</record>
<record id="view_workflow_diagram" model="ir.ui.view">
<field name="name">workflow.diagram</field>
<field name="model">workflow</field>
<field name="type">diagram</field>
<field name="arch" type="xml">
<diagram string="Workflow Editor">
<node object="workflow.activity" shape="rectangle:subflow_id!=False" bgcolor="gray:flow_start==True;grey:flow_stop==True">
<field name="name"/>
<field name="kind"/>
<field name="action"/>
<field name="flow_start" invisible="1"/>
<field name="flow_stop" invisible="1"/>
<field name="subflow_id" invisible="1"/>
</node>
<arrow object="workflow.transition" source="act_from" destination="act_to" label="['signal','condition']">
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
</arrow>
</diagram>
</field>
</record>
<record id="view_workflow_tree" model="ir.ui.view">
<field name="name">workflow.tree</field>
<field name="model">workflow</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow">
<field name="name"/>
<field name="osv"/>
<field name="on_create"/>
</tree>
</field>
</record>
<record id="view_workflow_diagram" model="ir.ui.view">
<field name="name">workflow.diagram</field>
<field name="model">workflow</field>
<field name="type">diagram</field>
<field name="arch" type="xml">
<diagram string="Workflow Editor">
<node object="workflow.activity" shape="rectangle:subflow_id!=False" bgcolor="gray:flow_start==True;grey:flow_stop==True">
<field name="name"/>
<field name="kind"/>
<field name="action"/>
<field name="flow_start" invisible="1"/>
<field name="flow_stop" invisible="1"/>
<field name="subflow_id" invisible="1"/>
</node>
<arrow object="workflow.transition" source="act_from" destination="act_to" label="['signal','condition']">
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
</arrow>
</diagram>
</field>
</record>
<record id="view_workflow_tree" model="ir.ui.view">
<field name="name">workflow.tree</field>
<field name="model">workflow</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow">
<field name="name"/>
<field name="osv"/>
<field name="on_create"/>
</tree>
</field>
</record>
<record id="action_workflow_form" model="ir.actions.act_window">
<field name="name">Workflows</field>
<field name="res_model">workflow</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_tree"/>
<field name="view_mode">tree,form,diagram</field>
</record>
<menuitem action="action_workflow_form" id="menu_workflow" parent="base.menu_workflow_root"/>
<record id="action_workflow_form" model="ir.actions.act_window">
<field name="name">Workflows</field>
<field name="res_model">workflow</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_tree"/>
<field name="view_mode">tree,form,diagram</field>
</record>
<menuitem action="action_workflow_form" id="menu_workflow" parent="base.menu_workflow_root"/>
<!--
<!--
================================
Activities
================================
-->
-->
<record id="view_workflow_activity_form" model="ir.ui.view">
<field name="name">workflow.activity.form</field>
<field name="model">workflow.activity</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity">
<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>
<notebook colspan="4">
<page string="Properties">
<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="1" col="2">
<separator string="Actions" colspan="2"/>
<field name="action_id"/>
<field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
</group>
</group>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group col="2" colspan="2">
<field name="in_transitions" nolabel="1" height="400">
<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" height="400">
<tree string="Outgoing Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
</group>
</page>
</notebook>
</form>
</field>
</record>
<record id="view_workflow_activity_tree" model="ir.ui.view">
<field name="name">workflow.activity.tree</field>
<field name="model">workflow.activity</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Activity">
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<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="view_workflow_activity_form" model="ir.ui.view">
<field name="name">workflow.activity.form</field>
<field name="model">workflow.activity</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity">
<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>
<notebook colspan="4">
<page string="Properties">
<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="1" col="2">
<separator string="Actions" colspan="2"/>
<field name="action_id"/>
<field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
</group>
</group>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group col="2" colspan="2">
<field name="in_transitions" nolabel="1" height="400">
<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" height="400">
<tree string="Outgoing Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
</group>
</page>
</notebook>
</form>
</field>
</record>
<record id="view_workflow_activity_tree" model="ir.ui.view">
<field name="name">workflow.activity.tree</field>
<field name="model">workflow.activity</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Activity">
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<field name="flow_start"/>
<field name="flow_stop"/>
</tree>
</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"/>
<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"/>
<!--
================================
Transitions
================================
-->
<!--
================================
Transitions
================================
-->
<record id="view_workflow_transition_form" model="ir.ui.view">
<field name="name">workflow.transition.form</field>
<field name="model">workflow.transition</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field colspan="4" name="condition"/>
<field name="signal"/>
<field name="role_id"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</form>
</field>
</record>
<record id="view_workflow_transition_tree" model="ir.ui.view">
<field name="name">workflow.transition.tree</field>
<field name="model">workflow.transition</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</record>
<record id="view_workflow_transition_form" model="ir.ui.view">
<field name="name">workflow.transition.form</field>
<field name="model">workflow.transition</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field colspan="4" name="condition"/>
<field name="signal"/>
<field name="role_id"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</form>
</field>
</record>
<record id="view_workflow_transition_tree" model="ir.ui.view">
<field name="name">workflow.transition.tree</field>
<field name="model">workflow.transition</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</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="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"/>
<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"/>
<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"/>
<!--
================================
Instances
================================
-->
<!--
================================
Instances
================================
-->
<record id="view_workflow_instance_form" model="ir.ui.view">
<field name="name">workflow.instance.form</field>
<field name="model">workflow.instance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Instances">
<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>
<record id="view_workflow_instance_tree" model="ir.ui.view">
<field name="name">workflow.instance.tree</field>
<field name="model">workflow.instance</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Instances">
<field name="wkf_id"/>
<field name="uid"/>
<field name="res_id"/>
<field name="res_type"/>
<field name="state"/>
</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="view_workflow_instance_form" model="ir.ui.view">
<field name="name">workflow.instance.form</field>
<field name="model">workflow.instance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Instances">
<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>
<record id="view_workflow_instance_tree" model="ir.ui.view">
<field name="name">workflow.instance.tree</field>
<field name="model">workflow.instance</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Instances">
<field name="wkf_id"/>
<field name="uid"/>
<field name="res_id"/>
<field name="res_type"/>
<field name="state"/>
</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"/>
<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"/>
<!--
================================
Workitems
================================
-->
<!--
================================
Workitems
================================
-->
<record id="view_workflow_workitem_form" model="ir.ui.view">
<field name="name">workflow.workitem.form</field>
<field name="model">workflow.workitem</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Workitems">
<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>
<record id="view_workflow_workitem_tree" model="ir.ui.view">
<field name="name">workflow.workitem.tree</field>
<field name="model">workflow.workitem</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Workitems">
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
<field name="state"/>
</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="view_workflow_workitem_form" model="ir.ui.view">
<field name="name">workflow.workitem.form</field>
<field name="model">workflow.workitem</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Workitems">
<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>
<record id="view_workflow_workitem_tree" model="ir.ui.view">
<field name="name">workflow.workitem.tree</field>
<field name="model">workflow.workitem</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Workitems">
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
<field name="state"/>
</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"/>
<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"/>
</data>
</data>
</openerp>

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

@ -560,7 +560,7 @@ class res_config_view(osv.osv_memory):
'Interface', required=True ),
}
_defaults={
'view':lambda *args: 'simple',
'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
}
def execute(self, cr, uid, ids, context=None):

21
bin/addons/base/rng/gallery.rng Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<rng:grammar xmlns:rng="http://relaxng.org/ns/structure/1.0">
<rng:define name="any">
<rng:element>
<rng:anyName/>
<rng:zeroOrMore>
<rng:choice>
<rng:attribute>
<rng:anyName/>
</rng:attribute>
<rng:text/>
<rng:ref name="any"/>
</rng:choice>
</rng:zeroOrMore>
</rng:element>
</rng:define>
<rng:start>
<rng:ref name="any" />
</rng:start>
</rng:grammar>

18
bin/addons/base/rng/view.rng
View File

@ -308,6 +308,7 @@
<rng:ref name="overload"/>
<rng:ref name="access_rights"/>
<rng:optional><rng:attribute name="string"/></rng:optional>
<rng:optional><rng:attribute name="name"/></rng:optional>
<rng:optional><rng:attribute name="attrs"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
@ -396,6 +397,7 @@
<rng:ref name="button"/>
<rng:ref name="group"/>
<rng:ref name="graph"/>
<rng:ref name="gallery"/>
<rng:ref name="html"/>
<rng:element name="newline"><rng:empty/></rng:element>
</rng:choice>
@ -438,6 +440,7 @@
<rng:optional><rng:attribute name="required"/></rng:optional>
<rng:optional><rng:attribute name="readonly"/></rng:optional>
<rng:optional><rng:attribute name="view_mode"/></rng:optional>
<rng:optional><rng:attribute name="search_mode"/></rng:optional>
<rng:optional><rng:attribute name="widget"/></rng:optional>
<rng:optional><rng:attribute name="context"/></rng:optional>
<rng:optional><rng:attribute name="states"/></rng:optional>
@ -468,6 +471,7 @@
<rng:ref name="button"/>
<rng:ref name="group"/>
<rng:ref name="graph"/>
<rng:ref name="gallery"/>
<rng:ref name="filter"/>
<rng:ref name="notebook"/>
<rng:ref name="html"/>
@ -530,6 +534,18 @@
</rng:element>
</rng:define>
<rng:define name="gallery">
<rng:element name="gallery">
<rng:optional><rng:attribute name="string"/></rng:optional>
<rng:optional><rng:attribute name="width"/></rng:optional>
<rng:optional><rng:attribute name="height"/></rng:optional>
<rng:optional><rng:attribute name="col"/></rng:optional>
<rng:oneOrMore>
<rng:ref name="field"/>
</rng:oneOrMore>
</rng:element>
</rng:define>
<rng:define name="button">
<rng:element name="button">
<rng:ref name="overload"/>
@ -559,6 +575,7 @@
<rng:ref name="graph" />
<rng:ref name="calendar" />
<rng:ref name="gantt" />
<rng:ref name="gallery" />
<rng:ref name="xpath" />
<rng:ref name="page" />
<rng:ref name="separator"/>
@ -627,6 +644,7 @@
<rng:ref name="calendar" />
<rng:ref name="data" />
<rng:ref name="gantt" />
<rng:ref name="gallery" />
<rng:ref name="xpath" />
<rng:ref name="page" />
<rng:ref name="separator"/>