[IMP] usability: form views
bzr revid: qdp-launchpad@openerp.com-20120702163725-14j93jkw3qtl8368
This commit is contained in:
parent
2d3db62f66
commit
89f6e16675
|
@ -51,12 +51,12 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_category_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='Accounting']" position="inside">
|
||||
<group string="Accounting Properties">
|
||||
<data>
|
||||
<xpath expr="/form/sheet//group[@name='account_property']" position="inside">
|
||||
<field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -45,10 +45,10 @@
|
|||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<group string="Delagated From">
|
||||
<group string="Delegated From">
|
||||
<field name="parent_ids" readonly="1" nolabel="1" />
|
||||
</group>
|
||||
<group string="Delagated To" >
|
||||
<group string="Delegated To" >
|
||||
<field name="child_ids" readonly="1" nolabel="1" />
|
||||
</group>
|
||||
</group>
|
||||
|
|
|
@ -74,10 +74,10 @@
|
|||
</header>
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="service" colspan="2" readonly="1"/>
|
||||
<field name="collection" colspan="2" invisible="1" />
|
||||
<field name="calendar" colspan="2" domain="[('collection_id','=', collection)]" readonly="1"/>
|
||||
<field name="device" colspan="2"/>
|
||||
<field name="service" readonly="1"/>
|
||||
<field name="collection" invisible="1" />
|
||||
<field name="calendar" domain="[('collection_id','=', collection)]" readonly="1"/>
|
||||
<field name="device"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
|
@ -50,9 +50,9 @@
|
|||
</div>
|
||||
<group>
|
||||
<h2>
|
||||
<field name="date" string="Start Date" required="1"
|
||||
class="oe_edit_only oe_inline"/>
|
||||
<label string="at" class="oe_edit_only oe_inline"/> <field name="location" class="oe_edit_only oe_inline" />
|
||||
<label for="date" string="Starting at"/>
|
||||
<field name="date" required="1" class="oe_inline"/>
|
||||
<label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
|
||||
</h2>
|
||||
</group>
|
||||
<group>
|
||||
|
@ -60,11 +60,11 @@
|
|||
<label for="duration" string="Duration" />
|
||||
<field name="duration" widget="float_time"
|
||||
on_change="onchange_dates(date,duration,False,allday)"
|
||||
class="oe_inline"/>
|
||||
class="oe_inline"/> (
|
||||
<field name="date_deadline"
|
||||
string="End Date" required="1"
|
||||
on_change="onchange_dates(date,False,date_deadline)"
|
||||
class="oe_inline"/>
|
||||
class="oe_inline"/> )
|
||||
</h2>
|
||||
</group>
|
||||
<group colspan="4" col="4">
|
||||
|
|
|
@ -100,7 +100,7 @@
|
|||
<button type="action" string="Schedule a Call"
|
||||
name="%(crm.crm_case_categ_phone_create_partner)d"
|
||||
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
|
||||
<button type="action" string="Opportunity"
|
||||
<button type="action" string="Opportunities"
|
||||
name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
|
|
|
@ -239,10 +239,13 @@
|
|||
<notebook position="inside">
|
||||
<page string="Membership">
|
||||
<group>
|
||||
<group col="3">
|
||||
<group>
|
||||
<field name="free_member"/>
|
||||
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}"/>
|
||||
<field name="membership_state"/>
|
||||
<label for="membership_state"/>
|
||||
<div>
|
||||
<field name="membership_state" class="oe_inline"/>
|
||||
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
|
||||
|
|
|
@ -312,14 +312,26 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Product Categories" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="sequence" invisible="1"/>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<group name="Accounting">
|
||||
</group>
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<field name="name"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="parent_id"/>
|
||||
</group>
|
||||
</group>
|
||||
<group name="basic">
|
||||
<group name="account_property" string="Account Properties"/>
|
||||
<group name="account_stock_property" string="Account Stock Properties"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -153,22 +153,21 @@
|
|||
</header>
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name"/></h1>
|
||||
<label for="project_id" class="oe_edit_only"/>
|
||||
<h2>
|
||||
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
|
||||
</h2>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name"/></h1>
|
||||
<label for="project_id" class="oe_edit_only"/>
|
||||
<h2>
|
||||
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
|
||||
</h2>
|
||||
</div>
|
||||
<group>
|
||||
<label for="date_start" string="Duration"/>
|
||||
<div>
|
||||
<field name="date_start" nolabel="1" class="oe_inline"/> -
|
||||
<field name="date_end" nolabel="1" class="oe_inline"/>
|
||||
<div>
|
||||
<field name="duration" nolabel="1" class="oe_inline"/>
|
||||
<field name="product_uom" nolabel="1" class="oe_inline"/>
|
||||
<field name="duration" class="oe_inline"/>
|
||||
<field name="product_uom" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
|
||||
</div>
|
||||
</group>
|
||||
<notebook>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name"/></h1>
|
||||
<label for="warehouse_id" class="oe_edit_only"/>
|
||||
<h2><field name="warehouse_id" required="1" widget="selection"/></h2>
|
||||
<h2><field name="warehouse_id" required="1"/></h2>
|
||||
<group>
|
||||
<group>
|
||||
<field name="payment_default_id"/>
|
||||
|
|
|
@ -21,14 +21,14 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_category_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='Accounting']" position="inside">
|
||||
<form position="inside" version="7.0">
|
||||
<group string="Accounting Stock Properties">
|
||||
<field name="property_stock_account_input_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_account_output_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_valuation_account_id" domain="[('type','<>','view'), ('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_journal"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@
|
|||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Content">
|
||||
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki" placeholder="Wiki Content"/>
|
||||
<field name="text_area" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<group col="2" colspan="2" groups="base.group_no_one">
|
||||
|
|
Loading…
Reference in New Issue