From 8aa66e36a35cb1eaaaea09b57c00c7fbe36e3b1a Mon Sep 17 00:00:00 2001 From: Rohan Patel Date: Fri, 28 Oct 2016 12:33:17 +0530 Subject: [PATCH] [IMP] website_quote: use template's Terms & Conditions by default, if not the company's configured terms & Conditions will be applied. Also change the placeholder of Terms & Conditions in the quotation template. --- addons/website_quote/models/sale_order.py | 5 +++++ addons/website_quote/views/sale_quote_views.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/website_quote/models/sale_order.py b/addons/website_quote/models/sale_order.py index aaf6b53bd93..005efa6fa66 100644 --- a/addons/website_quote/models/sale_order.py +++ b/addons/website_quote/models/sale_order.py @@ -77,6 +77,11 @@ class SaleOrder(models.Model): total += line.price_subtotal + line.price_unit * ((line.discount or 0.0) / 100.0) * line.product_uom_qty # why is there a discount in a field named amount_undiscounted ?? self.amount_undiscounted = total + @api.onchange('partner_id') + def onchange_partner_id(self): + super(SaleOrder, self).onchange_partner_id() + self.note = self.template_id.note or self.note + @api.onchange('template_id') def onchange_template_id(self): if not self.template_id: diff --git a/addons/website_quote/views/sale_quote_views.xml b/addons/website_quote/views/sale_quote_views.xml index 2fb2097d6ff..74812d66bdc 100644 --- a/addons/website_quote/views/sale_quote_views.xml +++ b/addons/website_quote/views/sale_quote_views.xml @@ -86,7 +86,7 @@ - +