diff --git a/addons/payment/views/payment_acquirer_onboarding_templates.xml b/addons/payment/views/payment_acquirer_onboarding_templates.xml
index 86296674d35..f00c6cfb636 100644
--- a/addons/payment/views/payment_acquirer_onboarding_templates.xml
+++ b/addons/payment/views/payment_acquirer_onboarding_templates.xml
@@ -4,7 +4,7 @@
     <template id="onboarding_payment_acquirer_step">
         <t t-call="base.onboarding_step">
             <t t-set="title">Payment Method</t>
-            <t t-set="description">Configure your payment methods.</t>
+            <t t-set="description">Choose your default customer payment method.</t>
             <t t-set="btn_text">Set payments</t>
             <t t-set="done_text">Payment method set!</t>
             <t t-set="method" t-value="'action_open_payment_onboarding_payment_acquirer'" />
diff --git a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py
index 5c9c9c39197..2c198e23aa8 100644
--- a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py
+++ b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py
@@ -10,9 +10,9 @@ class PaymentWizard(models.TransientModel):
     _description = 'Payment acquire onboarding wizard'
 
     payment_method = fields.Selection([
-        ('paypal', "Pay with PayPal"),
-        ('stripe', "Pay with credit card (via Stripe)"),
-        ('other', "Pay with another payment acquirer"),
+        ('paypal', "PayPal"),
+        ('stripe', "Credit card (via Stripe)"),
+        ('other', "Other payment acquirer"),
         ('manual', "Custom payment instructions"),
     ], string="Payment Method", default=lambda self: self._get_default_payment_acquirer_onboarding_value('payment_method'))
 
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 01fcf1f8d3f..8bf7e32695f 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -335,13 +335,8 @@
                                 </group>
                                 <group name="other_info">
                                     <field name="user_id"/>
-<<<<<<< 94a25d7f9c38a94e3b203d227502c37c3283637b
-                                    <field name="invoice_status"/>
-                                    <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
-=======
                                     <field name="invoice_status" attrs="{'invisible': [('state', 'in', ('draft', 'sent', 'to approve', 'cancel'))]}"/>
-                                    <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}"/>
->>>>>>> [IMP] account: improve account views
+                                    <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
                                     <field name="fiscal_position_id" options="{'no_create': True}" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}"/>
                                 </group>
                             </group>
@@ -407,7 +402,7 @@
                     <separator/>
                     <filter name="not_invoiced" string="Waiting Bills" domain="[('invoice_status', '=', 'to invoice')]" help="Purchase orders that include lines not invoiced."/>
                     <filter name="invoiced" string="Bills Received" domain="[('invoice_status', '=', 'invoiced')]" help="Purchase orders that have been invoiced."/>
-                    <separator/>    
+                    <separator/>
                     <filter name="order_date" string="Order Date" date="date_order"/>
                     <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
diff --git a/addons/sale/views/sale_onboarding_views.xml b/addons/sale/views/sale_onboarding_views.xml
index 63227a1265c..0cab953c649 100644
--- a/addons/sale/views/sale_onboarding_views.xml
+++ b/addons/sale/views/sale_onboarding_views.xml
@@ -15,8 +15,8 @@
     </template>
     <template id="sale_onboarding_order_confirmation_step">
         <t t-call="base.onboarding_step">
-            <t t-set="title">Confirmation &amp; Payment</t>
-            <t t-set="description">Choose how to confirm quotations and get paid.</t>
+            <t t-set="title">Payment method</t>
+            <t t-set="description">Choose your default customer payment method.</t>
             <t t-set="btn_text">Set payments</t>
             <t t-set="method" t-value="'action_open_sale_onboarding_payment_acquirer'" />
             <t t-set="model" t-value="'res.company'" />
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 4ac32210406..166e9d33b88 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -308,12 +308,12 @@
                         </group>
                         <group>
                             <field name="validity_date" attrs="{'invisible': [('state', 'in', ['sale', 'done'])]}"/>
-                            <div class="o_td_label" groups="base.group_no_one" attrs="{'invisible': [('state', 'in', ['sale', 'done', 'cancel'])]}"> 
-                                <label for="date_order" string="Quotation Date"/> 
+                            <div class="o_td_label" groups="base.group_no_one" attrs="{'invisible': [('state', 'in', ['sale', 'done', 'cancel'])]}">
+                                <label for="date_order" string="Quotation Date"/>
                             </div>
                             <field name="date_order" nolabel="1" groups="base.group_no_one" attrs="{'invisible': [('state', 'in', ['sale', 'done', 'cancel'])]}"/>
-                            <div class="o_td_label" attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}"> 
-                                <label for="date_order" string="Order Date"/> 
+                            <div class="o_td_label" attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
+                                <label for="date_order" string="Order Date"/>
                             </div>
                             <field name="date_order" attrs="{'required': [('state', 'in', ['sale', 'done'])], 'invisible': [('state', 'in', ['draft', 'sent'])]}" nolabel="1"/>
                             <field name="pricelist_id" groups="product.group_product_pricelist" options="{'no_open':True,'no_create': True}"/>
@@ -1149,13 +1149,8 @@
                     <xpath expr="//field[@name='invoice_line_ids']//field[@name='discount']" position="attributes">
                         <attribute name="groups">product.group_discount_per_so_line</attribute>
                     </xpath>
-<<<<<<< 94a25d7f9c38a94e3b203d227502c37c3283637b
-                    <xpath expr="//group[@name='sale_info_group']" position="inside">
-                        <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/>
-=======
                     <xpath expr="//group[@name='sale_info_group']/field[@name='invoice_user_id']" position="after">
-                        <field name="team_id"/>
->>>>>>> [IMP] account: improve account views
+                        <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/>
                     </xpath>
                     <xpath expr="//group[@id='other_tab_group']" position="inside">
                         <group string="Marketing"
diff --git a/addons/sale/wizard/payment_acquirer_onboarding_wizard.py b/addons/sale/wizard/payment_acquirer_onboarding_wizard.py
index 01ffed669d3..862ff926683 100644
--- a/addons/sale/wizard/payment_acquirer_onboarding_wizard.py
+++ b/addons/sale/wizard/payment_acquirer_onboarding_wizard.py
@@ -16,7 +16,10 @@ class PaymentWizard(models.TransientModel):
 
     payment_method = fields.Selection(selection_add=[
         ('digital_signature', 'Online signature'),
-        ('paypal',),
+        ('paypal', "PayPal"),
+        ('stripe', "Credit card (via Stripe)"),
+        ('other', "Other payment acquirer"),
+        ('manual', "Custom payment instructions"),
     ], default=_get_default_payment_method)
     #