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

[IMP] warehouse: usability, review of form views 

bzr revid: qdp-launchpad@openerp.com-20120717151901-nfrwk9h2h5pb9s0z
This commit is contained in:
Quentin (OpenERP) 2012-07-17 17:19:01 +02:00
parent 3ff49a8078
commit 3b271f68ee
7 changed files with 100 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/account_view.xml
View File

@ -921,15 +921,15 @@
<field name="arch" type="xml">
<form string="Account Tax" version="7.0">
<group>
<group>
<group>
<field name="name"/>
<field name="description"/>
<group>
</group>
</group>
<group>
<field name="type_tax_use"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="active"/>
</group>
</group>
</group>
<notebook>
<page string="Tax Definition">

73
addons/delivery/delivery_view.xml
View File

@ -22,11 +22,22 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Carrier" version="7.0">
<group col="4" name="general">
<field name="name"/>
<field name="partner_id"/>
<field name="product_id"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
</div>
<group>
<group name="general">
<field name="partner_id"/>
<field name="product_id"/>
</group>
<group>
<field name="active"/>
</group>
</group>
<group col="4">
<group string="Pricing Information">
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<label for="free_if_more_than"/>
@ -76,7 +87,6 @@
</notebook>
</form>
</field>
</form>
</field>
</record>
@ -152,18 +162,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Grid Lines" version="7.0">
<field colspan="4" name="name"/>
<div>
<label string="condition" for="type"/>
<field name="type" class="oe_inline"/>
<field name="operator" class="oe_inline"/>
<field name="max_value" class="oe_inline"/>
</div>
<group col="4">
<field name="list_price"/>
<field name="standard_price"/>
<field name="price_type"/>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
<group>
<field name="name"/>
</group>
<group>
<group>
<label for="type" string="Condition"/>
<div>
<field name="type" class="oe_inline"/>
<field name="operator" class="oe_inline"/>
<field name="max_value" class="oe_inline"/>
</div>
<label for="price_type"/>
<div>
<field name="price_type" class="oe_inline"/>
<label string=" in Function of " class="oe_inline" attrs="{'invisible':[('price_type','=','fixed')]}"/>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}" class="oe_inline"/>
</div>
</group>
<group>
<field name="list_price"/>
<field name="standard_price"/>
</group>
</group>
</form>
</field>
@ -242,23 +262,10 @@
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<field name="picking_id" position="after">
<xpath expr="//group[@name='main_grp']" position="inside">
<field name="weight"/>
<field name="weight_net"/>
</field>
</field>
</record>
<record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
<field name="name">stock.move.reception.packing.form.weight</field>
<field name="type">form</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
<field name="arch" type="xml">
<field name="picking_id">
<field name="weight"/>
<field name="weight_net"/>
</field>
</xpath>
</field>
</record>
@ -276,7 +283,7 @@
<button name="delivery_set" string="Add in Quote" type="object"
class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
<br/>
<br/>
<label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>

20
addons/procurement/procurement_view.xml
View File

@ -59,20 +59,18 @@
<h1>
<field name="name" class="oe_inline"/>
<label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" class="oe_inline"/>
<field name="origin" class="oe_inline"/>
</h1>
<label for="message" class="oe_edit_only"/>
<h2>
<field name="message"/>
</h2>
<group>
<group>
<field name="date_planned"/>
<field name="procure_method"/>
<field name="priority"/>
</group>
<group>
<field name="message"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group/>
</group>
<notebook>
<page string="Procurement Details">
@ -84,10 +82,10 @@
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" class="oe_inline"/>
</div>
<label for="product_uos_qty" string="Quentity UoS" groups="product.group_uos"/>
<div>
<field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
<field name="product_uos" groups="product.group_uos" class="oe_inline"/>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos">
<field name="product_uos_qty" class="oe_inline"/>
<field name="product_uos" class="oe_inline"/>
</div>
</group>
<group>
@ -96,7 +94,7 @@
</group>
</page>
<page string="Extra Information">
<group string="Details">
<group>
<field name="move_id"/>
<field name="date_close"/>
<field name="close_move"/>

4
addons/purchase/stock_view.xml
View File

@ -7,8 +7,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='tracking_id']" position="before">
<field name="purchase_line_id" colspan="2" />
<xpath expr="//group[@name='destination_grp']" position="inside">
<field name="purchase_line_id"/>
</xpath>
</field>
</record>

4
addons/sale/stock_view.xml
View File

@ -19,8 +19,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='tracking_id']" position="before">
<field name="sale_line_id" colspan="2"/>
<xpath expr="//group[@name='origin_grp']" position="inside">
<field name="sale_line_id"/>
</xpath>
</field>
</record>

117
addons/stock/stock_view.xml
View File

@ -124,14 +124,13 @@
<div>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" placeholder="Annual inventory" class="oe_inline"/> -
<field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
<field name="date" class="oe_inline"/>
</h1>
</div>
<label for="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
<h2>
<group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</h2>
</group>
<notebook>
<page string="General Informations">
<field name="inventory_line_id">
@ -336,7 +335,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Serial Number" version="7.0">
<div class="oe_button_box">
<div class="oe_button_box oe_right">
<button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
<button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
</div>
@ -346,7 +345,7 @@
<field name="name"/>
</h1>
</div>
<group string="Serial Number Identification">
<group>
<group>
<field name="product_id"/>
<field name="prefix"/>
@ -1227,14 +1226,15 @@
<form string="Stock Moves" version="7.0">
<header>
<button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
<button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_highlight"/>
<button name="%(action_partial_move_server)d" string="Process Partially" type="action" states="assigned" class="oe_highlight"/>
<button name="action_done" states="draft,assigned,confirmed" string="Process Entirely" type="object" class="oe_highlight"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
</header>
<sheet>
<group>
<group>
<group name="main_grp" string="Details">
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
<label for="product_qty"/>
<div>
@ -1247,29 +1247,28 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
</div>
<label for="product_uso_qty" />
<div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos">
<field name="product_uos_qty"
groups="product.group_uos"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
class="oe_inline"/>
<field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
<field name="product_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="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
</group>
<group>
<group name="origin_grp" string="Origin">
<field name="picking_id"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one"/>
</group>
<group name="destination_grp" string="Destination">
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" context="{'contact_display':'partner'}"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
<field name="date" groups="base.group_no_one" />
</group>
<group>
<group string="Tracability">
<label for="tracking_id"/>
<div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
@ -1409,80 +1408,6 @@
</field>
</record>
<record id="view_move_form_reception_picking" model="ir.ui.view">
<field name="name">stock.move.form2</field>
<field name="model">stock.move</field>
<field name="type">form</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<form string="Receive Products" version="7.0">
<header>
<button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
<button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_highlight"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
</header>
<sheet>
<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"/>
<button name="%(stock.move_scrap)d"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
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" class="oe_inline"/>
</div>
<field name="name" string="Reason"/>
<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" string="Move Date"/>
</group>
<group>
<field name="partner_id" groups="stock.group_locations"/>
<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" class="oe_inline"/>
</div>
<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" />
</div>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
<field name="name">stock.move.incoming.search2</field>
<field name="model">stock.move</field>
@ -1567,7 +1492,7 @@
<record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_move_form_reception_picking"/>
<field name="view_id" ref="view_move_form"/>
<field name="act_window_id" ref="action_reception_picking_move"/>
</record>

48
addons/stock_planning/stock_planning_view.xml
View File

@ -255,51 +255,47 @@
<field name="product_uom"
domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
<field name="active_uom" invisible = "True" />
</group>
<group string="Minimum Stock Rule Indicators">
<field name="minimum_op"/>
<field name="maximum_op"/>
</group>
</group>
<group>
<group string="Current Period Situation">
<field name="active_uom" invisible = "True"/>
<separator string="Current Period Situation" colspan="2"/>
<field name="stock_start"/>
<field name="already_out"/>
<field name="already_in"/>
</group>
<group string="Forecasts">
<separator string="Minimum Stock Rule Indicators" colspan="2"/>
<field name="minimum_op"/>
<field name="maximum_op"/>
<separator string="Forecasts" colspan="2"/>
<field name="warehouse_forecast"/>
<field name="company_forecast"/>
<field name="confirmed_forecasts_only"/>
</group>
</group>
<group>
<group string="Planning and Situation for Calculated Period">
<group>
<button name="calculate_planning" string="Compute Planning" type="object" icon="gtk-execute"/>
<separator string="Planning and Situation for Calculated Period" colspan="2"/>
<field name="planned_outgoing"/>
<field name="outgoing"/>
<field name="outgoing_left"/>
<field name="to_procure"/>
<field name="incoming"/>
<field name="incoming_left"/>
<button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
<label for="incoming_left"/>
<div>
<field name="incoming_left" class="oe_inline"/>
<button name="procure_incomming_left" icon="gtk-convert" string="Make Procurement" type="object" class="oe_inline"/>
<button name="internal_supply" string="Make Picking" help="Supply from Another Warehouse" icon="gtk-convert" type="object" class="oe_inline"/>
</div>
<field name="stock_only"/>
</group>
<group string="Calculated Period Simulation">
<separator string="Calculated Period Simulation" colspan="2"/>
<field name="outgoing_before"/>
<field name="incoming_before"/>
<field name="stock_simulation"/>
<button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
<field name="procure_to_stock"/>
<separator string="Internal Supply" colspan="2"/>
<field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="stock_supply_location"/>
</group>
</group>
<group string="Internal Supply">
<button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert" type="object" colspan="2"/>
<field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="stock_supply_location"/>
</group>
<group string="Procurement History">
<field name="history" nolabel = "1"/>
<group string="Procurement History" colspan="4">
<field name="history" nolabel="1" colspan="4"/>
</group>
</form>
</field>