Delte patch that has already entered to core module.

Commit: https://hg.tryton.org/modules/project_invoice/rev/297c5dd2261a

Task #048600
This commit is contained in:
Juanjo Garcia 2021-12-20 13:02:54 +01:00
parent 87af1f4598
commit 9034ecf3b9
2 changed files with 0 additions and 22 deletions

View File

@ -1,20 +0,0 @@
diff --git a/trytond/trytond/modules/project_invoice/project.py b/trytond/trytond/modules/project_invoice/project.py
index 52f65c6..8b5ef05 100644
--- a/trytond/trytond/modules/project_invoice/project.py
+++ b/trytond/trytond/modules/project_invoice/project.py
@@ -11,6 +11,7 @@ from sql import Null
from sql.aggregate import Sum
from sql.functions import Extract
from sql.operators import Concat
+from sql.conditionals import NullIf
from trytond.i18n import gettext
from trytond.model import ModelSQL, ModelView, fields
@@ -671,7 +672,7 @@ class WorkInvoicedProgress(ModelView, ModelSQL):
# Don't use UPDATE FROM because SQLite does not support it.
value = work.select(
(Extract('EPOCH', sql_table.effort_duration)
- / Extract('EPOCH', work.effort_duration)),
+ / NullIf(Extract('EPOCH', work.effort_duration), 0)),
where=work.id == sql_table.work)
cursor.execute(*sql_table.update([sql_table.progress], [value]))

2
series
View File

@ -39,8 +39,6 @@ sao_colors.diff # [sao] Use the same colors as 5.4 version
commission_menu_group.diff # [commission] Creates ir.ui.menu-res.group record for commission menu and group
issue10990.diff # [project_invoice] Skip empty efforts on progress migration
sao_remove_email.diff # [sao] Removes the email button from the toolbar
# worker_logger.diff #[trytond] Move exception handling into transaction to keep the database name