Merge lp:~unifield-team/unifield-server/us-1096 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/allmsf.pot'
--- bin/addons/msf_profile/i18n/allmsf.pot	2013-10-17 07:46:50 +0000
+++ bin/addons/msf_profile/i18n/allmsf.pot	2017-01-16 10:12:32 +0000
@@ -20017,7 +20017,7 @@
 #: model:ir.ui.menu,name:stock_batch_recall.menu_batch_recall
 #: view:report.batch.recall:0
 #: view:stock.batch.recall:0
-msgid "Batch Recall"
+msgid "Batch Location"
 msgstr ""
 
 #. module: product_asset
 
=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2016-11-17 10:53:26 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2017-01-16 10:12:32 +0000
@@ -45369,8 +45369,8 @@
 #: model:ir.ui.menu,name:stock_batch_recall.menu_batch_recall
 #: view:report.batch.recall:0
 #: view:stock.batch.recall:0
-msgid "Batch Recall"
-msgstr "Recuperación de lotes"
+msgid "Batch Location"
+msgstr "Ubicación de lotes"
 
 #. module: msf_cross_docking
 #: code:addons/msf_cross_docking/cross_docking.py:349
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-02 08:52:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-01-16 10:12:32 +0000
@@ -60235,8 +60235,8 @@
 #: model:ir.ui.menu,name:stock_batch_recall.menu_batch_recall
 #: view:report.batch.recall:0
 #: view:stock.batch.recall:0
-msgid "Batch Recall"
-msgstr "Rappel de Lot"
+msgid "Batch Location"
+msgstr "Emplacements des Lots"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:92
 
=== modified file 'bin/addons/stock_batch_recall/__openerp__.py'
--- bin/addons/stock_batch_recall/__openerp__.py	2011-12-14 16:34:10 +0000
+++ bin/addons/stock_batch_recall/__openerp__.py	2017-01-16 10:12:32 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Batch Recall",
+    "name": "Batch Location",
     "version": "1.0",
     "depends": ["base", "stock_move_tracking", "product_expiry", "specific_rules"],
     "author": "TeMPO Consulting, MSF",
@@ -44,4 +44,4 @@
 #    'certificate': 'certificate',
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/stock_batch_recall/stock.py'
--- bin/addons/stock_batch_recall/stock.py	2015-05-26 14:25:23 +0000
+++ bin/addons/stock_batch_recall/stock.py	2017-01-16 10:12:32 +0000
@@ -29,7 +29,7 @@
 
 class stock_batch_recall(osv.osv_memory):
     _name = 'stock.batch.recall'
-    _description = 'Batch Recall'
+    _description = 'Batch Location'
     
     _columns = {
         'product_id': fields.many2one('product.product', string='Product'),
@@ -87,7 +87,7 @@
 class report_batch_recall(osv.osv):
     _name = 'report.batch.recall'
     _rec_name = 'product_id'
-    _description = 'Batch Recall'
+    _description = 'Batch Location'
     _auto = False
     _columns = {
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
 
=== modified file 'bin/addons/stock_batch_recall/stock_view.xml'
--- bin/addons/stock_batch_recall/stock_view.xml	2012-10-30 16:05:53 +0000
+++ bin/addons/stock_batch_recall/stock_view.xml	2017-01-16 10:12:32 +0000
@@ -7,7 +7,7 @@
 	        <field name="model">report.batch.recall</field>
 	        <field name="type">search</field>
 	        <field name="arch" type="xml">
-	            <search string="Batch Recall">
+	            <search string="Batch Location">
 	                <group expand="0" string="Filters...">
 	                    <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
 	                    <separator orientation="vertical"/>
@@ -28,7 +28,7 @@
 	        <field name="model">report.batch.recall</field>
 	        <field name="type">tree</field>
 	        <field name="arch" type="xml">
-	            <tree string="Batch Recall">
+	            <tree string="Batch Location">
 	                <field name="location_type" invisible="1"/>
 	                <field name="product_id"/>
                     <field name="prodlot_id"/>
@@ -46,7 +46,7 @@
             <field name="model">stock.batch.recall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Batch Recall">
+                <form string="Batch Location">
                     <field name="product_id" colspan="4" />
                     <field name="prodlot_id" colspan="4" />
                     <field name="expired_date" colspan="4" />
@@ -57,7 +57,7 @@
         </record>
         
         <record id="action_batch_recall" model="ir.actions.act_window">
-            <field name="name">Batch Recall</field>
+            <field name="name">Batch Location</field>
             <field name="res_model">stock.batch.recall</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -70,7 +70,7 @@
                   parent="stock.menu_traceability" />
                   
         <record id="action_report_batch_recall" model="ir.actions.act_window">
-            <field name="name">Batch Recall</field>
+            <field name="name">Batch Location</field>
             <field name="res_model">report.batch.recall</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>