Merge branch '5.4' of github.com:NaN-tic/trytond-patches into 5.4

project_invoice_progress_compute_qty.diff

@@ -0,0 +1,14 @@
+diff --git a/trytond/trytond/modules/project_invoice/work.py b/trytond/trytond/modules/project_invoice/work.py
+index fcc41a2..3577e1f 100644
+--- a/trytond/trytond/modules/project_invoice/work.py
++++ b/trytond/trytond/modules/project_invoice/work.py
+@@ -515,9 +515,6 @@ class Work(metaclass=PoolMeta):
+
+         invoiced_progress = sum(x.effort_hours for x in self.invoiced_progress)
+         quantity = self.effort_hours * self.progress - invoiced_progress
+-        if self.product:
+-            quantity = Uom.compute_qty(
+-                hour, quantity, self.product.default_uom)
+         if quantity > 0:
+             if not self.product:
+                 raise InvoicingError(

series

@@ -64,6 +64,8 @@ account_asset.diff # [account_asset] permit update asset running without move ye
 
 issue8834.diff # [account_payment_clearing] Party required when mark a payment succeed and counterpart account is required
 
+project_invoice_progress_compute_qty.diff # [project_invoice] Twice compute qty UOM convertion (to calculate pogress and create invoice line)
+
 issue10068.diff # [trytond] Use safe_join in SharedDataMiddlewareIndex
 
 issue10053.diff # [party] Configure available identifiers