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

[MERGE] review of form views for purchase, supplier invoice, incomming shipments... 

bzr revid: qdp-launchpad@openerp.com-20120702145856-ywz1t14moqoh0kgz
This commit is contained in:
Quentin (OpenERP) 2012-07-02 16:58:56 +02:00
parent 8fea9baa91 603a4e91b2
commit 472fa74b12
10 changed files with 163 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
addons/account/account_invoice_view.xml
View File

@ -157,33 +157,39 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header>
<sheet string="Supplier Invoice">
<group>
<group>
<field string="Supplier" name="partner_id"
<div class="oe_title">
<h1>
<label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
<label for="number" class="oe_edit_only" attrs="{'invisible': [('state', '=', 'draft')]}"/>
<field name="number" class="oe_inline" attrs="{'invisible': [('state', '=', 'draft')]}"/>
</h1>
<h2>
<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)]"/>
<field name="fiscal_position" widget="selection"/>
</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="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="fiscal_position" widget="selection"/>
<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>
@ -196,10 +202,11 @@
<field domain="[('type','&lt;&gt;','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', '&lt;&gt;', '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,16 +239,17 @@
<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="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="name" 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>
</page>
<page string="Payments">

8
addons/account/product_view.xml
View File

@ -51,12 +51,12 @@
<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">
<data>
<xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group>
</form>
</xpath>
</data>
</field>
</record>

9
addons/account_anglo_saxon/product_view.xml
View File

@ -34,12 +34,11 @@
<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"/>
<data>
<xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group>
</form>
</xpath>
</data>
</field>
</record>

26
addons/product/product_view.xml
View File

@ -312,12 +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>
<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>

26
addons/product_manufacturer/product_manufacturer_view.xml
View File

@ -10,19 +10,19 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Manufacturer">
<separator string="Manufacturer" colspan="4" />
<field name="manufacturer" />
<newline/>
<field name="manufacturer_pname"/>
<field name="manufacturer_pref"/>
<separator string="Attributes" colspan="4"/>
<field name="attribute_ids" colspan="4" nolabel="1">
<tree string="Product Attributes" editable="bottom">
<field name="name"/>
<field name="value"/>
</tree>
</field>
<group string="Manufacturer">
<field name="manufacturer" />
<field name="manufacturer_pname"/>
<field name="manufacturer_pref"/>
</group>
<group string="Attributes">
<field name="attribute_ids" colspan="4" nolabel="1">
<tree string="Product Attributes" editable="bottom">
<field name="name"/>
<field name="value"/>
</tree>
</field>
</group>
</page>
</notebook>
</field>

74
addons/purchase/purchase_view.xml
View File

@ -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" />
@ -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="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>
</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}"/>
@ -175,15 +177,17 @@
<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">
<group class="oe_subtotal_footer oe_right">
<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"/>
</group>
<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 oe_left"/>
<field name="amount_total"/>
</div>
</group>
<div class="oe_clear"/>
<label for="notes"/>
<field name="notes"/>
@ -191,23 +195,27 @@
<page string="Delivery &amp; Invoicing">
<group>
<group string="Delivery">
<field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
<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"/>
<field name="shipped" groups="base.group_no_one"/>
</group>
<group string="Invoice Control">
<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"/>
<group>
<field name="validator" groups="base.group_no_one"/>
<field name="date_approve"/>
</group>
<separator string="Invoices"/>
<field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
</group>
<group string="Invoicing">
<group>
<field name="invoice_method"/>
<field name="invoiced"/>
</group>
<group>
<field name="fiscal_position"/>
</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,9 +351,6 @@
<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)"/>
@ -356,23 +360,23 @@
<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>
@ -410,11 +414,11 @@
<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"/>

50
addons/purchase/stock_view.xml
View File

@ -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>

9
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -8,7 +8,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="validator" position="before">
<field name="requisition_id"/>
</field>
</field>
@ -41,12 +41,13 @@
</header>
<sheet>
<div class="oe_edit_only">
<label for="name" class="oe_inline"/>,
<label for="name" class="oe_inline"/>
<label for="origin" class="oe_inline"/>
</div>
<h1>
<field name="name" class="oe_inline"/>,
<field name="origin" class="oe_inline"/>
<field name="name" class="oe_inline"/>
<label string="," attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" class="oe_inline" placeholder="PO0025"/>
</h1>
<group>
<group>

8
addons/stock/product_view.xml
View File

@ -21,14 +21,14 @@
<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">
<data>
<xpath expr="/form/sheet//group[@name='account_stock_property']" position="inside">
<field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
<field name="property_stock_journal"/>
</group>
</form>
</xpath>
</data>
</field>
</record>

38
addons/stock/stock_view.xml
View File

@ -1419,50 +1419,47 @@
<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}"
states="draft,waiting,confirmed,assigned"/>
states="draft,waiting,confirmed,assigned" colspan="1"/>
</div>
<label for="product_uos_qty"/>
<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"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group>
<label name="tracking_id"/>
<field name="picking_id"/>
<field name="create_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)"/>
<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>
@ -1612,13 +1609,6 @@
res_model="stock.move"
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'))]"