From 125f9f618a96dcdc20e523d8c9ca198a4fc883c1 Mon Sep 17 00:00:00 2001 From: Saqib Date: Wed, 8 Sep 2021 16:47:04 +0530 Subject: [PATCH] fix: document naming rule not working for subscription invoices (#27386) (cherry picked from commit 9c27f9be1e0fb26166b65c96ceb3f56f82312819) # Conflicts: # erpnext/accounts/doctype/subscription/subscription.py --- erpnext/accounts/doctype/subscription/subscription.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index 62ffc79fee8..75513e10a68 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -423,6 +423,10 @@ class Subscription(Document): invoice.to_date = self.current_invoice_end invoice.flags.ignore_mandatory = True +<<<<<<< HEAD +======= + +>>>>>>> 9c27f9be1e (fix: document naming rule not working for subscription invoices (#27386)) invoice.set_missing_values() invoice.save()