diff --git a/sale_order_line_packaging_qty/README.rst b/sale_order_line_packaging_qty/README.rst
index 0ad793793b7..2746fbc1e9b 100644
--- a/sale_order_line_packaging_qty/README.rst
+++ b/sale_order_line_packaging_qty/README.rst
@@ -14,13 +14,13 @@ Sale Order Line Packaging Quantity
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github
-    :target: https://github.com/OCA/sale-workflow/tree/13.0/sale_order_line_packaging_qty
+    :target: https://github.com/OCA/sale-workflow/tree/14.0/sale_order_line_packaging_qty
     :alt: OCA/sale-workflow
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/sale-workflow-13-0/sale-workflow-13-0-sale_order_line_packaging_qty
+    :target: https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-sale_order_line_packaging_qty
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/167/13.0
+    :target: https://runbot.odoo-community.org/runbot/167/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -44,7 +44,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-workflow/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_line_packaging_qty%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_line_packaging_qty%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -60,6 +60,15 @@ Contributors
 ~~~~~~~~~~~~
 
 * Akim Juillerat <akim.juillerat@camptocamp.com>
+* Hiep (Nguyen Hoang) <hiepnh@trobz.com>
+* Phuc (Tran Thanh) <phuc@trobz.com>
+
+Other credits
+~~~~~~~~~~~~~
+
+The development of this module has been financially supported by:
+
+* Camptocamp
 
 Maintainers
 ~~~~~~~~~~~
@@ -74,6 +83,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/13.0/sale_order_line_packaging_qty>`_ project on GitHub.
+This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/14.0/sale_order_line_packaging_qty>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/sale_order_line_packaging_qty/__manifest__.py b/sale_order_line_packaging_qty/__manifest__.py
index 20d8affb729..6a06257aedf 100644
--- a/sale_order_line_packaging_qty/__manifest__.py
+++ b/sale_order_line_packaging_qty/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Sale Order Line Packaging Quantity",
     "summary": "Define quantities according to product packaging on sale order lines",
-    "version": "13.0.1.2.0",
+    "version": "14.0.0.1.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/sale-workflow",
diff --git a/sale_order_line_packaging_qty/readme/CONTRIBUTORS.rst b/sale_order_line_packaging_qty/readme/CONTRIBUTORS.rst
index e31e2f0c4fc..05f627c6200 100644
--- a/sale_order_line_packaging_qty/readme/CONTRIBUTORS.rst
+++ b/sale_order_line_packaging_qty/readme/CONTRIBUTORS.rst
@@ -1 +1,3 @@
 * Akim Juillerat <akim.juillerat@camptocamp.com>
+* Hiep (Nguyen Hoang) <hiepnh@trobz.com>
+* Phuc (Tran Thanh) <phuc@trobz.com>
diff --git a/sale_order_line_packaging_qty/readme/CREDITS.rst b/sale_order_line_packaging_qty/readme/CREDITS.rst
new file mode 100644
index 00000000000..f5cc070c78e
--- /dev/null
+++ b/sale_order_line_packaging_qty/readme/CREDITS.rst
@@ -0,0 +1,3 @@
+The development of this module has been financially supported by:
+
+* Camptocamp
diff --git a/sale_order_line_packaging_qty/static/description/index.html b/sale_order_line_packaging_qty/static/description/index.html
index eaf781a7256..6193a322ba4 100644
--- a/sale_order_line_packaging_qty/static/description/index.html
+++ b/sale_order_line_packaging_qty/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Sale Order Line Packaging Quantity</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Sale Order Line Packaging Quantity</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/13.0/sale_order_line_packaging_qty"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/sale-workflow-13-0/sale-workflow-13-0-sale_order_line_packaging_qty"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/167/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/14.0/sale_order_line_packaging_qty"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-sale_order_line_packaging_qty"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/167/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a “Package quantity” field on sale order line in order to
 define a quantity according to the selected “Package”.</p>
 <div class="admonition important">
@@ -383,7 +383,8 @@ <h1 class="title">Sale Order Line Packaging Quantity</h1>
 <li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
 <li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
 <li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+<li><a class="reference internal" href="#other-credits" id="id5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -393,7 +394,7 @@ <h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/sale-workflow/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_line_packaging_qty%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_line_packaging_qty%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -408,16 +409,25 @@ <h2><a class="toc-backref" href="#id3">Authors</a></h2>
 <h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 <ul class="simple">
 <li>Akim Juillerat &lt;<a class="reference external" href="mailto:akim.juillerat&#64;camptocamp.com">akim.juillerat&#64;camptocamp.com</a>&gt;</li>
+<li>Hiep (Nguyen Hoang) &lt;<a class="reference external" href="mailto:hiepnh&#64;trobz.com">hiepnh&#64;trobz.com</a>&gt;</li>
+<li>Phuc (Tran Thanh) &lt;<a class="reference external" href="mailto:phuc&#64;trobz.com">phuc&#64;trobz.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id5">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Camptocamp</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/13.0/sale_order_line_packaging_qty">OCA/sale-workflow</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/14.0/sale_order_line_packaging_qty">OCA/sale-workflow</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/sale_order_line_packaging_qty/tests/test_sale_order_line_packaging_qty.py b/sale_order_line_packaging_qty/tests/test_sale_order_line_packaging_qty.py
index fb49e8156a1..d1edbe56c24 100644
--- a/sale_order_line_packaging_qty/tests/test_sale_order_line_packaging_qty.py
+++ b/sale_order_line_packaging_qty/tests/test_sale_order_line_packaging_qty.py
@@ -1,5 +1,6 @@
 # Copyright 2020 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+from odoo.exceptions import UserError
 from odoo.tests import SavepointCase
 
 
@@ -13,6 +14,7 @@ def setUpClass(cls):
         cls.packaging = cls.env["product.packaging"].create(
             {"name": "Test packaging", "product_id": cls.product.id, "qty": 5.0}
         )
+        cls.product_no_pckg = cls.env.ref("product.product_product_10")
 
     def test_product_packaging_qty(self):
         order = self.env["sale.order"].create({"partner_id": self.partner.id})
@@ -25,8 +27,43 @@ def test_product_packaging_qty(self):
             }
         )
         order_line.write({"product_packaging": self.packaging})
+        # This is what actually happened when user adds so line
+        order_line._onchange_product_uom_qty()
+        order_line._compute_product_packaging_qty()
         order_line._onchange_product_packaging()
+        order_line._onchange_product_packaging_qty()
         self.assertEqual(order_line.product_uom_qty, 5.0)
         self.assertEqual(order_line.product_packaging_qty, 1.0)
+
         order_line.write({"product_packaging_qty": 3.0})
+        order_line._onchange_product_packaging_qty()
         self.assertEqual(order_line.product_uom_qty, 15.0)
+
+        dozen = self.env.ref("uom.product_uom_dozen")
+        order_line.product_uom = dozen
+        order_line._compute_product_packaging_qty()
+        self.assertEqual(order_line.product_uom_qty, 180.0)
+
+        self.packaging.qty = 0
+        with self.assertRaises(UserError):
+            order_line.write({"product_packaging_qty": 0.0})
+
+        order_line.product_packaging = False
+        order_line._onchange_product_packaging()
+        self.assertEqual(order_line.product_packaging_qty, 0.0)
+
+    def test_product_packaging_qty_wo_packaging(self):
+        order = self.env["sale.order"].create({"partner_id": self.partner.id})
+        order_line = self.env["sale.order.line"].create(
+            {
+                "order_id": order.id,
+                "product_id": self.product_no_pckg.id,
+                "product_uom": self.product_no_pckg.uom_id.id,
+                "product_uom_qty": 3.0,
+            }
+        )
+        order_line._compute_product_packaging_qty()
+        self.assertEqual(order_line.product_uom_qty, 3.0)
+        self.assertEqual(order_line.product_packaging_qty, 0.0)
+        with self.assertRaises(UserError):
+            order_line.write({"product_packaging_qty": 3.0})
diff --git a/setup/sale_order_line_packaging_qty/odoo/addons/sale_order_line_packaging_qty b/setup/sale_order_line_packaging_qty/odoo/addons/sale_order_line_packaging_qty
new file mode 120000
index 00000000000..3c18bb78e5c
--- /dev/null
+++ b/setup/sale_order_line_packaging_qty/odoo/addons/sale_order_line_packaging_qty
@@ -0,0 +1 @@
+../../../../sale_order_line_packaging_qty
\ No newline at end of file
diff --git a/setup/sale_order_line_packaging_qty/setup.py b/setup/sale_order_line_packaging_qty/setup.py
new file mode 100644
index 00000000000..28c57bb6403
--- /dev/null
+++ b/setup/sale_order_line_packaging_qty/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)