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

[jftempo]

=== 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:13:32 +0000
@@ -9862,15 +9862,31 @@
 msgid "When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used."
 msgstr "Lors de la valorisation en temps réel de l'inventaire, des lignes d'écritures du Journal de la contrepartie correspondantes à tous les mouvements d'entrée stock seront comptabilisées sous ce compte. Si la valorisation n'est pas établie sur le produit, alors celle de la catégorie du produit sera utilisée.  "
 
-#. modules: msf_doc_import, msf_partner, tender_flow, sale
+#. modules: msf_doc_import, msf_partner, tender_flow, sale, sale_override
 #: field:wizard.import.fo.line,fo_id:0
 #: field:wizard.import.ir.line,fo_id:0
 #: model:ir.actions.act_window,name:msf_partner.act_res_partner_2_sale_order
 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:509
 #: report:sale.order.allocation.report:0
+#: code:addons/sale_override/sale.py:3120
 msgid "Field Order"
 msgstr "Commande de Terrain"
 
+#. module: sale_override
+#: code:addons/sale_override/sale.py:628
+#: code:addons/sale_override/sale.py:641
+#: code:addons/sale_override/sale.py:1523
+#: code:addons/sale_override/sale.py:2053
+#, python-format
+msgid "Field order"
+msgstr "Commande de terrain"
+
+#. module: sale_override
+#: code:addons/sale_override/sale.py:1525
+#, python-format
+msgid "The %s %s has been created to re-source the canceled needs"
+msgstr "La %s %s a été créé pour 're-sourcer' les besoins annulés"
+
 #. module: base
 #: field:res.config.users,action_id:0
 #: field:res.users,action_id:0
@@ -38904,6 +38920,14 @@
 msgid "Internal Request"
 msgstr "Demande Interne"
 
+#. module: sale_override     
+#: code:addons/sale_override/sale.py:641     
+#: code:addons/sale_override/sale.py:1523     
+#: code:addons/sale_override/sale.py:2053     
+#, python-format 
+msgid "Internal request"
+msgstr "Demande interne"
+
 #. module: base
 #: help:ir.ui.view,xml_id:0
 msgid "ID of the view defined in xml file"
@@ -75814,6 +75838,7 @@
 msgid "Partner Created on this instance"
 msgstr "Partenaire créé sur cette instance"
 
+<<<<<<< TREE
 #. module: account_reconciliation
 #: code:addons/account_reconciliation/wizard/account_reconcile.py:207
 #, python-format
@@ -75854,3 +75879,12 @@
 #, python-format
 msgid "Wrong total: %.2f, instead of: %.2f"
 msgstr "Total erroné : %.2f, au lieu de : %.2f"
+=======
+#. module: sale_override
+#: code:addons/sale_override/sale.py:3119
+#, 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."
+
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-11-09 09:07:38 +0000
+++ bin/addons/sale_override/sale.py	2017-01-16 10:13:32 +0000
@@ -638,7 +638,7 @@
         res = super(sale_order, self).action_cancel(cr, uid, ids, context=context)
         for order in self.read(cr, uid, ids, ['procurement_request', 'name'], context=context):
             self.infolog(cr, uid, "The %s id:%s (%s) has been canceled." % (
-                order['procurement_request'] and  'Internal request' or 'Field order',
+                order['procurement_request'] and  _('Internal request') or _('Field order'),
                 order['id'], order['name'],
             ))
         return res
@@ -1518,9 +1518,14 @@
                                                  'fo_to_resource': True}, context=context)
 
 
-        order_name = self.read(cr, uid, order_id, ['name'], context=context)['name']
+        order_data = self.read(cr, uid, [order_id], ['name', 'procurement_request'], context=context)[0]
+        order_name = order_data['name']
+        order_type = order_data['procurement_request'] and _('Internal request') or _('Field order')
 
-        self.log(cr, uid, order_id, _('The Field order %s has been created to re-source the canceled needs') % order_name, context=dict(context, procurement_request=order.procurement_request))
+        self.log(cr, uid, order_id, _('The %s %s has been created to re-source the canceled needs') % (
+            order_name,
+            order_type,
+        ), context=dict(context, procurement_request=order.procurement_request))
 
         return order_id
 
@@ -2045,7 +2050,7 @@
                             msg_type.get('out', {}).get(picking_data.get('subtype', ''), '') or \
                             msg_type.get(picking_data.get('type', ''), ''),
                             picking_id, picking_data.get('name', ''),
-                            order.procurement_request and 'Internal request' or 'Field order',
+                            order.procurement_request and _('Internal request') or _('Field order'),
                             order.id, order.name,
                         ))
 
@@ -3116,7 +3121,10 @@
         form was opened with 'Enter a Reason for Incoming cancellation' name
         we just keep the view id (2 distincts ids for FO/IR)"""
         self.pool.get('sale.order').log(cr, uid, order_id,
-                                        _('A line was added to the Field Order %s to re-source the canceled line.') % (order_name),
+                                        _('A line was added to the %s %s to re-source the canceled line.') % (
+                                            line.order_id and line.order_id.procurement_request and _('Internal Request') or _('Field Order'),
+                                            order_name
+                                        ),
                                         context={'view_id': context.get('view_id', False)})
 
         return line_id