From d9fec69a709eaa34e28750bc214337e820be51e6 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Thu, 1 Mar 2018 05:34:02 +0100 Subject: [PATCH] update test case, fix bugs --- erpnext/accounts/doctype/subscriptions/subscriptions.py | 8 ++------ .../accounts/doctype/subscriptions/test_subscriptions.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/subscriptions/subscriptions.py b/erpnext/accounts/doctype/subscriptions/subscriptions.py index cd43a9cca4..a56a2f7467 100644 --- a/erpnext/accounts/doctype/subscriptions/subscriptions.py +++ b/erpnext/accounts/doctype/subscriptions/subscriptions.py @@ -155,8 +155,7 @@ class Subscriptions(Document): def generate_invoice(self): invoice = self.create_invoice() self.append('invoices', {'invoice': invoice.name}) - self.save() # Validates all over again but we don't mind - self.subscription_updated(invoice) + self.save() return invoice @@ -174,9 +173,9 @@ class Subscriptions(Document): invoice.append('items', item) # Taxes - # todo: tax template does not populate tax table if self.tax_template: invoice.taxes_and_charges = self.tax_template + invoice.set_taxes() # Due date invoice.append( @@ -215,9 +214,6 @@ class Subscriptions(Document): ) return item_names - def subscription_updated(self, invoice): - self.update_subscription_period() - def process(self): """ To be called by task periodically. It checks the subscription and takes appropriate action diff --git a/erpnext/accounts/doctype/subscriptions/test_subscriptions.py b/erpnext/accounts/doctype/subscriptions/test_subscriptions.py index a0f940098b..d02b4c827c 100644 --- a/erpnext/accounts/doctype/subscriptions/test_subscriptions.py +++ b/erpnext/accounts/doctype/subscriptions/test_subscriptions.py @@ -119,7 +119,7 @@ class TestSubscriptions(unittest.TestCase): subscription.process() self.assertEqual(len(subscription.invoices), 1) - self.assertEqual(subscription.current_invoice_start, nowdate()) + self.assertEqual(subscription.current_invoice_start, '2018-01-01') self.assertEqual(subscription.status, 'Past Due Date') subscription.delete()