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

[IMP] form views: remove sheets in config forms

Browse Source 
(Closes #850)
This commit is contained in:
tpa-odoo
2014-08-13 09:28:24 +02:00
committed by Richard Mathot
parent e081fd0df4
commit cf9230d1ff
14 changed files with 252 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_view.xml
+14 -16
View File
@@ -100,24 +100,22 @@
<button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
<field name="state" widget="statusbar" nolabel="1"/>
</header>
<sheet>
<group>
<group>
<group>
<field name="name"/>
<field name="fiscalyear_id" widget="selection"/>
<label for="date_start" string="Duration"/>
<div>
<field name="date_start" class="oe_inline" nolabel="1"/> -
<field name="date_stop" nolabel="1" class="oe_inline"/>
</div>
</group>
<group>
<field name="code"/>
<field name="special"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<field name="name"/>
<field name="fiscalyear_id" widget="selection"/>
<label for="date_start" string="Duration"/>
<div>
<field name="date_start" class="oe_inline" nolabel="1"/> -
<field name="date_stop" nolabel="1" class="oe_inline"/>
</div>
</group>
</sheet>
<group>
<field name="code"/>
<field name="special"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
</form>
</field>
</record>
addons/crm/crm_view.xml
+3 -3
View File
@@ -295,14 +295,14 @@
<field name="exclusif"/>
</group>
<notebook>
<page string="Sales Purchase">
<page string="Sales Purchase" name="sale_purchase">
<group>
<field name="sales_purchase_active"/>
</group>
<separator string="Segmentation Test"/>
<separator string="Segmentation Test Criteria"/>
<field name="segmentation_line" widget="one2many_list"/>
</page>
<page string="Description">
<page string="Description" name="description">
<field name="description"/>
</page>
</notebook>
addons/crm_profiling/crm_profiling_view.xml
+30 -37
View File
@@ -143,49 +143,42 @@
<!-- CRM Segmentation Form view -->
<record model="ir.ui.view" id="crm.crm_segmentation-view">
<record model="ir.ui.view" id="crm_segmentation_profiling_view">
<field name="name">crm.segmentation.form</field>
<field name="model">crm.segmentation</field>
<field name="inherit_id" ref="crm.crm_segmentation-view"/>
<field name="arch" type="xml">
<form string="Partner Segmentation">
<group col="4">
<notebook>
<page string="Segmentation">
<separator string="Segmentation Description" colspan="4"/>
<page name="sale_purchase" position="before">
<page string="Segmentation">
<group col="4">
<field name="name"/>
<field name="exclusif"/>
<newline/>
<field name="categ_id" colspan="2"/>
<newline/>
<field name="description" colspan="4"/>
<field name="state"/>
<group col="3" colspan="2">
<button name="process_start"
states="not running" string="Compute Segmentation" type="object"
icon="gtk-apply" />
<button name="process_stop" states="running"
string="Stop Process" type="object" icon="gtk-stop" />
<button name="process_continue" states="running"
string="Continue Process" type="object" icon="gtk-go-forward" />
<field name="categ_id"/>
</group>
<separator string="Segmentation Description"/>
<field name="description" nolabel="1"/>
</page>
</page>
<page name="description" position="replace">
<page string="Profiling">
<group>
<group>
<field name="profiling_active"/>
<separator string="Profiling Options" colspan="4"/>
<field name="parent_id"/>
</group>
</page>
<page string="Sales Purchase">
<field name="sales_purchase_active"/>
<separator string="Segmentation Test" colspan="4"/>
<field name="segmentation_line" widget="one2many_list" colspan="4"/>
</page>
<page string="Profiling">
<field name="profiling_active" colspan="2"/>
<separator string="Profiling Options" colspan="4"/>
<field name="parent_id" colspan="2"/><newline/>
<separator string="Included Answers :" colspan="2" />
<separator string="Excluded Answers :" colspan="2"/>
<field name="answer_yes" nolabel="1" colspan="2"/>
<field name="answer_no" nolabel="1" colspan="2"/>
</page>
</notebook>
</group>
</form>
<newline/>
<group>
<separator string="Included Answers"/>
<field name="answer_yes" nolabel="1" colspan="2"/>
</group>
<group>
<separator string="Excluded Answers"/>
<field name="answer_no" nolabel="1" colspan="2"/>
</group>
</group>
</page>
</page>
</field>
</record>
addons/fleet/fleet_view.xml
+39 -43
View File
@@ -6,40 +6,38 @@
<field name="model">fleet.vehicle.model</field>
<field name="arch" type="xml">
<form string="Model">
<sheet>
<field name="image_medium" widget='image' class="oe_left oe_avatar"/>
<div class="oe_title">
<label for="modelname" class="oe_edit_only"/>
<h1>
<field name="modelname" />
</h1>
<label for="brand_id" class="oe_edit_only"/>
<h2>
<field name="brand_id" on_change="on_change_brand(brand_id)"/>
</h2>
</div>
<notebook>
<page string="Vendors">
<field name="vendors" widget="many2many_kanban">
<kanban quick_create="false" create="true">
<field name="name"/>
<templates>
<t t-name="kanban-box">
<div style="position: relative">
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
<div class="oe_module_vignette">
<div class="oe_module_desc">
<field name="name"/>
</div>
<field name="image_medium" widget='image' class="oe_left oe_avatar"/>
<div class="oe_title">
<label for="modelname" class="oe_edit_only"/>
<h1>
<field name="modelname" />
</h1>
<label for="brand_id" class="oe_edit_only"/>
<h2>
<field name="brand_id" on_change="on_change_brand(brand_id)"/>
</h2>
</div>
<notebook>
<page string="Vendors">
<field name="vendors" widget="many2many_kanban">
<kanban quick_create="false" create="true">
<field name="name"/>
<templates>
<t t-name="kanban-box">
<div style="position: relative">
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
<div class="oe_module_vignette">
<div class="oe_module_desc">
<field name="name"/>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</page>
</notebook>
</sheet>
</div>
</t>
</templates>
</kanban>
</field>
</page>
</notebook>
</form>
</field>
</record>
@@ -98,17 +96,15 @@
<field name="model">fleet.vehicle.model.brand</field>
<field name="arch" type="xml">
<form string="Model Make">
<sheet>
<group>
<div>
<field name="image_medium" widget="image" class="oe_left oe_avatar"/>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline" />
</h1>
</div>
</group>
</sheet>
<group>
<div>
<field name="image_medium" widget="image" class="oe_left oe_avatar"/>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline" />
</h1>
</div>
</group>
</form>
</field>
</record>
addons/hr_holidays/hr_holidays_view.xml
+12 -14
View File
@@ -441,26 +441,24 @@
<field name="model">hr.holidays.status</field>
<field name="arch" type="xml">
<form string="Leave Type">
<sheet string="Leave Type">
<group col="4">
<field name="name"/>
<field name="categ_id"/>
</group>
<notebook>
<page string="Details">
<group>
<group name="selection" string="Validation">
<field name="double_validation"/>
<field name="limit"/>
</group>
<group name="second" string="Misc">
<field name="color_name"/>
<field name="active"/>
</group>
</group>
</page>
<page string="Details">
<group>
<group name="selection" string="Validation">
<field name="double_validation"/>
<field name="limit"/>
</group>
<group name="second" string="Misc">
<field name="color_name"/>
<field name="active"/>
</group>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
addons/hr_recruitment/hr_recruitment_view.xml
-6
View File
@@ -525,7 +525,6 @@
<field name="model">hr.recruitment.stage</field>
<field name="arch" type="xml">
<form string="Stage">
<sheet>
<group string="Stage Definition">
<group>
<field name="name"/>
@@ -539,7 +538,6 @@
</group>
<separator string="Requirements"/>
<field name="requirements"/>
</sheet>
</form>
</field>
</record>
@@ -585,12 +583,10 @@
<field name="model">hr.recruitment.degree</field>
<field name="arch" type="xml">
<form string="Degree">
<sheet>
<group>
<field name="name"/>
<field name="sequence" groups="base.group_no_one"/>
</group>
</sheet>
</form>
</field>
</record>
@@ -625,11 +621,9 @@
<field name="model">hr.recruitment.source</field>
<field name="arch" type="xml">
<form string="Sources of Applicants">
<sheet>
<group>
<field name="name"/>
</group>
</sheet>
</form>
</field>
</record>
addons/lunch/lunch_view.xml
+33 -40
View File
@@ -293,11 +293,9 @@
<field name="model">lunch.product.category</field>
<field name="arch" type="xml">
<form string="Products Form">
<sheet>
<group>
<field name='name' string="Product Category: "/>
</group>
</sheet>
</form>
</field>
</record>
@@ -425,20 +423,18 @@
<form string="Products Form">
<header>
</header>
<sheet>
<group>
<group>
<group>
<field name='name'/>
<field name='category_id'/>
</group>
<group>
<field name='supplier'/>
<field name='price'/>
</group>
<field name='name'/>
<field name='category_id'/>
</group>
<label for='description'/>
<field name='description'/>
</sheet>
<group>
<field name='supplier'/>
<field name='price'/>
</group>
</group>
<label for='description'/>
<field name='description'/>
</form>
</field>
</record>
@@ -462,35 +458,32 @@
<field name="model">lunch.alert</field>
<field name="arch" type="xml">
<form string="alert tree">
<sheet>
<group string="Schedule Date">
<group>
<field name="alter_type" class="oe_inline"/>
<field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
</group>
<group string="Schedule Date">
<group>
<field name="alter_type" class="oe_inline"/>
<field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
</group>
<group attrs="{'invisible': [('alter_type','!=','week')]}">
<group>
<field name="monday"/>
<field name="tuesday"/>
<field name="wednesday"/>
<field name="thursday"/>
</group>
<group>
<field name="friday"/>
<field name="saturday"/>
<field name="sunday"/>
</group>
</group>
<group attrs="{'invisible': [('alter_type','!=','week')]}">
<group>
<field name="monday"/>
<field name="tuesday"/>
<field name="wednesday"/>
<field name="thursday"/>
</group>
<group string="Schedule Hour">
<field name='active_from' widget='float_time'/>
<field name='active_to' widget='float_time'/>
<group>
<field name="friday"/>
<field name="saturday"/>
<field name="sunday"/>
</group>
<group string='Message'>
<field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/>
</group>
</sheet>
</group>
<group string="Schedule Hour">
<field name='active_from' widget='float_time'/>
<field name='active_to' widget='float_time'/>
</group>
<group string='Message'>
<field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/>
</group>
</form>
</field>
</record>
addons/membership/membership_view.xml
+29 -31
View File
@@ -46,39 +46,37 @@
<field name="priority">50</field>
<field name="arch" type="xml">
<form string="Membership products">
<sheet>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<group>
<group>
<group>
<field name="default_code"/>
<field name="categ_id"/>
<field name="membership" invisible="1"/>
<field name="company_id"
groups="base.group_multi_company"
widget="selection"/>
<field name="active"/>
</group>
<group>
<label for="membership_date_from" string="Membership Duration"/>
<div>
<field name="membership_date_from" required="1" class="oe_inline"/> -
<field name="membership_date_to" required="1" class="oe_inline"/>
</div>
<field name="list_price" string="Membership Fee"/>
<field
name="property_account_income"
domain="[('type', '!=', 'view')]"/>
<field name="taxes_id" widget="many2many_tags" string="Taxes"/>
</group>
<field name="default_code"/>
<field name="categ_id"/>
<field name="membership" invisible="1"/>
<field name="company_id"
groups="base.group_multi_company"
widget="selection"/>
<field name="active"/>
</group>
<label for="description"/>
<field colspan="4" name="description" placeholder="Add a description..."/>
<label for="description_sale"/>
<field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
</sheet>
<group>
<label for="membership_date_from" string="Membership Duration"/>
<div>
<field name="membership_date_from" required="1" class="oe_inline"/> -
<field name="membership_date_to" required="1" class="oe_inline"/>
</div>
<field name="list_price" string="Membership Fee"/>
<field
name="property_account_income"
domain="[('type', '!=', 'view')]"/>
<field name="taxes_id" widget="many2many_tags" string="Taxes"/>
</group>
</group>
<label for="description"/>
<field colspan="4" name="description" placeholder="Add a description..."/>
<label for="description_sale"/>
<field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
</form>
</field>
</record>
addons/mrp/mrp_view.xml
+9 -8
View File
@@ -27,10 +27,11 @@
<field name="model">mrp.property.group</field>
<field name="arch" type="xml">
<form string="Properties categories">
<label for="name"/>
<field name="name"/>
<label for="description"/>
<field name="description"/>
<group>
<field name="name"/>
</group>
<separator string="Description"/>
<field name="description" nolabel="1"/>
</form>
</field>
</record>
@@ -84,8 +85,8 @@
<field name="group_id"/>
<field name="composition"/>
</group>
<label for="description"/>
<field name="description"/>
<separator string="Description"/>
<field name="description" nolabel="1"/>
</form>
</field>
</record>
@@ -198,8 +199,8 @@
<field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
</group>
</group>
<label for="note"/>
<field name="note"/>
<separator string="Description"/>
<field name="note" nolabel="1"/>
</page>
</notebook>
</form>
addons/point_of_sale/point_of_sale_view.xml
+50 -51
View File
@@ -628,59 +628,57 @@
</div>
</header>
<sheet>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<group col="4">
<field name="picking_type_id" widget="selection" groups="stock.group_locations"
on_change="onchange_picking_type_id(picking_type_id)"/>
<field name="stock_location_id" groups="stock.group_locations"/>
<field name="pricelist_id" groups="product.group_sale_pricelist"/>
<field name="currency_id" invisible="1"/>
<field name="journal_id" widget="selection"/>
<field name="group_by" groups="account.group_account_user"/>
<field name="sequence_id" readonly="1" groups="base.group_no_one"/>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<group col="4">
<field name="picking_type_id" widget="selection" groups="stock.group_locations"
on_change="onchange_picking_type_id(picking_type_id)"/>
<field name="stock_location_id" groups="stock.group_locations"/>
<field name="pricelist_id" groups="product.group_sale_pricelist"/>
<field name="currency_id" invisible="1"/>
<field name="journal_id" widget="selection"/>
<field name="group_by" groups="account.group_account_user"/>
<field name="sequence_id" readonly="1" groups="base.group_no_one"/>
</group>
<separator string="Available Payment Methods" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1">
<tree string="Journals">
<field name="code" />
<field name="name" />
<field name="type" />
<field name="cash_control" />
</tree>
</field>
<group string="Features" >
<group>
<field name="iface_vkeyboard" />
<field name="iface_invoicing" />
</group>
<separator string="Available Payment Methods" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1">
<tree string="Journals">
<field name="code" />
<field name="name" />
<field name="type" />
<field name="cash_control" />
</tree>
</field>
<group string="Features" >
<group>
<field name="iface_vkeyboard" />
<field name="iface_invoicing" />
</group>
<group>
<field name="iface_big_scrollbars" />
</group>
<group>
<field name="iface_big_scrollbars" />
</group>
<group string="Hardware Proxy" >
<field name="proxy_ip" />
<field name="iface_print_via_proxy" />
<field name="iface_scan_via_proxy" />
<field name="iface_electronic_scale" />
<field name="iface_cashdrawer" />
</group>
<group string="Receipt" >
<field name="receipt_header" placeholder="A custom receipt header message"/>
<field name="receipt_footer" placeholder="A custom receipt header footage"/>
</group>
<group string="Barcode Types" col="4">
<field name="barcode_product" />
<field name="barcode_cashier" />
<field name="barcode_customer" />
<field name="barcode_weight" />
<field name="barcode_discount" />
<field name="barcode_price" />
</group>
</sheet>
</group>
<group string="Hardware Proxy" >
<field name="proxy_ip" />
<field name="iface_print_via_proxy" />
<field name="iface_scan_via_proxy" />
<field name="iface_electronic_scale" />
<field name="iface_cashdrawer" />
</group>
<group string="Receipt" >
<field name="receipt_header" placeholder="A custom receipt header message"/>
<field name="receipt_footer" placeholder="A custom receipt header footage"/>
</group>
<group string="Barcode Types" col="4">
<field name="barcode_product" />
<field name="barcode_cashier" />
<field name="barcode_customer" />
<field name="barcode_weight" />
<field name="barcode_discount" />
<field name="barcode_price" />
</group>
</form>
</field>
@@ -974,3 +972,4 @@
</data>
</openerp>
addons/procurement/procurement_view.xml
+15 -16
View File
@@ -212,25 +212,24 @@
<field eval="10" name="priority"/>
<field name="arch" type="xml">
<form string="Pull Rule">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
<group>
<group string="General Information">
<field name="action"/>
<field name="sequence"/>
<field name="active"/>
</group>
<group name="propagation_group" string="Propagation Options" groups="base.group_no_one">
<field name="group_propagation_option"/>
<field name="group_id" attrs="{'invisible': [('group_propagation_option', '!=', 'fixed')], 'required': [('group_propagation_option', '=', 'fixed')]}"/>
</group>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
<group>
<group string="General Information">
<field name="action"/>
<field name="sequence"/>
<field name="active"/>
</group>
</sheet>
<group name="propagation_group" string="Propagation Options" groups="base.group_no_one">
<field name="group_propagation_option"/>
<field name="group_id" attrs="{'invisible': [('group_propagation_option', '!=', 'fixed')], 'required': [('group_propagation_option', '=', 'fixed')]}"/>
</group>
</group>
</form>
</field>
</record>
</data>
</openerp>
addons/product/product_view.xml
+11 -13
View File
@@ -466,20 +466,18 @@
<field name="model">product.category</field>
<field name="arch" type="xml">
<form string="Product Categories">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
</div>
<group>
<group name="parent" col="4">
<field name="parent_id"/>
<field name="type"/>
</group>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
</div>
<group>
<group name="parent" col="4">
<field name="parent_id"/>
<field name="type"/>
</group>
</sheet>
</group>
</form>
</field>
</record>
addons/resource/resource_view.xml
+7 -9
View File
@@ -59,15 +59,13 @@
<field name="model">resource.calendar</field>
<field name="arch" type="xml">
<form string="Working Time">
<sheet>
<group>
<field name="name"/>
<field name="manager"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<field name="attendance_ids"/>
<field name="leave_ids"/>
</sheet>
<group>
<field name="name"/>
<field name="manager"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<field name="attendance_ids"/>
<field name="leave_ids"/>
</form>
</field>
</record>
openerp/addons/base/res/res_bank_view.xml
-2
View File
@@ -7,7 +7,6 @@
<field name="model">res.bank</field>
<field name="arch" type="xml">
<form string="Bank">
<sheet>
<group col="4">
<field name="name"/>
<field name="bic"/>
@@ -33,7 +32,6 @@
<field name="active"/>
</group>
</group>
</sheet>
</form>
</field>
</record>