mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into feature/6561/invoices-webhook

Browse source
This commit is contained in:
PCoder 2019-04-18 08:16:15 +02:00
commit a3cca03edb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog
View file

@ -1,5 +1,5 @@
Next: 2.5.1: 2019-04-17
* #6561: [hosting] Make monthly invoices available to customers (MR!689) * #6561: [hosting] Preparation for monthly invoices for customers (MR!689)
* [logging] Enhance logger, Include timestamp + module name in the logging messages (MR!693) * [logging] Enhance logger, Include timestamp + module name in the logging messages (MR!693)
2.5: 2019-04-11 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) * #6589: [vm creation, listing] Fix obtaining ip address/template related info from oca api call (MR!690, MR!691 and MR!692)

4
hosting/models.py
View file

@ -291,7 +291,7 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
"More than one subscriptions" "More than one subscriptions"
"for MonthlyHostingBill {}".format(args['invoice_id']) "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") logger.debug("Not importing invoices")
return return
elif len(args['lines_meta_data_csv']) > 0: elif len(args['lines_meta_data_csv']) > 0:
@ -303,7 +303,7 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
"More than one VM_ID" "More than one VM_ID"
"for MonthlyHostingBill {}".format(args['invoice_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") logger.debug("Not importing invoices")
return return
else: else: