From 78f0aae2e2c119b7d511d78611f06aa3fef09f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Tarroja=20Caubet?= Date: Sun, 18 Aug 2024 14:25:54 +0200 Subject: [PATCH] Use empty string for empty descriptions to construct grouping key Closes #12952 --- modules/project_invoice/project.py | 2 +- modules/purchase_request/purchase_request.py | 2 +- modules/sale_subscription/subscription.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/project_invoice/project.py b/modules/project_invoice/project.py index f8b58dc0b5..8033ca8129 100644 --- a/modules/project_invoice/project.py +++ b/modules/project_invoice/project.py @@ -577,7 +577,7 @@ class Work(Effort, Progress, Timesheet, metaclass=PoolMeta): return (('product', line['product']), ('unit', line['unit']), ('unit_price', line['unit_price']), - ('description', line['description'])) + ('description', line['description'] or '')) def _get_invoice_line(self, key, invoice, lines): "Return a invoice line for the lines" diff --git a/modules/purchase_request/purchase_request.py b/modules/purchase_request/purchase_request.py index e6de8caf2c..2e5a6bda01 100644 --- a/modules/purchase_request/purchase_request.py +++ b/modules/purchase_request/purchase_request.py @@ -391,7 +391,7 @@ class CreatePurchase(Wizard): ''' return ( ('product', request.product), - ('description', request.description), + ('description', request.description or ''), ('unit', request.unit), ) diff --git a/modules/sale_subscription/subscription.py b/modules/sale_subscription/subscription.py index d5c02676b8..c24466fef5 100644 --- a/modules/sale_subscription/subscription.py +++ b/modules/sale_subscription/subscription.py @@ -957,7 +957,7 @@ class LineConsumption(ModelSQL, ModelView): ('unit', consumption.line.unit), ('product', consumption.line.service.product), ('unit_price', consumption.line.unit_price), - ('description', consumption.line.description), + ('description', consumption.line.description or ''), ('origin', consumption.line), )