From b942e31cc4815c58f7492944bbe4a27da6ee0627 Mon Sep 17 00:00:00 2001
From: jcoux <julien.coux@camptocamp.com>
Date: Tue, 13 Feb 2018 11:11:01 +0100
Subject: [PATCH] BSSFL-485: Custom sale order report (add field note)

---
 HISTORY.rst                                                | 2 ++
 odoo/local-src/sf_sale/report/sf_sale_report_templates.xml | 3 +++
 odoo/migration.yml                                         | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index 978f5ec637f5..ec9ce6e0ade6 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -21,6 +21,8 @@ latest (unreleased)
 
 **Features and Improvements**
 
+* BSSFL-485: Custom sale order report (add field note)
+
 **Bugfixes**
 
 **Build**
diff --git a/odoo/local-src/sf_sale/report/sf_sale_report_templates.xml b/odoo/local-src/sf_sale/report/sf_sale_report_templates.xml
index 4f95df7b8d5c..88da8294cfbf 100644
--- a/odoo/local-src/sf_sale/report/sf_sale_report_templates.xml
+++ b/odoo/local-src/sf_sale/report/sf_sale_report_templates.xml
@@ -197,6 +197,9 @@
                         </div>
                     </div>
                 </t>
+
+                <span t-field="doc.note"/>
+
                 <t t-set="o" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
                 <t t-call="sf_terms_and_conditions.sale_terms_and_conditions" />
             </div>
diff --git a/odoo/migration.yml b/odoo/migration.yml
index 0c9b7a2538a0..e623a56ae33e 100644
--- a/odoo/migration.yml
+++ b/odoo/migration.yml
@@ -211,3 +211,7 @@ migration:
           - sf_rma
           - sf_stock
           - sf_account
+    - version: 10.17.0
+      addons:
+        upgrade:
+          - sf_sale