From da3d4625051f867213aa7c74dbc160725dffc9b6 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 17 Apr 2019 08:50:29 +0200 Subject: [PATCH 1/2] Update Changelog for 2.5.1 --- Changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 8cb98bad..e461635c 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,5 @@ -Next: - * #6561: [hosting] Make monthly invoices available to customers (MR!689) +2.5.1: 2019-04-17 + * #6561: [hosting] Preparation for monthly invoices for customers (MR!689) * [logging] Enhance logger, Include timestamp + module name in the logging messages (MR!693) 2.5: 2019-04-11 * #6589: [vm creation, listing] Fix obtaining ip address/template related info from oca api call (MR!690, MR!691 and MR!692) From 0969c97ecad4a216b38939ba7864518381f7e0c5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 18 Apr 2019 08:13:56 +0200 Subject: [PATCH 2/2] Add missing string to debug code --- hosting/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index 550cf27f..84cdc357 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -282,7 +282,7 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model): "More than one subscriptions" "for MonthlyHostingBill {}".format(args['invoice_id']) ) - logger.debug("SUB_IDS=".format(','.join(sub_ids))) + logger.debug("SUB_IDS={}".format(','.join(sub_ids))) logger.debug("Not importing invoices") return elif len(args['lines_meta_data_csv']) > 0: @@ -294,7 +294,7 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model): "More than one VM_ID" "for MonthlyHostingBill {}".format(args['invoice_id']) ) - logger.debug("VM_IDS=".format(','.join(vm_ids))) + logger.debug("VM_IDS={}".format(','.join(vm_ids))) logger.debug("Not importing invoices") return else: