Merge pull request OCA#357 from jcoux/485_sale_order_report

BSSFL-485: Custom sale order report (add field note)
sambarros · Feb 13, 2018 · 78a83ff · 78a83ff
2 parents e09c504 + b942e31
commit 78a83ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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
@@ -211,3 +211,7 @@ migration:
           - sf_rma
           - sf_stock
           - sf_account
+    - version: 10.17.0
+      addons:
+        upgrade:
+          - sf_sale
-Original file line number
+Diff line change
@@ Expand Up / @@ -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>
@@ Expand Down @@