Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-review-purchase-form-dbr into
lp:openobject-addons.
Requested reviews:
Aline (OpenERP) (apr-tinyerp)
Amit Patel (OpenERP) (apa-tiny)
Stephane Wirtel (OpenERP) (stephane-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-purchase-form-dbr/+merge/112028
Hello
improved all views for purchase application which are mention in this pad :
http://pad.openerp.com/internalv61-project-task-3687-1CUXCRY8
Thanks,
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-purchase-form-dbr/+merge/112028
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-review-purchase-form-dbr.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-06-22 05:52:30 +0000
+++ account/account_invoice_view.xml 2012-06-26 09:07:00 +0000
@@ -146,7 +146,7 @@
<field name="type">form</field>
<field name="priority">2</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Draft Invoice" version="7.0">
<header>
<button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
@@ -156,33 +156,35 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header>
<sheet string="Supplier Invoice">
- <group>
- <group>
+ <div class="oe_title">
+ <h1>
+ <field name="number" class="oe_inline"/>
+ </h1>
+ <h2>
+ <field name="origin" placeholder="PO0025"/>from
<field string="Supplier" name="partner_id"
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)]"/>
+ </h2>
+ </div>
+ <group>
+ <group>
+ <field name="date_invoice"/>
+ <field name="date_due"/>
+ <field name="type" invisible="1"/>
+ <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
+ </group>
+ <group>
<field name="fiscal_position" widget="selection"/>
- </group>
- <group>
- <field name="number"/>
- <field name="date_invoice"/>
- <field name="period_id" domain="[('state', '=', 'draft')]"
- groups="account.group_account_user" widget="selection"/>
- <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
- groups="account.group_account_user"/>
- <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
- name="account_id" groups="account.group_account_user"/>
<field name="currency_id"/>
- <field name="type" invisible="1"/>
+ <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user" invisible="1"/>
</group>
<group>
<label for="reference"/>
<div>
- <field name="reference_type"/>
<field name="reference" placeholder="Payment Reference"/>
</div>
- <field name="date_due"/>
</group>
</group>
<notebook>
@@ -190,15 +192,15 @@
<field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
<tree string="Invoice lines">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
- <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','<>','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="quantity"/>
<field name="price_unit"/>
- <!-- Removed if subtotal is set -->
<field name="price_subtotal"/>
- <field invisible="True" name="name"/>
- <field invisible="True" name="uos_id"/>
+ <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
+ <!-- Removed if subtotal is set -->
+ <field name="name" invisible="1"/>
+ <field name="uos_id" invisible="1"/>
</tree>
</field>
<group>
@@ -232,29 +234,30 @@
</page>
<page string="Other Info">
<group col="4">
+ <group>
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
- <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"/>
- <newline/>
<field name="payment_term" widget="selection"/>
- <field name="name"/>
- <newline/>
- <field name="origin" placeholder="PO0025"/>
+ </group>
+ <group>
<field name="user_id"/>
- <field name="move_id" groups="account.group_account_user"/>
+ <field name="name" invisible="1"/>
+ <field name="move_id" groups="account.group_account_user" invisible="1"/>
+ <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>
</page>
<page string="Payments">
<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="journal_id"/>
- <field name="debit"/>
- <field name="credit"/>
- <field name="amount_currency"/>
+ <field name="amount_currency" string="Amount"/>
<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>
=== modified file 'account/product_view.xml'
--- account/product_view.xml 2012-06-13 09:06:57 +0000
+++ account/product_view.xml 2012-06-26 09:07:00 +0000
@@ -51,12 +51,14 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml">
- <form position="inside">
- <group string="Accounting Properties">
- <field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- </group>
- </form>
+ <data>
+ <xpath expr="/form/sheet//group[@name='basic']" position="inside">
+ <group string="Accounting Properties">
+ <field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ </group>
+ </xpath>
+ </data>
</field>
</record>
=== modified file 'account_anglo_saxon/product_view.xml'
--- account_anglo_saxon/product_view.xml 2012-06-14 12:42:00 +0000
+++ account_anglo_saxon/product_view.xml 2012-06-26 09:07:00 +0000
@@ -34,12 +34,13 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml">
- <form position="inside">
- <group>
- <separator string="Accounting Property" colspan="2"/>
- <field name="property_account_creditor_price_difference_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- </group>
- </form>
+ <data>
+ <xpath expr="/form/sheet//group[@name='basic']" position="before">
+ <group string="Accounting Property">
+ <field name="property_account_creditor_price_difference_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ </group>
+ </xpath>
+ </data>
</field>
</record>
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-06-22 13:05:06 +0000
+++ product/product_view.xml 2012-06-26 09:07:00 +0000
@@ -310,12 +310,15 @@
<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>
+ <sheet>
+ <group>
+ <field name="name"/>
+ <field name="parent_id"/>
+ <field name="sequence" invisible="1"/>
+ <field name="type"/>
+ </group>
+ <group name="basic" col="4"/>
+ </sheet>
</form>
</field>
</record>
@@ -414,9 +417,9 @@
</group>
<group string="Ratio & Precision">
<field name="uom_type" on_change="onchange_type(uom_type)"/>
- <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="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="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
<label string=" e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
</group>
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-06-22 11:12:51 +0000
+++ purchase/purchase_view.xml 2012-06-26 09:07:00 +0000
@@ -148,11 +148,13 @@
<field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
</header>
<sheet>
- <h1>
- <label string="Draft Purchase Order " 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>
+ <div class="oe_title">
+ <h1>
+ <label string="Draft Purchase Order " 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>
+ </div>
<group>
<group>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/>
@@ -175,39 +177,45 @@
<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">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
- <field name="amount_total" class="oe_subtotal_footer_separator"/>
- <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
+ <div class="oe_subtotal_footer_separator oe_inline" colspan="2">
+ <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline"/>
+ <field name="amount_total"/>
+ </div>
</group>
<div class="oe_clear"/>
<label for="notes"/>
<field name="notes"/>
</page>
<page string="Delivery & Invoicing">
- <group>
- <group string="Delivery">
- <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
+ <group string="Delivery">
+ <group>
+ <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"/>
- <field name="shipped"/>
- </group>
- <group string="Invoice Control">
+ <field name="shipped" groups="base.group_no_one"/>
+ </group>
+ <group>
+ <field name="validator" groups="base.group_no_one"/>
+ <field name="date_approve"/>
+ </group>
+ </group>
+ <group string="Invoicing" col="4">
+ <group>
<field name="invoice_method"/>
- <field name="fiscal_position" widget="selection"/>
- <field name="invoiced" groups="base.group_no_one"/>
- </group>
- <group groups="base.group_no_one" string="Purchase Control">
- <field name="validator"/>
- <field name="date_approve"/>
- </group>
- <separator string="Invoices"/>
- <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
+ <field name="fiscal_position"/>
+ </group>
+ <group>
+ <field name="invoiced"/>
+ </group>
</group>
+ <separator string="Invoices"/>
+ <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
</page>
</notebook>
</sheet>
@@ -336,7 +344,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>
@@ -344,35 +351,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"/>
- </group>
- <separator string="Stock Moves"/>
- <field name="move_ids"/>
+ <field name="invoice_lines" nolabel="1"/>
+ </group>
+ <group string="Stock Moves" colspan="4">
+ <field name="move_ids" nolabel="1"/>
+ </group>
</group>
</sheet>
</form>
@@ -406,42 +410,43 @@
<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"/>
+ <label string="," attrs="{'invisible':[('date_order','=',False)]}"/>
+ <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>
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2012-06-22 05:52:30 +0000
+++ purchase/stock_view.xml 2012-06-26 09:07:00 +0000
@@ -24,27 +24,6 @@
</field>
</record>
- <act_window
- domain="[('purchase_id', '=', active_id)]"
- id="act_purchase_order_2_stock_picking"
- name="Incoming Shipments"
- res_model="stock.picking.in"
- src_model="purchase.order"
- context="{'default_purchase_id': active_id, 'contact_display': 'partner', 'default_type': 'in'}" />
-
- <record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
- <field eval="1" name="sequence"/>
- <field name="view_mode">tree</field>
- <field name="view_id" ref="stock.view_picking_in_tree"/>
- <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
- </record>
- <record id="action_picking_in_form_view" model="ir.actions.act_window.view">
- <field eval="2" name="sequence"/>
- <field name="view_mode">form</field>
- <field name="view_id" ref="stock.view_picking_in_form"/>
- <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
- </record>
-
<record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
<field name="name">Incoming Picking Inherited</field>
<field name="model">stock.picking.in</field>
@@ -78,6 +57,7 @@
<separator orientation="vertical"/>
<field name="stock_journal_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <field name="purchase_id" />
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8">
@@ -96,7 +76,33 @@
</search>
</field>
</record>
-
+ <record id="act_purchase_order_2_stock_picking" model="ir.actions.act_window">
+ <field name="name">Incoming Shipments</field>
+ <field name="res_model">stock.picking.in</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,calendar</field>
+ <field name="domain">[('type','=','in')]</field>
+ <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
+ <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
+ </record>
+
+ <record id="purchase_order_2_stock_picking" model="ir.ui.view">
+ <field name="name">Purchase Picking Inherited</field>
+ <field name="model">purchase.order</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="purchase.purchase_order_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
+ <div class="oe_right oe_button_box" name="buttons">
+ <button type="action"
+ name="%(act_purchase_order_2_stock_picking)d"
+ string="Incoming Shipments" states="approved"/>
+ </div>
+ </xpath>
+ </field>
+ </record>
+
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
<field name="name">Based on Incoming Shipments</field>
<field name="res_model">stock.picking</field>
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2012-06-22 11:12:51 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2012-06-26 09:07:00 +0000
@@ -9,7 +9,7 @@
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_form"/>
<field name="arch" type="xml">
- <field name="shipped" position="after">
+ <field name="dest_address_id" position="after">
<field name="requisition_id"/>
</field>
</field>
@@ -41,9 +41,10 @@
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
</header>
<sheet>
- <label for="name" class="oe_edit_only"/>
<h1>
- <field name="name" class="oe_inline"/>,
+ <field name="name" class="oe_inline"/>
+ <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+ <label for="origin" class="oe_edit_only"/>
<field name="origin" class="oe_inline"/>
</h1>
<group>
=== modified file 'stock/product_view.xml'
--- stock/product_view.xml 2012-06-19 08:56:18 +0000
+++ stock/product_view.xml 2012-06-26 09:07:00 +0000
@@ -21,14 +21,16 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml">
- <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>
- </form>
+ <data>
+ <xpath expr="/form/sheet//group[@name='basic']" position="inside">
+ <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>
+ </data>
</field>
</record>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-06-22 08:05:04 +0000
+++ stock/stock_view.xml 2012-06-26 09:07:00 +0000
@@ -1397,6 +1397,14 @@
</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>
@@ -1413,6 +1421,11 @@
<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)"/>
@@ -1429,40 +1442,37 @@
<div>
<field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
- <field name="product_uos" groups="product.group_uos"/>
+ <field name="product_uos" groups="product.group_uos" class="oe_inline"/>
</div>
<field name="name" string="Reason"/>
- </group>
- <group>
- <field name="picking_id"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="company_id" groups="base.group_multi_company"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" groups="stock.group_locations"/>
+ </group>
+ <group>
+ <field name="picking_id"/>
<field name="create_date" groups="base.group_no_one" />
- <field name="date" groups="base.group_no_one" />
+ <field name="date" groups="base.group_no_one" string="Move Date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
- </group>
-
- <group>
- <label name="tracking_id"/>
+ <label for="tracking_id"/>
<div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
<button name="%(split_into)d" string="New Pack" type="action"
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed,done" colspan="1"/>
+ states="draft,assigned,confirmed,done" class="oe_inline"/>
</div>
- <label name="prodlot_id"/>
+ <label for="prodlot_id"/>
<div>
<field name="prodlot_id" groups="stock.group_production_lot"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]" class="oe_inline"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
<button name="%(track_line)d"
- groups="stock.group_tracking_lot" class="oe_inline"
- states="draft,waiting,confirmed,assigned,done"
- string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+ groups="stock.group_tracking_lot" class="oe_inline"
+ states="draft,waiting,confirmed,assigned,done"
+ string="Split" type="action" icon="terp-stock_effects-object-colorize" />
</div>
</group>
</group>
@@ -1613,13 +1623,6 @@
src_model="product.product"/>
<act_window
- domain="[('move_lines','=',active_id)]"
- id="act_relate_picking"
- name="Related Picking"
- res_model="stock.picking"
- src_model="stock.move"/>
-
- <act_window
context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
domain="[('state','in',('waiting','confirmed','assigned'))]"
id="act_product_stock_move_futur_open"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
