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/98791
Hello
I Have Improved button string & Position menu String and add button to
related view
Thanks.
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stock_picking_usability-mma/+merge/98791
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.py'
--- stock/stock.py 2012-03-21 11:58:21 +0000
+++ stock/stock.py 2012-03-22 07:40:23 +0000
@@ -535,7 +535,7 @@
# Stock Picking
#----------------------------------------------------------
PICK_STATE = [
- ('draft', 'New'),
+ ('draft', 'Draft'),
('auto', 'Waiting Another Operation'),
('confirmed', 'Waiting Availability'),
('assigned', 'Ready to Process'),
@@ -700,9 +700,9 @@
value = 'Received'
elif type == 'internal':
if key == 'assigned':
- value = 'Ready to Move'
+ value = 'Ready to Transfer'
elif key == 'done':
- value = 'Moved'
+ value = 'Transferred'
elif type == 'out':
if key == 'assigned':
value = 'Ready to Deliver'
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-03-21 11:14:45 +0000
+++ stock/stock_view.xml 2012-03-22 07:40:23 +0000
@@ -671,7 +671,7 @@
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date < current_date" string="Internal Moves">
+ <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date < current_date" string="Internal Transfers">
<field name="name"/>
<field name="partner_id" invisible="True"/>
<field name="backorder_id" groups="base.group_extended"/>
@@ -797,11 +797,12 @@
</field>
<group col="10" colspan="4">
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
- <button name="draft_validate" states="draft" string="Move Now" type="object" icon="gtk-media-play"/>
- <button name="action_assign" states="draft" string="Check Availability" type="object" icon="gtk-find"/>
+ <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-ok"/>
+ <button name="draft_validate" states="draft" string="Confirm & Transfer" type="object" icon="gtk-media-play"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
- <button name="action_process" states="assigned" string="Move" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
+ <button name="action_process" states="assigned" string="Transfer" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
+ <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" icon="gtk-execute"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
@@ -1210,12 +1211,12 @@
</field>
<group col="10" colspan="4">
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
- <button name="draft_validate" states="draft" string="Receive Now" type="object" icon="gtk-media-play"/>
- <button name="action_assign" states="draft, confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+ <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-ok"/>
+ <button name="draft_validate" states="draft" string="Confirm & Receive" type="object" icon="gtk-media-play"/>
+ <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
<button name="action_process" states="assigned" string="Receive" type="object" icon="gtk-go-forward"/>
- <button name="%(report_picking_list)d" string="Print Reception" type="action" icon="gtk-print" states="done"/>
- <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+ <button name="%(act_stock_return_picking)d" string="Products Return" states="done" type="action" icon="gtk-execute"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
@@ -1306,8 +1307,8 @@
<field name="arch" type="xml">
<search string="Internal Picking List">
<group>
- <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
- <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
+ <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Transfers"/>
+ <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Transfers" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="origin"/>
@@ -1330,7 +1331,7 @@
</record>
<record id="action_picking_tree6" model="ir.actions.act_window">
- <field name="name">Internal Moves</field>
+ <field name="name">Internal Transfer</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@@ -1338,7 +1339,7 @@
<field name="domain">[('type','=','internal')]</field>
<field name="context">{'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1}</field>
<field name="search_view_id" ref="view_picking_internal_search"/>
- <field name="help">Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.</field>
+ <field name="help">Internal Transfers display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.</field>
</record>
<record model="ir.actions.act_window.view" id="action_picking_tree6_tree_view">
=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py 2012-03-20 12:46:12 +0000
+++ stock/wizard/stock_partial_picking.py 2012-03-22 07:40:23 +0000
@@ -86,14 +86,14 @@
if type == 'in':
node.set('string', '_Receive')
elif type == 'internal':
- node.set('string', '_Move')
+ node.set('string', '_Transfer')
elif type == 'out':
node.set('string', '_Deliver')
for node in doc.xpath("//separator[@string='Products']"):
if type == 'in':
node.set('string', 'Receive Products')
elif type == 'internal':
- node.set('string', 'Move Products')
+ node.set('string', 'Transfer Products')
elif type == 'out':
node.set('string', 'Deliver Products')
res['arch'] = etree.tostring(doc)
_______________________________________________
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
