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

[Merge]

Browse Source 
bzr revid: dbr@tinyerp.com-20120629065134-ig3b87rvp6su2gld
This commit is contained in:
DBR (OpenERP)
2012-06-29 12:21:34 +05:30
parent 6c0bdc167b e43c62e302
commit 70c2fa4345
3 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_module_record/wizard/base_module_record_data_view.xml
+13 -10
View File
@@ -7,18 +7,21 @@
<field name="model">base.module.data</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Data Recording">
<field name="check_date"/>
<newline/>
<field name="filter_cond"/>
<separator string="Choose objects to record" colspan="4"/>
<field name="objects" colspan="4" nolabel="1"/>
<group><field name="info_yaml"/></group>
<separator colspan="4"/>
<group colspan="4" col="2">
<form string="Data Recording" version="7.0">
<header>
<button icon="gtk-cancel" string="Cancel" special="cancel"/>
<button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
</group>
</header>
<sheet>
<group>
<field name="check_date"/>
<field name="filter_cond"/>
</group>
<group string="Choose objects to record">
<field name="objects" nolabel="1"/>
</group>
<group><field name="info_yaml"/></group>
</sheet>
</form>
</field>
</record>
addons/base_module_record/wizard/base_module_record_object_view.xml
+13 -10
View File
@@ -7,18 +7,21 @@
<field name="model">base.module.record</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Objects Recording">
<field name="check_date"/>
<newline/>
<field name="filter_cond"/>
<separator string="Choose objects to record" colspan="4"/>
<field name="objects" colspan="4" nolabel="1"/>
<group><field name="info_yaml"/></group>
<separator colspan="4"/>
<group colspan="4" col="2">
<form string="Objects Recording" version="7.0">
<header>
<button icon="gtk-cancel" string="Cancel" special="cancel"/>
<button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
</group>
</header>
<sheet>
<group>
<field name="check_date"/>
<field name="filter_cond"/>
</group>
<group string="Choose objects to record">
<field name="objects" nolabel="1"/>
</group>
<group><field name="info_yaml"/></group>
</sheet>
</form>
</field>
</record>
addons/process/process_view.xml
+20 -12
View File
@@ -30,13 +30,17 @@
<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>
<group>
<field name="name"/>
<field name="flow_start"/>
</group>
<group>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
</group>
<notebook colspan="4">
<page string="Properties">
<group colspan="4" col="6">
@@ -157,12 +161,16 @@
<field name="arch" type="xml">
<form string="Process Node" version="7.0">
<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>
<group>
<field name="name"/>
<field name="process_id"/>
<field name="flow_start"/>
</group>
<group>
<field name="kind"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
</group>
<notebook>
<page string="Properties">