From c72da1369c45c57c6f4bcc6d7c8ae0a941aeacd2 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Wed, 16 Aug 2017 17:39:04 +0200
Subject: [PATCH] [IMP] website_quote: simplify labelling of require_payment

As using tokens or not is not a template option it is simplified to know
wether only a signature is required or a payment.
---
 addons/website_quote/models/sale_order.py | 16 +++++++---------
 addons/website_quote/models/sale_quote.py |  9 +++++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/website_quote/models/sale_order.py b/addons/website_quote/models/sale_order.py
index 62e2142e798..1f6b3ac19f8 100644
--- a/addons/website_quote/models/sale_order.py
+++ b/addons/website_quote/models/sale_order.py
@@ -50,7 +50,7 @@ class SaleOrder(models.Model):
     def _get_default_template(self):
         template = self.env.ref('website_quote.website_quote_template_default', raise_if_not_found=False)
         return template and template.active and template or False
-        
+
     template_id = fields.Many2one(
         'sale.quote.template', 'Quotation Template',
         readonly=True,
@@ -65,10 +65,11 @@ class SaleOrder(models.Model):
         'Amount Before Discount', compute='_compute_amount_undiscounted', digits=0)
     quote_viewed = fields.Boolean('Quotation Viewed')
     require_payment = fields.Selection([
-        (0, 'Not mandatory on website quote validation'),
-        (1, 'Immediate after website order validation'),
-        (2, 'Immediate after website order validation and save a token'),
-    ], 'Payment', default=0, help="Require immediate payment by the customer when validating the order from the website quote")
+        (0, 'Online Signature'),
+        (1, 'Online Payment')], default=0, string='Confirmation Mode',
+        help="Choose how you want to confirm an order to launch the delivery process. You can either "
+             "request a digital signature or an upfront payment. With a digital signature, you can "
+             "request the payment when issuing the invoice.")
 
     @api.multi
     def copy(self, default=None):
@@ -211,10 +212,7 @@ class SaleOrder(models.Model):
     @api.multi
     def _get_payment_type(self):
         self.ensure_one()
-        if self.require_payment == 2:
-            return 'form_save'
-        else:
-            return 'form'
+        return 'form_save' if self.require_payment else 'form'
 
 
 class SaleOrderOption(models.Model):
diff --git a/addons/website_quote/models/sale_quote.py b/addons/website_quote/models/sale_quote.py
index b9daa7696fe..08c2f19b779 100644
--- a/addons/website_quote/models/sale_quote.py
+++ b/addons/website_quote/models/sale_quote.py
@@ -18,10 +18,11 @@ class SaleQuoteTemplate(models.Model):
     number_of_days = fields.Integer('Quotation Duration',
         help='Number of days for the validity date computation of the quotation')
     require_payment = fields.Selection([
-        (0, 'Not mandatory on website quote validation'),
-        (1, 'Immediate after website order validation'),
-        (2, 'Immediate after website order validation and save a token'),
-    ], 'Payment', default=0, help="Require immediate payment by the customer when validating the order from the website quote")
+        (0, 'Online Signature'),
+        (1, 'Online Payment')], default=0, string='Confirmation Mode',
+        help="Choose how you want to confirm an order to launch the delivery process. You can either "
+             "request a digital signature or an upfront payment. With a digital signature, you can "
+             "request the payment when issuing the invoice.")
     mail_template_id = fields.Many2one(
         'mail.template', 'Confirmation Mail',
         domain=[('model', '=', 'sale.order')],