odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] Review the form views 

bzr revid: stw@openerp.com-20120618160057-wzqaoepmqqzgj3tq
This commit is contained in:
Stephane Wirtel 2012-06-18 18:00:57 +02:00
parent 1d653fd073
commit 17f11dc7d9
11 changed files with 83 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/delivery/delivery_view.xml
View File

@ -192,7 +192,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="type" position="after">
<field name="company_id" position="before">
<field name="weight"/>
<field name="weight_net"/>
</field>

9
addons/delivery/partner_view.xml
View File

@ -7,12 +7,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="Sales &amp; Purchases" position="inside">
<group colspan="2" col="2">
<separator string="Deliveries Properties" colspan="4"/>
<field name="property_delivery_carrier"/>
</group>
</page>
<field name="property_stock_supplier" position="after">
<field name="property_delivery_carrier"/>
</field>
</field>
</record>

37
addons/membership/membership_view.xml
View File

@ -94,10 +94,15 @@
<field name="arch" type="xml">
<page string="Information" position="after">
<page string="Membership">
<field name="membership" readonly="0"/>
<newline/>
<field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
<field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
<group>
<group>
<field name="membership" readonly="0"/>
</group>
<group>
<field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
<field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
</group>
</group>
</page>
</page>
</field>
@ -235,23 +240,23 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Membership">
<group colspan="2" col="2">
<group colspan="4" col="3">
<field name="free_member"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
<field colspan="4" name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
<field colspan="4" name="membership_state"/>
<group>
<group>
<field name="free_member"/>
<field colspan="4" name="membership_state"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
</group>
<group>
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
</group>
</group>
<group colspan="2" col="2">
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
</group>
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<tree string="Memberships">
<field name="date"/>
<field name="membership_id"/>
<field name="membership_id" string="Membership"/>
<field name="member_price"/>
<field name="account_invoice_id"/>
<field name="state"/>

25
addons/mrp/mrp_view.xml
View File

@ -361,19 +361,22 @@
<field name="revision_ids"/>
</page>
<page string="Properties" groups="product.group_mrp_properties">
<group col="4">
<field name="position"/>
<field name="active"/>
<field name="sequence"/>
<field name="bom_id"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="product_rounding"/>
<field name="product_efficiency"/>
<group>
<group>
<field name="position"/>
<field name="bom_id"/>
<field name="sequence"/>
<field name="active"/>
</group>
<group>
<field name="date_start"/>
<field name="date_stop"/>
<field name="product_rounding"/>
<field name="product_efficiency"/>
</group>
</group>
<separator string="Properties"/>
<field name="property_ids"/>
<field name="property_ids" widget="many2many_tags" />
</page>
</notebook>
<newline/>

8
addons/product/partner_view.xml
View File

@ -8,10 +8,10 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="Sales &amp; Purchases" position="inside">
<newline/>
<group col="2" colspan="2" groups="product.group_sale_pricelist">
<separator string="Sales Properties" colspan="2"/>
<field name="property_product_pricelist"/>
<group>
<group name="pricelists" groups="product.group_sale_pricelist">
<field name="property_product_pricelist"/>
</group>
</group>
</page>
</field>

9
addons/purchase/partner_view.xml
View File

@ -8,12 +8,9 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="priority">36</field>
<field name="arch" type="xml">
<page string="Sales &amp; Purchases" position="inside">
<group colspan="2" col="2" groups="product.group_purchase_pricelist">
<separator string="Purchase Properties" colspan="2"/>
<field name="property_product_pricelist_purchase" />
</group>
</page>
<field name="property_product_pricelist" position="after">
<field name="property_product_pricelist_purchase" />
</field>
</field>
</record>

33
addons/sale/sale_view.xml
View File

@ -136,12 +136,12 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
</group><group>
<field name="date_order"/>
<field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
<field name="client_order_ref"/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
</group>
</group>
<notebook>
@ -196,8 +196,7 @@
</group>
<separator string="Properties" colspan="2"/>
<field name="property_ids" colspan="4" nolabel="1" />
<separator string="Notes" groups="base.group_sale_notes_subtotal"/>
<field name="notes" groups="base.group_sale_notes_subtotal"/>
<field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/>
<div groups="base.group_no_one">
<separator colspan="4" string="Invoice Lines"/>
<field colspan="4" name="invoice_lines" nolabel="1"/>
@ -207,6 +206,7 @@
</group>
</form>
<tree string="Sales Order Lines">
<field name="sequence" />
<field name="name"/>
<field name="product_uom_qty" string="Quantity"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@ -223,7 +223,7 @@
<field name="amount_total" class="oe_form_subtotal_footer_separator"/>
</group>
<separator string="Notes"/>
<field name="note" placeholder="Our quotation is valid for 30 days..."/>
<field name="note" placeholder="Add a global note on the sale order..."/>
</page>
<page string="Other Information">
<group>
@ -236,30 +236,37 @@
<group>
<field name="user_id"/>
<field groups="base.group_no_one" name="origin"/>
<field name="invoiced"/>
<field name="shipped"/>
</group>
<group name="sale_pay">
<field name="payment_term" widget="selection"/>
<field name="fiscal_position" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field name="invoiced"/>
<field name="shipped"/>
</group>
</group>
</page>
<page string="History">
<separator string="Invoices"/>
<field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}"/>
<field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
<tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
<field name="date_invoice" />
<field name="number" />
<field name="partner_id" />
<field name="user_id" />
<field name="date_due" />
<field name="amount_total" />
<field name="state" />
</tree>
</field>
<separator string="Delivery Orders"/>
<field name="picking_ids" context="{'default_type': 'out'}">
<tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
<field name="name"/>
<field name="partner_id"/>
<field name="origin"/>
<field name="date"/>
<field name="partner_id" string="Customer" />
<field name="min_date"/>
<field name="backorder_id"/>
<field name="invoice_state"/>
<field name="stock_journal_id" widget="selection"/>
<field name="state"/>
<button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
</tree>

4
addons/sale_margin/sale_margin_view.xml
View File

@ -9,9 +9,7 @@
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<xpath expr="//group[@class='oe_form_subtotal_footer']" position="inside">
<group>
<field name="margin"/>
</group>
<field name="margin"/>
</xpath>
</field>
</record>

9
addons/stock/partner_view.xml
View File

@ -9,15 +9,14 @@
<field name="name">res.partner.stock.property.form.inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="inherit_id" ref="product.view_partner_property_form"/>
<field name="arch" type="xml">
<page string="Sales &amp; Purchases" position="inside">
<group colspan="2" col="2" groups="stock.group_locations">
<separator string="Inventory Properties" colspan="2"/>
<group name="pricelists" position="after">
<group groups="stock.group_locations">
<field name="property_stock_customer" domain="[('usage','=','customer')]"/>
<field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
</group>
</page>
</group>
</field>
</record>

2
addons/stock/product_view.xml
View File

@ -202,7 +202,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<group name="store" position="after">
<group col="2" colspan="2" name="store" groups="stock.group_locations">
<group name="store" groups="stock.group_locations">
<separator string="Counter-Part Locations Properties" colspan="2"/>
<field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
<field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>

18
addons/stock/stock_view.xml
View File

@ -848,16 +848,20 @@
</field>
</page>
<page string="Additional info">
<group col="4">
<field name="auto_picking"/>
<field name="date_done"/>
<field name="move_type"/>
<field name="type"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<group>
<group>
<field name="move_type"/>
<field name="type"/>
<field name="auto_picking"/>
</group>
<group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="date_done"/>
</group>
</group>
</page>
<page string="Notes">
<field name="note" placeholder="Quality test ok..."/>
<field name="note" placeholder="Add an internal note..."/>
</page>
</notebook>
</sheet>