diff --git a/invoice_sale_order_note/__manifest__.py b/invoice_sale_order_note/__manifest__.py
index 863f7b9..00c81ed 100644
--- a/invoice_sale_order_note/__manifest__.py
+++ b/invoice_sale_order_note/__manifest__.py
@@ -2,8 +2,8 @@
 {
     "name": "Invoice and sale order note",
     "category": "Account",
-    "version": "16.0.1.0",
-    "summary": "Add note in sale orders and invoices document",
+    "version": "16.0.2.0.0",
+    "summary": "Add note in sale orders, sale orders templates and invoices document",
     "author": "Elabore",
     "website": "https://elabore.coop/",
     "installable": True,
@@ -57,12 +57,14 @@ This module is maintained by ELABORE.
         "base",
         "account",
         "sale",
+        "sale_management",
     ],
     "data": [
         "views/sale_views.xml",
         "views/account_move_views.xml",
         "views/account_invoice_report.xml",
         "views/sale_order_report.xml",
+        "views/sale_order_template_views.xml",
     ],
     "qweb": [],
 }
diff --git a/invoice_sale_order_note/models/__init__.py b/invoice_sale_order_note/models/__init__.py
index 7593f58..3002eef 100644
--- a/invoice_sale_order_note/models/__init__.py
+++ b/invoice_sale_order_note/models/__init__.py
@@ -2,3 +2,4 @@
 
 from . import account_move
 from . import sale
+from . import sale_order_template
diff --git a/invoice_sale_order_note/models/sale.py b/invoice_sale_order_note/models/sale.py
index 1272c43..07cf2ec 100644
--- a/invoice_sale_order_note/models/sale.py
+++ b/invoice_sale_order_note/models/sale.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from odoo import models, fields
+from odoo import models, fields, api
 from odoo.addons.sale.models.sale_order import LOCKED_FIELD_STATES
 
 
@@ -13,3 +13,8 @@ class SaleOrder(models.Model):
         res = super(SaleOrder, self)._prepare_invoice()
         res["report_note"] = self.report_note
         return res
+    
+    @api.onchange('sale_order_template_id')
+    def _onchange_sale_order_template_id_report_note(self):
+        if self.sale_order_template_id and self.sale_order_template_id.report_note:
+            self.report_note = self.sale_order_template_id.report_note
diff --git a/invoice_sale_order_note/models/sale_order_template.py b/invoice_sale_order_note/models/sale_order_template.py
new file mode 100644
index 0000000..a34b03b
--- /dev/null
+++ b/invoice_sale_order_note/models/sale_order_template.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+from odoo.tools.translate import html_translate
+
+
+class SaleOrderTemplate(models.Model):
+    _inherit = 'sale.order.template'
+
+    report_note = fields.Html("Note")
diff --git a/invoice_sale_order_note/views/sale_order_template_views.xml b/invoice_sale_order_note/views/sale_order_template_views.xml
new file mode 100644
index 0000000..4b86b36
--- /dev/null
+++ b/invoice_sale_order_note/views/sale_order_template_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="sale_order_template_view_form_inherit_report_note" model="ir.ui.view">
+        <field name="name">sale.order.template.form.inherit.report.note</field>
+        <field name="inherit_id" ref="sale_management.sale_order_template_view_form"/>
+        <field name="model">sale.order.template</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook[@name='main_book']" position="inside">
+                <page name="note" string="Notes">
+                    <field name="report_note" nolabel="1" colspan="2" />
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/invoice_sale_order_note/views/sale_views.xml b/invoice_sale_order_note/views/sale_views.xml
index bb69b5c..6afc0fe 100644
--- a/invoice_sale_order_note/views/sale_views.xml
+++ b/invoice_sale_order_note/views/sale_views.xml
@@ -2,7 +2,7 @@
 <odoo>
     
     <record id="view_order_form_invoice_sale_order_note" model="ir.ui.view">
-        <field name="name">view.order.form.invoice0sale.order.note</field>
+        <field name="name">view.order.form.invoice.sale.order.note</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">