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

[jftempo]

=== added file 'bin/addons/msf_profile/i18n/en.po'
=== modified file 'bin/addons/msf_profile/i18n/en_MF.po'
--- bin/addons/msf_profile/i18n/en_MF.po	2016-09-12 08:55:55 +0000
+++ bin/addons/msf_profile/i18n/en_MF.po	2017-01-16 10:10:06 +0000
@@ -394,6 +394,18 @@
 msgid "Sale Order"
 msgstr "Field Order"
 
+#. module: tender_flow
+#: view:tender:0
+#: field:tender,sale_order_id:0
+msgid "Sale Order"
+msgstr "Source Document"
+
+#. module: tender_flow, purchase_compare_rfq
+#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:509
+#: field:wizard.compare.rfq,sale_order_id:0
+msgid "Field Order"
+msgstr "Source Document"
+
 #. module: sales_followup
 #: model:ir.model,name:sales_followup.model_sale_order_followup_from_menu
 msgid "Sale order followup menu entry"

=== 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:10:06 +0000
@@ -9866,10 +9866,15 @@
 #: 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:sale.order.allocation.report:0
+msgid "Field Order"
+msgstr "Commande de Terrain"
+
+#. modules: tender_flow, purchase_compare_rfq
 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:509
-#: report:sale.order.allocation.report:0
+#: field:wizard.compare.rfq,sale_order_id:0
 msgid "Field Order"
-msgstr "Commande de Terrain"
+msgstr "Document source"
 
 #. module: base
 #: field:res.config.users,action_id:0
@@ -45461,16 +45466,20 @@
 msgid "Accounts Type Allowed (empty for no control)"
 msgstr "Type de Comptes Autorisés (vides pour non contrôle)"
 
-#. modules: return_claim, sourcing, documents_done, tender_flow, analytic_distribution, analytic_distribution_supply
+#. modules: return_claim, sourcing, documents_done, analytic_distribution, analytic_distribution_supply
 #: field:analytic.distribution.wizard,sale_order_id:0
 #: selection:documents.done.wizard,model:0
 #: field:return.claim,so_id_return_claim:0
 #: view:sourcing.line:0
+#: field:account.invoice,order_ids:0
+msgid "Sale Order"
+msgstr "Commande de Terrain"
+
+#. module: tender_flow
 #: view:tender:0
 #: field:tender,sale_order_id:0
-#: field:account.invoice,order_ids:0
 msgid "Sale Order"
-msgstr "Commande de Terrain"
+msgstr "Document source"
 
 #. modules: purchase, account, base_setup, sale, stock
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -74843,6 +74852,8 @@
 
 #. module: purchase_override
 #: report:msf.purchase.order:0
+#: report:msf.purchase.quotation:0
+#: report:purchase.order.merged:0
 msgid "Source Document :"
 msgstr "Document source :"
 

=== modified file 'bin/addons/purchase_override/report/rfq.rml'
--- bin/addons/purchase_override/report/rfq.rml	2016-11-09 15:33:58 +0000
+++ bin/addons/purchase_override/report/rfq.rml	2017-01-16 10:10:06 +0000
@@ -96,7 +96,7 @@
         <blockTable colWidths="772.0" style="OrderInformations">
             <tr>
                 <td>
-                    <para style="TextInformationOrigin">Origin ref. : [[ encode_origin(objects[0].origin) ]]</para>
+                    <para style="TextInformationOrigin">Source Document : [[ encode_origin(objects[0].origin) ]]</para>
                 </td>
             </tr>
             <tr>