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

[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-page-sheet-improvement-atp-sales_management_pos_crm_page_sheet_improve-pja

Browse Source 
bzr revid: atp@tinyerp.com-20120615072926-o94hhqvlnvohfhq7
This commit is contained in:
Atul Patel (OpenERP)
2012-06-15 12:59:26 +05:30
parent fbdabac83e 9e36bd7a07
commit f505fe0f63
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/email_template/email_template_view.xml
+2
View File
@@ -8,6 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Templates" version="7.0">
<sheet>
<group col="4">
<field name="name" required="1"/>
<field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
@@ -98,6 +99,7 @@
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
addons/fetchmail/fetchmail_view.xml
+5 -3
View File
@@ -31,12 +31,13 @@
<button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
<field name="state" widget="statusbar"/>
</header>
<group col="4">
<sheet>
<group col="4">
<field name="name"/>
<field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
<field name="date"/>
</group>
<notebook>
</group>
<notebook>
<page string="Server &amp; Login">
<group>
<group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
@@ -67,6 +68,7 @@
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
addons/point_of_sale/point_of_sale_view.xml
+2
View File
@@ -651,11 +651,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="PoS Categories" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="parent_id"/>
<field name="sequence"/>
</group>
</sheet>
</form>
</field>
</record>
addons/resource/resource_view.xml
+2
View File
@@ -77,12 +77,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Working Time" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="manager"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<field name="attendance_ids"/>
</sheet>
</form>
</field>
</record>
addons/sale/sale_view.xml
+2
View File
@@ -412,6 +412,7 @@
<button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
</header>
<sheet>
<label for="order_id" class="oe_form_readonly_hidden"/>
<h1><field name="order_id"/></h1>
<label for="order_partner_id" class="oe_form_readonly_hidden"/>
@@ -435,6 +436,7 @@
</group>
<separator string="Notes" groups="base.group_sale_notes_subtotal"/>
<field name="notes" groups="base.group_sale_notes_subtotal"/>
</sheet>
</form>
</field>
</record>