[Merge]with: lp:~openerp-commiter/openobject-addons/trunk-review-purchase-form-dbr-po-line-hsa
bzr revid: dbr@tinyerp.com-20120621073127-sziqeczmfk6cah4g
This commit is contained in:
DBR (OpenERP)
@@ -166,13 +166,14 @@
|
||||
<notebook>
|
||||
<page string="Purchase Order">
|
||||
<field name="order_line">
|
||||
|
||||
<tree string="Purchase Order Lines">
|
||||
<field name="date_planned"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="name"/>
|
||||
<field name="product_qty"/>
|
||||
<field name="product_uom" groups="product.group_uom"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="price_subtotal"/>
|
||||
<field name="price_subtotal"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group class="oe_subtotal_footer" col="4">
|
||||
@@ -325,7 +326,6 @@
|
||||
</record>
|
||||
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" sequence="6"/>
|
||||
|
||||
|
||||
<record id="purchase_order_line_form" model="ir.ui.view">
|
||||
<field name="name">purchase.order.line.form</field>
|
||||
<field name="model">purchase.order.line</field>
|
||||
@@ -333,35 +333,32 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Purchase Order Line" version="7.0">
|
||||
<sheet>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name"/></h1>
|
||||
<label for="product_id" class="oe_edit_only"/>
|
||||
<group>
|
||||
<group>
|
||||
<field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
|
||||
<label for="product_qty"/>
|
||||
<div>
|
||||
<field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
|
||||
<field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
|
||||
<field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
|
||||
<field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="price_unit"/>
|
||||
<field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="date_planned" widget="date"/>
|
||||
<field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
|
||||
<field name="taxes_id" widget="many2many_tags"
|
||||
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
|
||||
</group>
|
||||
<group string="Notes" colspan="4">
|
||||
<field name="notes"/>
|
||||
<field name="notes" nolabel="1" placeholder="Add a note on the purchase line..."/>
|
||||
</group>
|
||||
<group string="Invoices" colspan="4">
|
||||
<field name="invoiced"/>
|
||||
<field name="invoice_lines" nolabel="1" colspan="2"/>
|
||||
<field name="invoice_lines" nolabel="1"/>
|
||||
</group>
|
||||
<group string="Stock Moves" colspan="4">
|
||||
<field name="move_ids" nolabel="1"/>
|
||||
</group>
|
||||
<separator string="Stock Moves"/>
|
||||
<field name="move_ids"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
@@ -395,42 +392,42 @@
|
||||
<field name="priority" eval="20"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Purchase Order Line" version="7.0">
|
||||
<sheet>
|
||||
<label for="order_id" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="order_id" class="oe_inline"/>,
|
||||
<field name="date_order" class="oe_inline"/>
|
||||
</h1>
|
||||
<label for="partner_id" class="oe_edit_only"/>
|
||||
<h2><field name="partner_id"/></h2>
|
||||
|
||||
<group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="product_id" readonly="1"/>
|
||||
<label for="product_qty"/>
|
||||
<div>
|
||||
<field name="product_qty" readonly="1" class="oe_inline"/>
|
||||
<field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="price_unit"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="date_planned" widget="date" readonly="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
|
||||
<field name="taxes_id" widget="many2many_tags"
|
||||
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
|
||||
<field name="invoiced"/>
|
||||
</group>
|
||||
</group>
|
||||
<separator string="Manual Invoices"/>
|
||||
<field name="invoice_lines"/>
|
||||
<separator string="Notes"/>
|
||||
<field name="notes"/>
|
||||
<separator string="Stock Moves"/>
|
||||
<field name="move_ids"/>
|
||||
</sheet>
|
||||
<sheet>
|
||||
<label for="order_id" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="order_id" class="oe_inline"/>,
|
||||
<field name="date_order" class="oe_inline"/>
|
||||
</h1>
|
||||
<label for="partner_id" class="oe_edit_only"/>
|
||||
<h2><field name="partner_id"/></h2>
|
||||
|
||||
<group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="product_id" readonly="1"/>
|
||||
<label for="product_qty"/>
|
||||
<div>
|
||||
<field name="product_qty" readonly="1" class="oe_inline"/>
|
||||
<field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="price_unit"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="date_planned" widget="date" readonly="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
|
||||
<field name="taxes_id" widget="many2many_tags"
|
||||
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
|
||||
<field name="invoiced"/>
|
||||
</group>
|
||||
</group>
|
||||
<separator string="Manual Invoices"/>
|
||||
<field name="invoice_lines"/>
|
||||
<separator string="Notes"/>
|
||||
<field name="notes"/>
|
||||
<separator string="Stock Moves"/>
|
||||
<field name="move_ids"/>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user