From b9980eda5c0e48ee281c3d144284bd575e98db69 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 2 Jun 2017 13:45:53 +0200
Subject: [PATCH] [IMP] payment,*: Relabel 'Payment Method' into 'Payment
 Acquirer'

---
 addons/payment/data/payment_acquirer_data.xml  |  2 +-
 addons/payment/views/payment_views.xml         |  4 ++--
 .../data/payment_acquirer_data.xml             |  2 +-
 .../views/website_payment_templates.xml        | 18 +++++++++---------
 .../views/sale_config_settings_views.xml       |  2 +-
 .../website_quote/views/sale_quote_views.xml   |  2 +-
 .../views/website_quote_templates.xml          |  2 +-
 addons/website_sale/data/web_planner_data.xml  | 12 ++++++------
 .../views/report_shop_saleorder.xml            |  2 +-
 addons/website_sale/views/sale_order_views.xml | 14 +-------------
 addons/website_sale/views/templates.xml        |  6 +++---
 11 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml
index 174c8b4a998..5908c6e5366 100644
--- a/addons/payment/data/payment_acquirer_data.xml
+++ b/addons/payment/data/payment_acquirer_data.xml
@@ -160,7 +160,7 @@
         <field name="module_id" ref="base.module_payment_transfer"/>
         <field name="description" type="html">
             <p>
-                A generic payment method to send payment instructions to any payment acquirer.
+                A generic payment acquirer to send payment instructions to any payment acquirer.
             </p>
             <ul class="list-inline">
                 <li><i class="fa fa-check"/>Online Payment</li>
diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml
index ef611b73e81..e40c7e9049b 100644
--- a/addons/payment/views/payment_views.xml
+++ b/addons/payment/views/payment_views.xml
@@ -190,13 +190,13 @@
         </record>
 
         <record id="action_payment_acquirer" model="ir.actions.act_window">
-            <field name="name">Payment Methods</field>
+            <field name="name">Payment Acquirers</field>
             <field name="res_model">payment.acquirer</field>
             <field name='view_type'>form</field>
             <field name='view_mode'>kanban,tree,form</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
-                    Click to create a payment method.
+                    Click to create a payment acquirer.
                 </p>
             </field>
         </record>
diff --git a/addons/payment_transfer/data/payment_acquirer_data.xml b/addons/payment_transfer/data/payment_acquirer_data.xml
index 0eee54a9259..cce3869a8ed 100644
--- a/addons/payment_transfer/data/payment_acquirer_data.xml
+++ b/addons/payment_transfer/data/payment_acquirer_data.xml
@@ -11,7 +11,7 @@
             <field name="environment">test</field>
             <field name="website_published" eval="True"/>
             <field name="pre_msg"><![CDATA[
-<p>Transfer information will be provided after choosing the payment method.</p>]]>
+<p>Transfer information will be provided after choosing the payment aquirer.</p>]]>
             </field>
         </record>
 
diff --git a/addons/website_payment/views/website_payment_templates.xml b/addons/website_payment/views/website_payment_templates.xml
index a7ec331cc59..074d59a0552 100644
--- a/addons/website_payment/views/website_payment_templates.xml
+++ b/addons/website_payment/views/website_payment_templates.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <template id="header_footer_custom_payment" inherit_id="website.footer_default" customize_show="True" active="False" name="Payment Methods">
+        <template id="header_footer_custom_payment" inherit_id="website.footer_default" customize_show="True" active="False" name="Payment Acquirers">
             <xpath expr="//div[@id='info']" position="inside">
-                <h4 class="payment_method_title">Payment Method</h4>
+                <h4 class="payment_method_title">Payment Acquirer</h4>
                 <ul class="payment_method_list list-inline">
                     <t t-foreach="request.website.payment_acquirers()" t-as="acquirer">
                         <li>
@@ -24,21 +24,21 @@
       </xpath>
     </template>
 
-    <template id="pay_methods" name="Payment Methods">
+    <template id="pay_methods" name="Payment Acquirers">
         <t t-call="website.layout">
-            <t t-set="additional_title">Payment Methods</t>
+            <t t-set="additional_title">Payment Acquirers</t>
             <div class="wrap">
                 <div class="container">
                   <div class="row">
                         <div class="col-sm-6">
                             <ol class="breadcrumb mt8">
                                 <li><a href="/my/home"><i class="fa fa-home"/></a></li>
-                                <li>Payment Methods</li>
+                                <li>Payment Acquirers</li>
                             </ol>
                         </div>
                     </div>
-                    <h1>Payment Methods</h1>
-                    <h4 t-if="acquirers">Add a new payment method:</h4>
+                    <h1>Payment Acquirers</h1>
+                    <h4 t-if="acquirers">Add a new payment acquirer:</h4>
                     <div t-if="acquirers" class="row">
                         <div class="col-md-6">
                             <div t-if="error_message" class="alert alert-danger">
@@ -58,7 +58,7 @@
                         </div>
                     </div>
                     <div class="clearfix"></div>
-                    <h4>Delete a payment method:</h4>
+                    <h4>Delete a payment acquirer:</h4>
                     <div class="row">
                         <div class="col-md-6">
                             <form method="post" action="/website_payment/delete/">
@@ -83,7 +83,7 @@
     <template id="pay_meth_link" inherit_id="website_portal.portal_layout" customize_show="True">
         <xpath expr="//div[@class='o_my_details']" position="inside">
             <t t-if="request.env['payment.acquirer'].search([('website_published', '=', True), ('registration_view_template_id', '!=', False)])">
-                <div class='manage_payment_method mt16'><a href="/my/payment_method">Manage your payment methods</a></div>
+                <div class='manage_payment_method mt16'><a href="/my/payment_method">Manage your payment acquirers</a></div>
             </t>
         </xpath>
     </template>
diff --git a/addons/website_quote/views/sale_config_settings_views.xml b/addons/website_quote/views/sale_config_settings_views.xml
index bdb1da250f6..67192198e75 100644
--- a/addons/website_quote/views/sale_config_settings_views.xml
+++ b/addons/website_quote/views/sale_config_settings_views.xml
@@ -15,7 +15,7 @@
                     <button name="%(website_quote.action_sale_quotation_template)d" icon="fa-arrow-right" type="action" string="Quotation Templates" class="btn-link"/>
                 </div>
                 <div attrs="{'invisible': [('module_website_quote','=',False)]}">
-                    <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Methods" class="btn-link"/>
+                    <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Acquirers" class="btn-link"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/website_quote/views/sale_quote_views.xml b/addons/website_quote/views/sale_quote_views.xml
index 7e18b904f46..e170a77d441 100644
--- a/addons/website_quote/views/sale_quote_views.xml
+++ b/addons/website_quote/views/sale_quote_views.xml
@@ -120,5 +120,5 @@
 
         <menuitem id="menu_sale_quote_template" action="action_sale_quotation_template" parent="sale.menu_sales_config" sequence="1" name="Quotation Templates" groups="sales_team.group_sale_salesman,sales_team.group_sale_manager"/>
 
-        <menuitem id='payment_acquirer_menu_sale' action='payment.action_payment_acquirer' parent='sale.menu_sales_config' sequence='3' name='Payment Methods' groups="sales_team.group_sale_salesman"/>
+        <menuitem id='payment_acquirer_menu_sale' action='payment.action_payment_acquirer' parent='sale.menu_sales_config' sequence='3' name='Payment Acquirers' groups="sales_team.group_sale_salesman"/>
 </odoo>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index e5e8df5c62c..c4a8e7c908e 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -342,7 +342,7 @@
                               <!-- begin website_sale code -->
                               <div t-if="acquirers" id="payment_method" class="row text-left">
                                 <div class="col-md-6">
-                                  <h4>Payment Method:</h4>
+                                  <h4>Payment Acquirer:</h4>
                                   <ul class="list-unstyled">
                                     <t t-set="payment_methods_available" t-value="False"/>
                                     <li t-foreach="acquirers or []" t-as="acquirer">
diff --git a/addons/website_sale/data/web_planner_data.xml b/addons/website_sale/data/web_planner_data.xml
index 43ad4c7d846..29bdcc5638c 100644
--- a/addons/website_sale/data/web_planner_data.xml
+++ b/addons/website_sale/data/web_planner_data.xml
@@ -115,14 +115,14 @@
                         <div class="col-sm-1 col-md-2 icon"><span class="fa fa-question-circle "/></div>
                         <div class="col-sm-11 col-md-10">
                             <p><strong>Reassurance arguments</strong><br/>
-                            Anticipate your customers questions &amp; worries on practical details like shipping rates &amp; policies, return &amp; replacement policies, payment methods &amp; security and your <a href="https://www.odoo.com/documentation/user/online/ecommerce/managing_products/stock.html" target="_blank">product's availability (In Stock, Not Available, etc.)</a>.
+                            Anticipate your customers questions &amp; worries on practical details like shipping rates &amp; policies, return &amp; replacement policies, payment acquirers &amp; security and your <a href="https://www.odoo.com/documentation/user/online/ecommerce/managing_products/stock.html" target="_blank">product's availability (In Stock, Not Available, etc.)</a>.
                             </p>
                         </div>
                     </div>
 
                     <div class="alert alert-info info_icon" role="alert">
                         <span class="fa fa-lightbulb-o fa-2x"></span>
-                        <p>Put the practical details (shipping, payment methods, etc.) as links in the footer; That way, they will be accessible 
+                        <p>Put the practical details (shipping, payment acquirers, etc.) as links in the footer; That way, they will be accessible 
                             all your product pages.</p>
                     </div>
             
@@ -322,12 +322,12 @@
                 </t>
 
                 <t t-call="web_planner.page">
-                    <t t-set="page_title">Payment Methods</t>
+                    <t t-set="page_title">Payment Acquirers</t>
                     <p class="text-muted">
                         To collect payments, you can either request your customers to process it manually (wire transfer, etc.) or redirect them to payment acquirers.<br/>
                         Using payment acquirers costs you money, so take some time to compare them.
                     </p>
-                    <h4>You can setup 3 types of <strong>payment methods in Odoo:</strong></h4>
+                    <h4>You can setup 3 types of <strong>payment acquirers in Odoo:</strong></h4>
                     <div class="row">
                         <div class="col-md-6 col-xs-12">
                             <div class="panel panel-success">
@@ -383,11 +383,11 @@
                             <p>
                                 <strong>Next actions:</strong>                      
 
-                                <li><a href="https://www.odoo.com/documentation/user/online/ecommerce/shopper_experience/payment.html" target="blank">See how to configure payment methods</a><br/></li><br/>
+                                <li><a href="https://www.odoo.com/documentation/user/online/ecommerce/shopper_experience/payment.html" target="blank">See how to configure payment acquirers</a><br/></li><br/>
                                 <div class="alert alert-info info_icon" role="alert">
                                         <span class="fa fa-lightbulb-o fa-2x"></span>
                                         <li>Some acquirers like Authorize.net and Ingenico can be used as payment gateways with your own payment processor.</li>
-                                        <li><strong>Tip for B2B users:</strong> you can create new manually-processed payment methods (check, purchase order, etc.) by renaming 'Wire Transfer' or duplicating it.</li>
+                                        <li><strong>Tip for B2B users:</strong> you can create new manually-processed payment acquirers (check, purchase order, etc.) by renaming 'Wire Transfer' or duplicating it.</li>
                                 </div>
                             </p>
                     </div>
diff --git a/addons/website_sale/views/report_shop_saleorder.xml b/addons/website_sale/views/report_shop_saleorder.xml
index f8fd2600c7b..f38ce5433e6 100644
--- a/addons/website_sale/views/report_shop_saleorder.xml
+++ b/addons/website_sale/views/report_shop_saleorder.xml
@@ -13,7 +13,7 @@
                    <tbody class="sale_tbody">
                         <tr>
                             <td>
-                                <strong>Payment Method:</strong> <t t-esc="doc.payment_acquirer_id.name"/><br />
+                                <strong>Payment Acquirer:</strong> <t t-esc="doc.payment_acquirer_id.name"/><br />
                                 <strong>Payment Status:</strong>
                                 <t t-if="doc.payment_acquirer_id.journal_id">
                                     <t t-if="doc.payment_tx_id.state == 'pending'">
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index 49b701e3111..2f45988dbbf 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -13,18 +13,6 @@
         </field>
     </record>
 
-    <record id="view_order_form_acquirer" model="ir.ui.view">
-        <field name="name">sale.order.form.acquirer</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='amount_total']" position="after">
-                <field name="payment_acquirer_id" readonly="1" attrs="{'invisible': [('payment_acquirer_id', '=', False)]}" options='{"no_open":True}'/>
-                <field name="payment_tx_id" readonly="1" attrs="{'invisible': [('payment_acquirer_id', '=', False)]}"/>
-            </xpath>
-        </field>
-    </record>
-
     <record id="action_orders_ecommerce" model="ir.actions.act_window">
         <field name="name">Orders</field>
         <field name="res_model">sale.order</field>
@@ -125,7 +113,7 @@
     <!-- Configuration sub-menus -->
     <menuitem id="menu_ecommerce_payment_acquirers"
         action="payment.action_payment_acquirer"
-        parent="menu_ecommerce_settings" name="Payment Methods" />
+        parent="menu_ecommerce_settings" name="Payment Acquirers" />
     <menuitem id="menu_product_attribute_action"
         action="product.attribute_action"
         parent="menu_product_settings"  groups="product.group_product_variant" sequence="1"/>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 83cb7087207..d2ad1a05550 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1294,7 +1294,7 @@
     </template>
     <template id="payment" name="Payment">
         <t t-call="website.layout">
-            <t t-set="additional_title">Shop - Select Payment Method</t>
+            <t t-set="additional_title">Shop - Select Payment Acquirer</t>
             <t t-set="no_footer">1</t>
 
             <div id="wrap">
@@ -1375,7 +1375,7 @@
                             <div class="oe_structure" />
                             <div class="js_payment mb64 col-md-12 row" t-if="acquirers and website_sale_order.amount_total" id="payment_method">
                                 <div class="col-lg-7 col-sm-8">
-                                    <h4>Choose a payment method</h4>
+                                    <h4>Choose a payment acquirer</h4>
                                     <ul class="list-unstyled">
                                         <t t-set="payment_methods_available" t-value="False"/>
                                         <t t-set="partner_country" t-value="website_sale_order and website_sale_order.partner_invoice_id.country_id"/>
@@ -1419,7 +1419,7 @@
                                     <a class="btn btn-default btn-block"
                                             groups="base.group_system"
                                             t-attf-href="/web#return_label=Website&amp;action=#{payment_action_id}">
-                                        <i class="fa fa-plus-square" aria-hidden="true"></i> Setup payment methods
+                                        <i class="fa fa-plus-square" aria-hidden="true"></i> Setup payment acquirers
                                     </a>
                                 </div>
                                 <div class="col-lg-5 col-sm-4 text-right">