Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-document-related-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-document-related-bde/+merge/110067
Hello Sir,
I have added sheet tag in document related modules and in process module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-document-related-bde/+merge/110067
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-document-related-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
=== modified file 'document/document_view.xml'
--- document/document_view.xml 2012-06-08 07:03:30 +0000
+++ document/document_view.xml 2012-06-13 13:20:23 +0000
@@ -7,17 +7,19 @@
<field name="model">document.storage</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Storage Media">
- <group col="4">
- <field name="name" colspan="4"/>
- <field name="type"/>
- <field name="user_id"/>
- <field name="online"/>
- <field name="readonly"/>
- </group>
- <group attrs="{'invisible':[('type','in',['db', 'db64'])]}">
- <field name="path"/>
- </group>
+ <form string="Storage Media" version="7.0">
+ <sheet layout="auto">
+ <group col="4">
+ <field name="name" colspan="4"/>
+ <field name="type"/>
+ <field name="user_id"/>
+ <field name="online"/>
+ <field name="readonly"/>
+ </group>
+ <group attrs="{'invisible':[('type','in',['db', 'db64'])]}">
+ <field name="path"/>
+ </group>
+ </sheet>
</form>
</field>
</record>
@@ -69,81 +71,83 @@
<field name="model">document.directory</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Directories" col="4">
- <group col="4">
- <field name="name"/>
- <field name="parent_id"/>
- <field name="storage_id"/>
- <field name="user_id"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
- <notebook colspan="4">
- <page string="Definition">
- <group string="Directory Type" colspan="4">
- <field name="type"/>
- </group>
- <group col="4" attrs="{'invisible': [('type','!=','ressource')]}">
- <field name="ressource_type_id" on_change="onchange_content_id(ressource_type_id)"
- attrs="{'required': [('type','=','ressource')] }"/>
- <newline/>
- <field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
- <field name="ressource_tree"/>
- <newline/>
- <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
- </group>
+ <form string="Directories" col="4" version="7.0">
+ <sheet layout="auto">
<group col="4">
- <field name="ressource_parent_type_id"/>
- <field name="ressource_id" select="2" readonly="1"/>
- </group>
- <group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}">
- <field name="resource_find_all"/>
- </group>
-
- </page>
- <page string="Generated Files" groups="base.group_no_one">
- <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
- <field name="content_ids" nolabel="1" colspan="4" >
- <form string="Contents">
- <group col="4">
+ <field name="name"/>
+ <field name="parent_id"/>
+ <field name="storage_id"/>
+ <field name="user_id"/>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ </group>
+ <notebook colspan="4">
+ <page string="Definition">
+ <group string="Directory Type" colspan="4">
+ <field name="type"/>
+ </group>
+ <group col="4" attrs="{'invisible': [('type','!=','ressource')]}">
+ <field name="ressource_type_id" on_change="onchange_content_id(ressource_type_id)"
+ attrs="{'required': [('type','=','ressource')] }"/>
+ <newline/>
+ <field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
+ <field name="ressource_tree"/>
+ <newline/>
+ <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
+ </group>
+ <group col="4">
+ <field name="ressource_parent_type_id"/>
+ <field name="ressource_id" select="2" readonly="1"/>
+ </group>
+ <group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}">
+ <field name="resource_find_all"/>
+ </group>
+
+ </page>
+ <page string="Generated Files" groups="base.group_no_one">
+ <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
+ <field name="content_ids" nolabel="1" colspan="4" >
+ <form string="Contents">
+ <group col="4">
+ <field name="name"/>
+ <field name="sequence"/>
+ <field name="prefix"/>
+ <field name="suffix"/>
+ <field name="extension"/>
+ <field name="include_name"/>
+ <separator string="PDF Report" colspan="4"/>
+ <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+ </group>
+ </form>
+ <tree string="Contents">
+ <field name="sequence" string="Seq."/>
<field name="name"/>
- <field name="sequence"/>
- <field name="prefix"/>
<field name="suffix"/>
<field name="extension"/>
- <field name="include_name"/>
- <separator string="PDF Report" colspan="4"/>
- <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
- </group>
- </form>
- <tree string="Contents">
- <field name="sequence" string="Seq."/>
- <field name="name"/>
- <field name="suffix"/>
- <field name="extension"/>
- </tree>
- </field>
- </page>
- <page string="Dynamic context" groups="base.group_no_one">
- <label colspan="4" string="Define words in the context, for all child directories and files" />
- <field name="dctx_ids" nolabel="1" colspan="4">
- <tree string="Fields" editable="bottom">
- <field name="field"/>
- <field name="expr"/>
- </tree>
- <form string="Fields">
- <group col="4">
+ </tree>
+ </field>
+ </page>
+ <page string="Dynamic context" groups="base.group_no_one">
+ <label colspan="4" string="Define words in the context, for all child directories and files" />
+ <field name="dctx_ids" nolabel="1" colspan="4">
+ <tree string="Fields" editable="bottom">
<field name="field"/>
<field name="expr"/>
- </group>
- </form>
- </field>
- </page>
- <page string="Security">
- <label colspan="4" string="Only members of these groups will have access to this directory and its files." />
- <label colspan="4" string="These groups, however, do NOT apply to children directories, which must define their own groups." />
- <field name="group_ids" colspan="4" nolabel="1"/>
- </page>
- </notebook>
+ </tree>
+ <form string="Fields">
+ <group col="4">
+ <field name="field"/>
+ <field name="expr"/>
+ </group>
+ </form>
+ </field>
+ </page>
+ <page string="Security">
+ <label colspan="4" string="Only members of these groups will have access to this directory and its files." />
+ <label colspan="4" string="These groups, however, do NOT apply to children directories, which must define their own groups." />
+ <field name="group_ids" colspan="4" nolabel="1"/>
+ </page>
+ </notebook>
+ </sheet>
</form>
</field>
</record>
@@ -238,47 +242,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>
+ <form string="Documents" version="7.0">
+ <sheet layout="auto">
+ <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>
- <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>
+ <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>
=== modified file 'document_webdav/webdav_view.xml'
--- document_webdav/webdav_view.xml 2012-06-11 16:10:14 +0000
+++ document_webdav/webdav_view.xml 2012-06-13 13:20:23 +0000
@@ -8,13 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Properties" version="7.0">
- <group col="4">
- <field name="namespace"/>
- <field name="name"/>
- <field name="dir_id" />
- <field name="do_subst" />
- </group>
- <field name="value" colspan="4" />
+ <sheet layout="auto">
+ <group col="4">
+ <field name="namespace"/>
+ <field name="name"/>
+ <field name="dir_id" />
+ <field name="do_subst" />
+ </group>
+ <field name="value" colspan="4" />
+ </sheet>
</form>
</field>
</record>
@@ -108,14 +110,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Properties" version="7.0">
- <group col="4">
- <field name="namespace"/>
- <field name="name"/>
- <newline />
- <field name="file_id" />
- <field name="do_subst" />
- </group>
- <field name="value"/>
+ <sheet layout="auto">
+ <group col="4">
+ <field name="namespace"/>
+ <field name="name"/>
+ <newline />
+ <field name="file_id" />
+ <field name="do_subst" />
+ </group>
+ <field name="value"/>
+ </sheet>
</form>
</field>
</record>
=== modified file 'process/process_view.xml'
--- process/process_view.xml 2012-06-09 15:19:20 +0000
+++ process/process_view.xml 2012-06-13 13:20:23 +0000
@@ -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 layout="auto">
+ <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"/>
- <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"/>
+ </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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
