diff options
| author | Atul Patel (OpenERP) <atp@tinyerp.com> | 2012-06-15 12:59:26 +0530 |
|---|---|---|
| committer | Atul Patel (OpenERP) <atp@tinyerp.com> | 2012-06-15 12:59:26 +0530 |
| commit | f505fe0f63c19a1d96f95af37b115e41b4d3e15c (patch) | |
| tree | 46452504130007f336a7560735b8961bf638212f | |
| parent | fbdabac83ed6bc4d25d54ff8acb79fd5596aeae3 (diff) | |
| parent | 9e36bd7a07aef611307236fac367e03e0ca1f614 (diff) | |
[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-page-sheet-improvement-atp-sales_management_pos_crm_page_sheet_improve-pja
bzr revid: atp@tinyerp.com-20120615072926-o94hhqvlnvohfhq7
| -rw-r--r-- | addons/email_template/email_template_view.xml | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 8 | ||||
| -rw-r--r-- | addons/point_of_sale/point_of_sale_view.xml | 2 | ||||
| -rw-r--r-- | addons/resource/resource_view.xml | 2 | ||||
| -rw-r--r-- | addons/sale/sale_view.xml | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 1403721af53..7bb86132af9 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -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> diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index d19fb4c4ca1..7c89babf3da 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -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 & Login"> <group> <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information"> @@ -67,6 +68,7 @@ </group> </page> </notebook> + </sheet> </form> </field> </record> diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index ab68e12ae41..33ae06d53d5 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -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> diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 5f17c2346ab..4da1a465c42 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -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> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 9688fb69802..59b5f65dca2 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -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> |