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

[jftempo]

=== modified file 'bin/addons/consumption_calculation/consumption_calculation.py'
--- bin/addons/consumption_calculation/consumption_calculation.py	2016-11-17 15:46:10 +0000
+++ bin/addons/consumption_calculation/consumption_calculation.py	2017-01-31 14:44:16 +0000
@@ -159,13 +159,13 @@
     _columns = {
         'name': fields.char(size=64, string='Reference'),
         'creation_date': fields.datetime(string='Creation date', required=1),
-        'cons_location_id': fields.many2one('stock.location', string='Consumer location', domain=[('usage', '=', 'internal')], required=True, select=1),
+        'cons_location_id': fields.many2one('stock.location', string='Source Location', domain=[('usage', '=', 'internal')], required=True, select=1),
         'cons_location_name': fields.function(_get_act_name, method=True, type='char', string='Consumer location Name', readonly=True, size=128, multi='loc_name', store={
-            'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['cons_location_id'], 10),
-            'stock.location': (_get_stock_location, ['name'], 20),
-        },),
-        'activity_id': fields.many2one('stock.location', string='Activity', domain=[('usage', '=', 'customer')], required=1, select=1),
-        'activity_name': fields.function(_get_act_name, method=True, type='char', string='Activity Name', readonly=True, size=128, multi='loc_name', store={
+                'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['cons_location_id'], 10),
+                'stock.location': (_get_stock_location, ['name'], 20),
+            },),
+        'activity_id': fields.many2one('stock.location', string='Destination Location', domain=[('usage', '=', 'customer')], required=1, select=1),
+        'activity_name': fields.function(_get_act_name, method=True, type='char', string='Destination Location', readonly=True, size=128, multi='loc_name', store={
             'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['activity_id'], 10),
             'stock.location': (_get_stock_location, ['name'], 20),
         },),
@@ -1024,7 +1024,7 @@
 
     _columns = {
         'report_id': fields.many2one('real.average.consumption', string='Report'),
-        'location_id': fields.many2one('stock.location', string='Consumer location', required=True),
+        'location_id': fields.many2one('stock.location', string='Source Location', required=True),
     }
 
     def change_location(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/consumption_calculation/consumption_view.xml'
--- bin/addons/consumption_calculation/consumption_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/consumption_calculation/consumption_view.xml	2017-01-31 14:44:16 +0000
@@ -102,8 +102,8 @@
             <field name="arch" type="xml">
                 <tree string="Real consumption reports">
             <field name="name" />
-                    <field name="cons_location_name" string="Consumer location" />
-                    <field name="activity_name" string="Activity" />
+                    <field name="cons_location_name" string="Source Location" />
+                    <field name="activity_name" string="Destination Location" />
                     <field name="period_from" />
                     <field name="period_to" />
                     <field name="nb_lines" />
 
=== modified file 'bin/addons/msf_printed_documents/report/consumption_report.rml'
--- bin/addons/msf_printed_documents/report/consumption_report.rml	2012-07-25 12:07:31 +0000
+++ bin/addons/msf_printed_documents/report/consumption_report.rml	2017-01-31 14:44:16 +0000
@@ -180,7 +180,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation" alignment="LEFT"><b>Location :</b></para>
+                    <para style="TextInformation" alignment="LEFT"><b>Source Location :</b></para>
                 </td>
                 <td>
                     <para style="TextInformation" alignment="LEFT">[[ objects[0].cons_location_id and objects[0].cons_location_id.name or False]]</para>
@@ -194,7 +194,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation" alignment="LEFT"><b>Activity :</b></para>
+                    <para style="TextInformation" alignment="LEFT"><b>Destination Location :</b></para>
                 </td>
                 <td>
                     <para style="TextInformation" alignment="LEFT">[[ objects[0].activity_id and objects[0].activity_id.name or False]]</para>
 
=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2016-12-13 14:54:56 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2017-01-31 14:44:16 +0000
@@ -11670,7 +11670,7 @@
 #. module: consumption_calculation
 #: field:real.average.consumption,cons_location_id:0
 #: field:real.consumption.change.location,location_id:0
-msgid "Consumer location"
+msgid "Source Location"
 msgstr "Ubicación de consumo"
 
 #. module: msf_doc_import
@@ -62621,12 +62621,16 @@
 msgid "No correction journal found!"
 msgstr "¡No se ha encontrado un diario de corrección!"
 
-#. modules: base, consumption_calculation
+#. module: base
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
+msgid "Activity"
+msgstr "Actividad"
+
+#. module: consumption_calculation
 #: view:real.average.consumption:0
 #: field:real.average.consumption,activity_id:0
-msgid "Activity"
+msgid "Destination Location"
 msgstr "Actividad"
 
 #. module: register_accounting
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-23 16:14:11 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-01-31 14:44:16 +0000
@@ -870,14 +870,18 @@
 msgid "module base cannot be loaded! (hint: verify addons-path)"
 msgstr "le module ne peut être chargé! (astuce: vérifier chemin des addons)"
 
-#. modules: base, consumption_calculation
+#. module: base
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
-#: view:real.average.consumption:0
-#: field:real.average.consumption,activity_id:0
 msgid "Activity"
 msgstr "Activité"
 
+#. module: consumption_calculation
+#: view:real.average.consumption:0
+#: field:real.average.consumption,activity_id:0
+msgid "Destination Location"
+msgstr "Destination - Zone"
+
 #. module: base
 #: model:res.currency,currency_name:base.KES
 msgid "KENYAN SHILLING"
@@ -6129,8 +6133,8 @@
 
 #. module: sale
 #: report:msf.consumption_report:0
-msgid "Activity :"
-msgstr "Activité :"
+msgid "Destination Location :"
+msgstr "Destination - Zone :"
 
 #. module: purchase_compare_rfq
 #: view:wizard.choose.supplier:0
@@ -14274,7 +14278,7 @@
 msgid "Saint Lucia"
 msgstr "Sainte-Lucie"
 
-#. modules: msf_outgoing, stock_move_tracking, stock_override, specific_rules, kit, stock
+#. modules: msf_outgoing, stock_move_tracking, stock_override, specific_rules, kit, stock, consumption_calculation
 #: field:kit.creation.to.consume,location_src_id_to_consume:0
 #: field:process.to.consume.line,location_src_id_process_to_consume:0
 #: field:substitute.item,location_id_substitute_item:0
@@ -14297,6 +14301,9 @@
 #: code:addons/msf_doc_import/wizard/__init__.py:78
 #: report:delivery.order:0
 #: report:internal.move:0
+#: field:real.average.consumption,cons_location_id:0
+#: field:real.consumption.change.location,location_id:0
+#: view:real.average.consumption:0
 msgid "Source Location"
 msgstr "Zone Source"
 
@@ -16193,12 +16200,6 @@
 msgid "Delivery Lead Time"
 msgstr "Délai de Livraison"
 
-#. module: consumption_calculation
-#: field:real.average.consumption,cons_location_id:0
-#: field:real.consumption.change.location,location_id:0
-msgid "Consumer location"
-msgstr "Zone Consommateur"
-
 #. module: sale_override
 #: model:ir.module.module,shortdesc:sale_override.module_meta_information
 msgid "Sale override"
@@ -69582,11 +69583,16 @@
 
 #. modules: consumption_calculation, sale
 #: report:expiry.report:0
-#: report:msf.consumption_report:0
 #: report:msf.product_list:0
 msgid "Location :"
 msgstr "Zone:"
 
+#. module: consumption_calculation
+#: report:msf.consumption_report:0
+msgid "Location :"
+msgstr "Zone Source :"
+
+
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
@@ -76088,3 +76094,8 @@
 #, python-format
 msgid "A line was added to the %s %s to re-source the canceled line."
 msgstr "Une ligne a été ajoutée a la %s %s pour 're-sourcer' la ligne annulée."
+
+#. modules: sale, msf_printed_documents
+#: report:msf.consumption_report:0
+msgid "Source Location :"
+msgstr "Source Location :"