[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-document-related-bde

bzr revid: atp@tinyerp.com-20120614062743-xan926yrh7g74twg
This commit is contained in:
Atul Patel (OpenERP) 2012-06-14 11:57:43 +05:30
commit 20aa932bbe
3 changed files with 187 additions and 179 deletions

View File

@ -69,7 +69,7 @@
<field name="model">document.directory</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Directories" col="4">
<form string="Directories" col="4" version="7.0">
<group col="4">
<field name="name"/>
<field name="parent_id"/>
@ -238,47 +238,49 @@
<field name="priority" eval="1"/>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Documents">
<group col="4">
<field name="name"/>
<field name="parent_id"/>
<field name="user_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
<page string="Attachment">
<group>
<group string="Data">
<field name="type"/>
<newline />
<field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
</group>
<group>
<field name="res_id" invisible="True"/>
<field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
<field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
<separator string="Related to" colspan="2"/>
<field name="partner_id"/>
</group>
<group groups="base.group_no_one" string="Created">
<field name="create_uid" readonly="1"/>
<field name="create_date" readonly="1"/>
</group>
<group groups="base.group_no_one" string="Modified">
<field name="write_uid" readonly="1"/>
<field name="write_date" readonly="1"/>
</group>
<form string="Documents" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="parent_id"/>
<field name="user_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</page>
<page string="Indexed Content - experimental" groups="base.group_no_one">
<field name="index_content"/>
</page>
<page string="Notes">
<field name="description"/>
</page>
</notebook>
<notebook colspan="4">
<page string="Attachment">
<group>
<group string="Data">
<field name="type"/>
<newline />
<field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
</group>
<group>
<field name="res_id" invisible="True"/>
<field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
<field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
<separator string="Related to" colspan="2"/>
<field name="partner_id"/>
</group>
<group groups="base.group_no_one" string="Created">
<field name="create_uid" readonly="1"/>
<field name="create_date" readonly="1"/>
</group>
<group groups="base.group_no_one" string="Modified">
<field name="write_uid" readonly="1"/>
<field name="write_date" readonly="1"/>
</group>
</group>
</page>
<page string="Indexed Content - experimental" groups="base.group_no_one">
<field name="index_content"/>
</page>
<page string="Notes">
<field name="description"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>

View File

@ -7,7 +7,7 @@
<field name="model">document.webdav.dir.property</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Properties" version="7.0">
<form string="Properties">
<group col="4">
<field name="namespace"/>
<field name="name"/>
@ -107,7 +107,7 @@
<field name="model">document.webdav.file.property</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Properties" version="7.0">
<form string="Properties">
<group col="4">
<field name="namespace"/>
<field name="name"/>

View File

@ -14,76 +14,78 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Process" version="7.0">
<group col="4">
<field name="name"/>
<field name="model_id"/>
<field name="active"/>
</group>
<notebook colspan="4">
<page string="Nodes">
<field name="node_ids" colspan="4" nolabel="1">
<tree string="Process Nodes">
<field name="name"/>
<field name="model_id"/>
<field name="kind"/>
<field name="flow_start"/>
</tree>
<form string="Process Node" version="7.0">
<group colspan="4" col="4">
<sheet>
<group col="4">
<field name="name"/>
<field name="model_id"/>
<field name="active"/>
</group>
<notebook colspan="4">
<page string="Nodes">
<field name="node_ids" colspan="4" nolabel="1">
<tree string="Process Nodes">
<field name="name"/>
<field name="flow_start"/>
<field name="model_id"/>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
<notebook colspan="4">
<page string="Properties">
<group colspan="4" col="6">
<field name="model_id"/>
<field name="menu_id"/>
<field name="help_url" widget="url"/>
</group>
<separator string="Conditions" colspan="4"/>
<field name="model_states"/>
<field name="condition_ids" nolabel="1" colspan="4">
<tree string="Other Conditions" editable="top">
<field name="name"/>
<field name="flow_start"/>
</tree>
<form string="Process Node" version="7.0">
<group colspan="4" col="4">
<field name="name"/>
<field name="flow_start"/>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
<notebook colspan="4">
<page string="Properties">
<group colspan="4" col="6">
<field name="model_id"/>
<field name="model_states"/>
</tree>
</field>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group colspan="2" col="2">
<field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="name"/>
<field name="source_node_id"/>
</tree>
</field>
</group>
<group colspan="2" col="2">
<field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
</field>
</group>
</group>
</page>
<page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
</form>
</field>
</page>
<page string="Notes">
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
<field name="menu_id"/>
<field name="help_url" widget="url"/>
</group>
<separator string="Conditions" colspan="4"/>
<field name="model_states"/>
<field name="condition_ids" nolabel="1" colspan="4">
<tree string="Other Conditions" editable="top">
<field name="name"/>
<field name="model_id"/>
<field name="model_states"/>
</tree>
</field>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group colspan="2" col="2">
<field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="name"/>
<field name="source_node_id"/>
</tree>
</field>
</group>
<group colspan="2" col="2">
<field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
</field>
</group>
</group>
</page>
<page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
</form>
</field>
</page>
<page string="Notes">
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -153,47 +155,49 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Process Node" version="7.0">
<group colspan="4" col="6">
<field name="name"/>
<field name="process_id"/>
<field name="flow_start"/>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
<notebook>
<page string="Properties">
<group col="4">
<field name="model_id"/>
<field name="menu_id"/>
<field name="help_url" widget="url"/>
<field name="model_states"/>
</group>
<field name="condition_ids">
<tree string="Other Conditions" editable="bottom">
<field name="name"/>
<sheet layout="auto">
<group colspan="4" col="6">
<field name="name"/>
<field name="process_id"/>
<field name="flow_start"/>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
<notebook>
<page string="Properties">
<group col="4">
<field name="model_id"/>
<field name="menu_id"/>
<field name="help_url" widget="url"/>
<field name="model_states"/>
</tree>
</field>
</page>
<page string="Transitions">
<field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="name"/>
<field name="source_node_id"/>
</tree>
</field>
<field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
</field>
</page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
</group>
<field name="condition_ids">
<tree string="Other Conditions" editable="bottom">
<field name="name"/>
<field name="model_id"/>
<field name="model_states"/>
</tree>
</field>
</page>
<page string="Transitions">
<field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="name"/>
<field name="source_node_id"/>
</tree>
</field>
<field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
</field>
</page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -252,38 +256,40 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Process Transition" version="7.0">
<group col="4">
<field name="name"/>
<field name="source_node_id"/>
<field name="target_node_id"/>
</group>
<notebook>
<page string="Actions">
<field name="action_ids">
<tree string="Actions">
<field name="name"/>
<field name="state"/>
<field name="action"/>
</tree>
<form string="Actions" version="7.0">
<group col="4">
<field name="name" colspan="4"/>
<sheet layout="auto">
<group col="4">
<field name="name"/>
<field name="source_node_id"/>
<field name="target_node_id"/>
</group>
<notebook>
<page string="Actions">
<field name="action_ids">
<tree string="Actions">
<field name="name"/>
<field name="state"/>
<field name="action"/>
</group>
</form>
</field>
</page>
<page string="Workflow Transitions">
<field name="transition_ids"/>
</page>
<page string="Associated Groups">
<field name="group_ids"/>
</page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
</tree>
<form string="Actions" version="7.0">
<group col="4">
<field name="name" colspan="4"/>
<field name="state"/>
<field name="action"/>
</group>
</form>
</field>
</page>
<page string="Workflow Transitions">
<field name="transition_ids"/>
</page>
<page string="Associated Groups">
<field name="group_ids"/>
</page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>