From 7cb26e84ddcf92a04d418f021fb3d3b1d2395b23 Mon Sep 17 00:00:00 2001 From: HenningWendtland <156231187+HenningWendtland@users.noreply.github.com> Date: Tue, 8 Sep 2026 22:26:18 +0200 Subject: [PATCH 1/2] fix: fix empty additional info in address --- .../doctype/simple_subscription/simple_subscription.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py b/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py index 8682130..1f02336 100644 --- a/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py +++ b/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py @@ -114,8 +114,8 @@ def create_invoice(self, from_date: date, to_date: date) -> SalesInvoice: invoice = frappe.new_doc("Sales Invoice") invoice.company = self.company invoice.customer = self.customer - invoice.customer_address = self.customer_address - invoice.shipping_address_name = self.shipping_address_name + invoice.customer_address = self.customer_address if self.customer_address else None + invoice.shipping_address_name = self.shipping_address_name if self.shipping_address_name else None invoice.selling_price_list = self.get_price_list() for row in self.items: invoice.append( From 223d08f9949b1f9e57a6d816c30e53107a744ee0 Mon Sep 17 00:00:00 2001 From: HenningWendtland <156231187+HenningWendtland@users.noreply.github.com> Date: Tue, 8 Sep 2026 22:36:30 +0200 Subject: [PATCH 2/2] fix: simplify syntax and add taxes case that surfaced --- .../doctype/simple_subscription/simple_subscription.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py b/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py index 1f02336..9e64068 100644 --- a/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py +++ b/simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py @@ -114,8 +114,9 @@ def create_invoice(self, from_date: date, to_date: date) -> SalesInvoice: invoice = frappe.new_doc("Sales Invoice") invoice.company = self.company invoice.customer = self.customer - invoice.customer_address = self.customer_address if self.customer_address else None - invoice.shipping_address_name = self.shipping_address_name if self.shipping_address_name else None + # '' is not None, so update_if_missing() in set_missing_values() would keep it and skip the default + invoice.customer_address = self.customer_address or None + invoice.shipping_address_name = self.shipping_address_name or None invoice.selling_price_list = self.get_price_list() for row in self.items: invoice.append( @@ -125,7 +126,7 @@ def create_invoice(self, from_date: date, to_date: date) -> SalesInvoice: "qty": row.qty, }, ) - invoice.taxes_and_charges = self.taxes_and_charges + invoice.taxes_and_charges = self.taxes_and_charges or None invoice.from_date = from_date invoice.to_date = to_date invoice.simple_subscription = self.name