From da01a647823c88b75353c584f98b8c7633c53681 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 22 Mar 2012 12:50:39 +0530
Subject: [PATCH 1/3] [IMP]stock: Improved button string & Position menu String
 and add button to releated view

bzr revid: mma@tinyerp.com-20120322072039-y4bq2t2q7c06uko2
---
 addons/stock/stock.py                        |  6 ++---
 addons/stock/stock_view.xml                  | 25 ++++++++++----------
 addons/stock/wizard/stock_partial_picking.py |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f667cd30479..beaa3f4aeb4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -535,7 +535,7 @@ stock_tracking()
 # Stock Picking
 #----------------------------------------------------------
 PICK_STATE = [
-            ('draft', 'New'),
+            ('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
@@ -700,9 +700,9 @@ class stock_picking(osv.osv):
                                 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'
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 17822664998..4674d8e5ba5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -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 &lt; current_date" string="Internal Moves">
+                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date &lt; 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 &amp; 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','&lt;&gt;','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 &amp; 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','&lt;&gt;','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">
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index bf49493b3e6..eca792d2279 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -86,14 +86,14 @@ class stock_partial_picking(osv.osv_memory):
                 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)

From b36ba932c9e13c75221906a2a725fa2b0417383c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 23 Mar 2012 11:14:03 +0530
Subject: [PATCH 2/3] [IMP]stock: Improved label string for translation

bzr revid: mma@tinyerp.com-20120323054403-9fikf2fjkp97npt2
---
 addons/stock/stock.py                        | 26 ++++++++++----------
 addons/stock/wizard/stock_partial_picking.py | 12 ++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index beaa3f4aeb4..9b9112ef351 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -681,11 +681,11 @@ class stock_picking(osv.osv):
                     if report['report_name'] != 'stock.picking.list':
                         continue
                     if type == 'in':
-                        report['string'] = 'Incoming Shipment'
+                        report['string'] = _('Incoming Shipment')
                     elif type == 'internal':
-                        report['string'] = 'Internal Shipment'
+                        report['string'] = _('Internal Shipment')
                     elif type == 'out':
-                        report['string'] = 'Delivery Order'
+                        report['string'] = _('Delivery Order')
                     report['name'] = report['string']
 
             for field in res['fields']:
@@ -695,31 +695,31 @@ class stock_picking(osv.osv):
                     for key, value in PICK_STATE:
                         if type == 'in':
                             if key == 'assigned':
-                                value = 'Ready to Receive'
+                                value = _('Ready to Receive')
                             elif key == 'done':
-                                value = 'Received'
+                                value = _('Received')
                         elif type == 'internal':
                             if key == 'assigned':
-                                value = 'Ready to Transfer'
+                                value = _('Ready to Transfer')
                             elif key == 'done':
-                                value = 'Transferred'
+                                value = _('Transferred')
                         elif type == 'out':
                             if key == 'assigned':
-                                value = 'Ready to Deliver'
+                                value = _('Ready to Deliver')
                             elif key == 'done':
-                                value = 'Delivered'
+                                value = _('Delivered')
                         _state.append((key,value))
                     res['fields']['state']['selection'] = _state
                 # To update the fields tooltips according to shipping type
                 if field == 'address_id':
                     _tooltip = ''
                     if type == 'in':
-                        _tooltip = "supplier"
+                        _tooltip = _('supplier')
                     elif type == 'internal':
-                        _tooltip="warehouse"
+                        _tooltip = _('warehouse')
                     elif type == 'out':
-                        _tooltip="customer"
-                    res['fields']['address_id']['help'] = "Address of %s" %(_tooltip)
+                        _tooltip = _('customer')
+                    res['fields']['address_id']['help'] = _("Address of %s") %(_tooltip)
         return res
 
     def action_process(self, cr, uid, ids, context=None):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index eca792d2279..8a256258c52 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -84,18 +84,18 @@ class stock_partial_picking(osv.osv_memory):
             doc = etree.XML(res['arch'])
             for node in doc.xpath("//group/button[@string='_Validate']"):
                 if type == 'in':
-                    node.set('string', '_Receive')
+                    node.set('string', _('_Receive'))
                 elif type == 'internal':
-                    node.set('string', '_Transfer')
+                    node.set('string', _('_Transfer'))
                 elif type == 'out':
-                    node.set('string', '_Deliver')
+                    node.set('string', _('_Deliver'))
             for node in doc.xpath("//separator[@string='Products']"):
                 if type == 'in':
-                    node.set('string', 'Receive Products')
+                    node.set('string', _('Receive Products'))
                 elif type == 'internal':
-                    node.set('string', 'Transfer Products')
+                    node.set('string', _('Transfer Products'))
                 elif type == 'out':
-                    node.set('string', 'Deliver Products')
+                    node.set('string', _('Deliver Products'))
             res['arch'] = etree.tostring(doc)
         return res
 

From 1cc25d8914d5fed43feebcba5c1eb5f8b9c95053 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 23 Mar 2012 12:22:13 +0530
Subject: [PATCH 3/3] [IMP]stock: Improved search button string according to
 view of stock.picking model

bzr revid: mma@tinyerp.com-20120323065213-dd1qml01224ujbh6
---
 addons/stock/stock_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 4674d8e5ba5..20a3da0617c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1023,9 +1023,9 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
-                        <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
+                        <filter icon="terp-check" name="available" string="Ready To Deliver" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
+                        <filter icon="terp-dialog-close" name="done" string="Delivered" domain="[('state','=','done')]" help="Delivery orders already Delivered"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
@@ -1241,8 +1241,8 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
-                        <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
+                        <filter icon="terp-check" name="available" string="Ready To Receive" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
+                        <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
@@ -1307,7 +1307,7 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
-                        <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Transfers"/>
+                        <filter icon="terp-check" string="Ready To Transfer" 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"/>
@@ -1674,7 +1674,7 @@
                     <group>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
+                        <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state', '=', 'done')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
@@ -1707,7 +1707,7 @@
                     <group>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="terp-dialog-close" name="received" string="Delivered" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>