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

[IMP] Usability improvements by clarifying texts

This commit is contained in:
Josse Colpaert 2014-08-21 11:37:40 +02:00
parent 3891892d9f
commit f4e7105eb6
3 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/stock_view.xml
View File

@ -688,7 +688,9 @@
<field name="result_package_id" groups="stock.group_tracking_lot"/> <field name="result_package_id" groups="stock.group_tracking_lot"/>
</tree> </tree>
</field> </field>
<label class="oe_grey" string="Setting a product and a source package will result in a partial unpack of the source package (products will be taken out from that package). Set a source package without any product to move it as a whole."/> <p class="oe_grey" groups="stock.group_tracking_lot">
If there is no product but a source package, this means the source package was moved entirely. If there is a product and a source package, the product was taken from the source package.
</p>
</page> </page>
<page string="Additional Info"> <page string="Additional Info">
<group string="General Informations"> <group string="General Informations">

70
addons/stock/wizard/stock_transfer_details.xml
View File

@ -8,34 +8,48 @@
<form string="Transfer details" version="7"> <form string="Transfer details" version="7">
<field name="picking_source_location_id" invisible="True"/> <field name="picking_source_location_id" invisible="True"/>
<field name="picking_destination_location_id" invisible="True"/> <field name="picking_destination_location_id" invisible="True"/>
<field name="item_ids" <group string="Products To Move">
context="{'default_sourceloc_id':picking_source_location_id, <div class="oe_grey" groups="stock.group_tracking_lot">
'default_destinationloc_id':picking_destination_location_id}"> Setting a product and a source package means that the product will be taken
<tree string="Inventory Details" editable="bottom" > out of the package.
<field name="package_id" groups="stock.group_tracking_lot"/> </div>
<field name="product_id" required="True" context="{'uom':product_uom_id}" on_change="product_id_change(product_id,product_uom_id,context)"/> </group>
<field name="quantity"/> <group>
<button name="split_quantities" string="Split" type="object" icon="STOCK_PREFERENCES" attrs="{'invisible': [('quantity', '=', 1)]}"/> <field name="item_ids"
<field name="product_uom_id" options="{&quot;no_open&quot;: True}" groups="product.group_uom"/> context="{'default_sourceloc_id':picking_source_location_id,
<field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/> 'default_destinationloc_id':picking_destination_location_id}" nolabel="1">
<field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/> <tree string="Inventory Details" editable="bottom" >
<field name="result_package_id" groups="stock.group_tracking_lot" context="{'location_id': destinationloc_id}"/> <field name="package_id" groups="stock.group_tracking_lot"/>
<button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}" groups="stock.group_tracking_lot"/> <field name="product_id" required="True" context="{'uom':product_uom_id}" on_change="product_id_change(product_id,product_uom_id,context)"/>
<field name="lot_id" groups="stock.group_production_lot" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}"/> <field name="quantity"/>
</tree> <button name="split_quantities" string="Split" type="object" icon="STOCK_PREFERENCES" attrs="{'invisible': [('quantity', '=', 1)]}"/>
</field> <field name="product_uom_id" options="{&quot;no_open&quot;: True}" groups="product.group_uom"/>
<label class="oe_grey" string="Setting a product and a source package will result in a partial unpack of the source package (products will be taken out from that package)."/> <field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/>
<field name="packop_ids" groups="stock.group_tracking_lot" <field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/>
context="{'default_sourceloc_id':picking_source_location_id, <field name="result_package_id" groups="stock.group_tracking_lot" context="{'location_id': destinationloc_id}"/>
'default_destinationloc_id':picking_destination_location_id}"> <button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}" groups="stock.group_tracking_lot"/>
<tree editable="bottom"> <field name="lot_id" groups="stock.group_production_lot" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}"/>
<field name="package_id" required="True" on_change="source_package_change(package_id)"/> </tree>
<field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/> </field>
<field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/> </group>
<field name="result_package_id"/> <group string="Packages To Move" groups="stock.group_tracking_lot">
<button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}"/> <div class="oe_grey">
</tree> The source package will be moved entirely. If you specify a destination package, the source package will be put in the destination package.
</field> </div>
</group>
<group>
<field name="packop_ids"
context="{'default_sourceloc_id':picking_source_location_id,
'default_destinationloc_id':picking_destination_location_id}" nolabel="1">
<tree editable="bottom">
<field name="package_id" required="True" on_change="source_package_change(package_id)"/>
<field name="sourceloc_id" domain="[('id', 'child_of', parent.picking_source_location_id)]"/>
<field name="destinationloc_id" domain="[('id', 'child_of', parent.picking_destination_location_id)]"/>
<field name="result_package_id"/>
<button name="put_in_pack" string="Pack" type="object" icon="terp-product" attrs="{'invisible': [('result_package_id', '!=', False)]}"/>
</tree>
</field>
</group>
<footer> <footer>
<button name="do_detailed_transfer" string="_Apply" type="object" class="oe_highlight"/> <button name="do_detailed_transfer" string="_Apply" type="object" class="oe_highlight"/>
or or

2
addons/stock_account/stock_account_view.xml
View File

@ -31,7 +31,7 @@
<field name="model">stock.picking</field> <field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/> <field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//button[@name='do_partial_open_barcode']" position="after"> <xpath expr="//button[@name='do_unreserve']" position="after">
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/> <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
</xpath> </xpath>
<xpath expr="//field[@name='move_type']" position="after"> <xpath expr="//field[@name='move_type']" position="after">