diff --git a/base_section_subtotal/__init__.py b/base_section_subtotal/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/base_section_subtotal/__manifest__.py b/base_section_subtotal/__manifest__.py
new file mode 100644
index 00000000..46447248
--- /dev/null
+++ b/base_section_subtotal/__manifest__.py
@@ -0,0 +1,16 @@
+{
+    'name': 'Base Section Subtotal',
+    'version': '13.0.1.0.0',
+    'category': 'Tools',
+    'author': 'Hibou Corp.',
+    'license': 'AGPL-3',
+    'website': 'https://hibou.io/',
+    'depends': [
+        'account',  # because 'section_and_note_fields' come from account
+    ],
+    'data': [
+        'views/assets_backend.xml',
+    ],
+    'installable': True,
+    'application': False,
+ }
diff --git a/base_section_subtotal/static/src/js/widgets.js b/base_section_subtotal/static/src/js/widgets.js
new file mode 100644
index 00000000..33cac870
--- /dev/null
+++ b/base_section_subtotal/static/src/js/widgets.js
@@ -0,0 +1,88 @@
+odoo.define('base_section_subtotal.widgets', function (require) {
+"use strict";
+
+var basic_fields = require('web.basic_fields');
+var SectionAndNoteListRenderer = require('account.section_and_note_backend');
+
+SectionAndNoteListRenderer.include({
+    /**
+     * We want section and note to take the whole line (except handle and trash)
+     * to look better and to hide the unnecessary fields.
+     *
+     * Hibou Section Subtotal
+     * Utilize new XML attribute on tree views 'section-subtotal-field' to determine
+     * if we should short the 'name' field and which field to display.
+     *
+     * Note that we support more than one field, but it will not line up correctly...
+     *
+     * @override
+     */
+    _renderBodyCell: function (record, node, index, options) {
+        var $cell = this._super.apply(this, arguments);
+
+        var isSection = record.data.display_type === 'line_section';
+
+        if (isSection && this.arch.attrs['section-subtotal-field']) {
+            var sectionSubtotalFields = this.arch.attrs['section-subtotal-field'].split(',');
+            if (node.attrs.name === "name") {
+                // duplicate some logic
+                var nbrColumns = this._getNumberOfCols();
+                if (this.handleField) {
+                    nbrColumns--;
+                }
+                if (this.addTrashIcon) {
+                    nbrColumns--;
+                }
+                // for the section subtotal field(s)
+                nbrColumns -= sectionSubtotalFields.length;
+                $cell.attr('colspan', nbrColumns);
+            } else if (sectionSubtotalFields.indexOf(node.attrs.name) >= 0) {
+                $cell.removeClass('o_hidden');
+                return $cell;
+            }
+        }
+
+        return $cell;
+    },
+});
+
+basic_fields.NumericField.include({
+    init: function () {
+        this._super.apply(this, arguments);
+        this._setSectionSubtotal();
+    },
+
+    _reset: function () {
+        this._super.apply(this, arguments);
+        this._setSectionSubtotal();
+    },
+
+    _setSectionSubtotal: function () {
+        // line_sections will have empty fields, will update dynamically but not write them
+        if (this.record.data['display_type'] === 'line_section') {
+            var sequence = this.record.data.sequence;
+            var id = this.record.data.id;
+            if (this['__parentedParent'] && this.__parentedParent['state'] && this.__parentedParent.state['data']) {
+                var all_rows = this.__parentedParent.state.data;
+                var subtotal = 0.0;
+                var self_found = false;
+                for (var i = 0; i < all_rows.length; i++) {
+                    var row = all_rows[i].data;
+                    if (row.id == id) {
+                        self_found = true;
+                        continue;
+                    }
+                    if (self_found && row.sequence >= sequence) {
+                        if (row.display_type === 'line_section' && row.id != id) {
+                            break;
+                        }
+                        subtotal += row[this.name];
+                    }
+                }
+                this.value = subtotal;
+            }
+        }
+    },
+});
+
+});
diff --git a/base_section_subtotal/views/assets_backend.xml b/base_section_subtotal/views/assets_backend.xml
new file mode 100644
index 00000000..3dec49e7
--- /dev/null
+++ b/base_section_subtotal/views/assets_backend.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <template id="assets_backend" name="assets.backend" inherit_id="web.assets_backend">
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/base_section_subtotal/static/src/js/widgets.js"></script>
+        </xpath>
+    </template>
+
+</odoo>
\ No newline at end of file
diff --git a/sale_section_subtotal/__init__.py b/sale_section_subtotal/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/sale_section_subtotal/__manifest__.py b/sale_section_subtotal/__manifest__.py
new file mode 100644
index 00000000..52158291
--- /dev/null
+++ b/sale_section_subtotal/__manifest__.py
@@ -0,0 +1,17 @@
+{
+    'name': 'Sale Section Subtotal',
+    'version': '13.0.1.0.0',
+    'category': 'Sales',
+    'author': 'Hibou Corp.',
+    'license': 'AGPL-3',
+    'website': 'https://hibou.io/',
+    'depends': [
+        'sale',
+        'base_section_subtotal',
+    ],
+    'data': [
+        'views/sale_views.xml',
+    ],
+    'installable': True,
+    'application': False,
+ }
diff --git a/sale_section_subtotal/views/sale_views.xml b/sale_section_subtotal/views/sale_views.xml
new file mode 100644
index 00000000..ee4d8280
--- /dev/null
+++ b/sale_section_subtotal/views/sale_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_order_form_inherit" model="ir.ui.view">
+        <field name="name">sale.order.form.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                <attribute name="section-subtotal-field">price_subtotal</attribute>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>