[FIX] purchase, incomming shipments and supplier invoice: new form views
bzr revid: qdp-launchpad@openerp.com-20120702133821-6fullwrtfganomz7
This commit is contained in:
Quentin (OpenERP)
@@ -145,7 +145,7 @@
|
||||
<field name="type">form</field>
|
||||
<field name="priority">2</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Draft Invoice" version="7.0">
|
||||
<form version="7.0">
|
||||
<header>
|
||||
<span groups="base.group_user">
|
||||
<button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
|
||||
@@ -159,11 +159,15 @@
|
||||
<sheet string="Supplier Invoice">
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field name="number" class="oe_inline"/>
|
||||
<label string="Draft Invoice" attrs="{'invisible': [('state', '<>', 'draft')]}"/>
|
||||
<label for="number" class="oe_edit_only" attrs="{'invisible': [('state', '=', 'draft')]}"/>
|
||||
<field name="number" class="oe_inline" attrs="{'invisible': [('state', '=', 'draft')]}"/>
|
||||
</h1>
|
||||
<h2>
|
||||
<field name="origin" placeholder="PO0025"/>from
|
||||
<field string="Supplier" name="partner_id"
|
||||
<label for="origin" string="Concerns" class="oe_inline"/>
|
||||
<field name="origin" placeholder="PO0025" class="oe_inline"/>
|
||||
<label string=" from " attrs="{'invisible': [('origin', '=', False)]}" class='oe_inline'/>
|
||||
<field string="Supplier" name="partner_id" class="oe_inline"
|
||||
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
|
||||
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
|
||||
domain="[('supplier', '=', True)]"/>
|
||||
@@ -235,7 +239,7 @@
|
||||
<field name="comment"/>
|
||||
</page>
|
||||
<page string="Other Info">
|
||||
<group col="4">
|
||||
<group>
|
||||
<group>
|
||||
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
|
||||
<field name="payment_term" widget="selection"/>
|
||||
@@ -243,7 +247,7 @@
|
||||
<group>
|
||||
<field name="user_id"/>
|
||||
<field name="name" invisible="1"/>
|
||||
<field name="move_id" groups="account.group_account_user" invisible="1"/>
|
||||
<field name="move_id" groups="account.group_account_user"/>
|
||||
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</group>
|
||||
@@ -252,14 +256,14 @@
|
||||
<field name="payment_ids">
|
||||
<tree string="Payments">
|
||||
<field name="date" string="Payment Date"/>
|
||||
<field name="move_id"/>
|
||||
<field name="ref"/>
|
||||
<field name="name"/>
|
||||
<field name="amount_currency" string="Amount"/>
|
||||
<field name="journal_id"/>
|
||||
<field name="debit"/>
|
||||
<field name="credit"/>
|
||||
<field name="amount_currency"/>
|
||||
<field name="currency_id"/>
|
||||
<field name="move_id" invisible="1"/>
|
||||
<field name="journal_id" invisible="1"/>
|
||||
<field name="debit" invisible="1"/>
|
||||
<field name="credit" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
||||
@@ -313,15 +313,19 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Product Categories" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<group>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<field name="name"/>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="parent_id"/>
|
||||
<field name="sequence" invisible="1"/>
|
||||
</group>
|
||||
</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"/>
|
||||
@@ -426,9 +430,9 @@
|
||||
</group>
|
||||
<group string="Ratio & Precision">
|
||||
<field name="uom_type" on_change="onchange_type(uom_type)"/>
|
||||
<field name="rounding" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<field name="factor" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<label string=" e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<field name="rounding"/>
|
||||
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
|
||||
<label string=" e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
|
||||
<field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<label string=" e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
</group>
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Purchase Order" version="7.0">
|
||||
<header>
|
||||
<button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
|
||||
<button name="purchase_confirm" states="draft,sent" string="Confirm Quotation" class="oe_highlight"/>
|
||||
<button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
|
||||
<button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
|
||||
<button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
|
||||
@@ -150,7 +150,7 @@
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
|
||||
<label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
|
||||
<label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
|
||||
<field name="name" class="oe_inline" readonly="1"/>
|
||||
</h1>
|
||||
@@ -187,15 +187,14 @@
|
||||
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline oe_left"/>
|
||||
<field name="amount_total"/>
|
||||
</div>
|
||||
</group>
|
||||
|
||||
</group>
|
||||
<div class="oe_clear"/>
|
||||
<label for="notes"/>
|
||||
<field name="notes"/>
|
||||
</page>
|
||||
<page string="Delivery & Invoicing">
|
||||
<group>
|
||||
<group>
|
||||
<group string="Delivery">
|
||||
<field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
|
||||
<field name="minimum_planned_date"/>
|
||||
<field name="location_id" groups="stock.group_locations"/>
|
||||
@@ -357,8 +356,8 @@
|
||||
<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')]"/>
|
||||
|
||||
@@ -1397,14 +1397,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="act_relate_picking">
|
||||
<field name="name">Related Picking</field>
|
||||
<field name="res_model">stock.picking</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="stock.vpicktree"/>
|
||||
<field name="context">{'default_move_lines': active_id}</field>
|
||||
</record>
|
||||
|
||||
<record id="view_move_form_reception_picking" model="ir.ui.view">
|
||||
<field name="name">stock.move.form2</field>
|
||||
@@ -1421,18 +1413,13 @@
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
|
||||
</header>
|
||||
<sheet>
|
||||
<div class="oe_right oe_button_box" name="buttons">
|
||||
<button type="action"
|
||||
name="%(act_relate_picking)d"
|
||||
string="Related Picking"/>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
|
||||
<label for="product_qty"/>
|
||||
<div>
|
||||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
|
||||
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
|
||||
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
|
||||
<button name="%(stock.move_scrap)d"
|
||||
string="Scrap" type="action"
|
||||
icon="gtk-convert" context="{'scrap': True}"
|
||||
|
||||
Reference in New Issue
Block a user