From 7045c2cc3d2b1a0956e060c7a1c26c0c1884ef72 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:34:20 +0530 Subject: [PATCH] fix: set invoice start date to subscription start date (backport #45342) (#45343) fix: set invoice start date to subscription start date (#45342) (cherry picked from commit 68fb1b28eb3d150294ccc3124e45090f73e76949) Co-authored-by: Diptanil Saha --- erpnext/accounts/doctype/subscription/subscription.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index a3bcdc37c30..8cf08400490 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -114,10 +114,10 @@ class Subscription(Document): if self.trial_period_end and getdate(self.trial_period_end) > getdate(self.start_date): _current_invoice_start = add_days(self.trial_period_end, 1) - elif self.trial_period_start and self.is_trialling(): - _current_invoice_start = self.trial_period_start elif date: _current_invoice_start = date + elif self.trial_period_start and self.is_trialling(): + _current_invoice_start = self.trial_period_start else: _current_invoice_start = nowdate()