Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability-mma into
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stock_picking_usability-mma/+merge/99488
Hello,
Stock : I have improved icon of stock move & string of return wizard
Thanks,
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stock_picking_usability-mma/+merge/99488
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability-mma into
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability.
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-03-26 09:10:26 +0000
+++ stock/stock_view.xml 2012-03-27 10:23:18 +0000
@@ -714,7 +714,7 @@
<field name="product_uos" groups="product.group_uos"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"
groups="base.group_extended"/>
<field name="scrapped" invisible="1"/>
@@ -723,17 +723,17 @@
name="%(stock.track_line)d"
string="Split in production lots"
groups="base.group_extended"
- type="action" icon="terp-stock_effects-object-colorize"
+ type="action" icon="STOCK_JUSTIFY_FILL"
states="draft,waiting,confirmed,assigned" />
<field groups="base.group_extended" name="tracking_id"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
attrs="{'invisible': [('tracking_id','<>',False)]}"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver"
groups="base.group_extended"
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed"/>
<field name="location_id"/>
<field name="location_dest_id"/>
@@ -748,7 +748,7 @@
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
<button name="%(stock.move_scrap)d"
string="Scrap" type="action" groups="base.group_extended"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
<field name="product_uom" string="Unit of Measure" colspan="4"/>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
@@ -774,7 +774,7 @@
<field name="tracking_id" groups="base.group_extended" colspan="3"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
@@ -783,7 +783,7 @@
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+ string="Split" type="action" icon="STOCK_JUSTIFY_FILL" colspan="1" />
</group>
<label string="" colspan="4"/>
<field name="state"/>
@@ -910,22 +910,22 @@
<field name="product_uos" groups="product.group_uos"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
<field name="scrapped" invisible="1"/>
<field name="prodlot_id" groups="base.group_extended"/>
<button name="%(track_line)d" string="Split in production lots" type="action"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}"
+ icon="STOCK_JUSTIFY_FILL" attrs="{'invisible': [('prodlot_id','<>',False)]}"
states="draft,assigned,confirmed"
groups="base.group_extended"/>
<field name="tracking_id" groups="base.group_extended"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
attrs="{'invisible': [('tracking_id','<>',False)]}"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver"
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
groups="base.group_extended"
states="draft,assigned,confirmed"/>
<field name="location_id"/>
@@ -941,7 +941,7 @@
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3" />
<button name="%(stock.move_scrap)d"
string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/>
<field name="product_uom" string="Unit of Measure" colspan="4" />
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
@@ -967,7 +967,7 @@
<field name="tracking_id" groups="base.group_extended" colspan="3" />
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
@@ -976,7 +976,7 @@
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+ string="Split" type="action" icon="STOCK_JUSTIFY_FILL" colspan="1" />
</group>
<label string="" colspan="4"/>
<field name="state"/>
@@ -1132,7 +1132,7 @@
<field name="product_uom" string="UoM" />
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"
groups="base.group_extended"/>
<field name="scrapped" invisible="1"/>
@@ -1141,16 +1141,16 @@
name="%(stock.track_line)d"
string="Split in production lots"
groups="base.group_extended"
- type="action" icon="terp-stock_effects-object-colorize"
+ type="action" icon="STOCK_JUSTIFY_FILL"
states="draft,waiting,confirmed,assigned" />
<field name="tracking_id" groups="base.group_extended"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','<>',False)]}"
+ icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','<>',False)]}"
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed"/>
<field name="location_dest_id"/>
<field name="state"/>
@@ -1163,7 +1163,7 @@
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
<button name="%(stock.move_scrap)d"
string="Scrap" type="action" groups="base.group_extended"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
<field name="product_uom" string="Unit of Measure" colspan="4"/>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
@@ -1189,7 +1189,7 @@
<field name="tracking_id" groups="base.group_extended" colspan="3" />
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
@@ -1198,7 +1198,7 @@
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+ string="Split" type="action" icon="STOCK_JUSTIFY_FILL" colspan="1" />
</group>
<label string="" colspan="4"/>
<field name="state"/>
@@ -1378,22 +1378,22 @@
<field name="product_uos" groups="product.group_uos"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"
groups="base.group_extended"/>
<field name="prodlot_id" groups="base.group_extended"/>
<button name="%(track_line)d" string="Split in production lots" type="action"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}"
+ icon="STOCK_JUSTIFY_FILL" attrs="{'invisible': [('prodlot_id','<>',False)]}"
states="draft,waiting,confirmed,assigned,done"
groups="base.group_extended"/>
<field groups="base.group_extended" name="tracking_id"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','<>',False)]}"
+ icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','<>',False)]}"
states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed,done"/>
<field name="location_id"/>
<field name="location_dest_id"/>
@@ -1420,7 +1420,7 @@
<field name="product_uom" string="Unit of Measure"/>
<button name="%(stock.move_scrap)d" groups="base.group_extended"
string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
<newline/>
<field name="location_id"/>
@@ -1453,7 +1453,7 @@
<field name="tracking_id" colspan="3" groups="base.group_extended"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
@@ -1462,7 +1462,7 @@
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+ string="Split" type="action" icon="STOCK_JUSTIFY_FILL" colspan="1"/>
</group>
<separator colspan="4"/>
@@ -1551,22 +1551,22 @@
<field name="product_uom" string="UoM"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" groups="base.group_extended"/>
<field name="prodlot_id" groups="base.group_extended"/>
<button name="%(track_line)d" string="Split in production lots" type="action"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}"
+ icon="STOCK_JUSTIFY_FILL" attrs="{'invisible': [('prodlot_id','<>',False)]}"
states="draft,waiting,confirmed,assigned,done"
groups="base.group_extended"/>
<field name="tracking_id" groups="base.group_extended"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
attrs="{'invisible': [('tracking_id','<>',False)]}"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver"
states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed,done"/>
<field name="date" groups="base.group_no_one"/>
<field name="state"/>
@@ -1608,7 +1608,7 @@
<field name="product_uom" string="Unit of Measure"/>
<button name="%(stock.move_scrap)d" groups="base.group_extended"
string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
+ icon="terp-stock_effects-object-colorize" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
<newline/>
<field name="location_id"/>
@@ -1641,7 +1641,7 @@
<field name="tracking_id" colspan="3" groups="base.group_extended"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
- icon="terp-stock_effects-object-colorize"
+ icon="terp-accessories-archiver+"
states="draft,assigned,confirmed,done" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
@@ -1650,7 +1650,7 @@
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned,done"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+ string="Split" type="action" icon="STOCK_JUSTIFY_FILL" colspan="1"/>
</group>
<separator colspan="4"/>
=== modified file 'stock/wizard/stock_return_picking_view.xml'
--- stock/wizard/stock_return_picking_view.xml 2011-10-16 01:28:00 +0000
+++ stock/wizard/stock_return_picking_view.xml 2012-03-27 10:23:18 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <act_window name="Return Picking"
+ <act_window name="Return Shipment"
res_model="stock.return.picking"
src_model="stock.picking"
view_mode="form"
_______________________________________________
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
