Skip to content

feat(Simple Subscription): optionally add additional customer info #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barredterra merged 7 commits into from
Sep 8, 2026
Merged

feat(Simple Subscription): optionally add additional customer info #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f09cd01
feat(Simple Subscription): optionally add additional customer info
HenningWendtland Sep 7, 2026
87fb4b0
fix: set allow_on_submit for new link fields
HenningWendtland Sep 7, 2026
b75054a
fix: add on_update_after_submit validation
HenningWendtland Sep 7, 2026
5494f0a
fix: make tests not depend on erpnext
HenningWendtland Sep 7, 2026
26ad94e
fix: catch the edge case where the contact changes, while the contact…
HenningWendtland Sep 7, 2026
141172d
fix: simplify test cases
HenningWendtland Sep 8, 2026
a5e0f70
fix: remove commit from tests and add address template creation
HenningWendtland Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 57 additions & 8 deletions simple_subscription/locale/de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ msgstr ""
msgid "Accounts User"
msgstr ""

#. Label of the additional_customer_data_section (Section Break) field in
#. DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Additional Customer Data"
msgstr "Zusätzliche Kundendaten"

#. Label of the amended_from (Link) field in DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Amended From"
Expand All @@ -38,6 +44,23 @@ msgstr ""
msgid "Biennial"
msgstr "Zweijährlich"

#. Label of the billing_address_display (Text Editor) field in DocType
#. 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Address"
msgstr ""

#. Label of the customer_address (Link) field in DocType 'Simple
#. Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Address Name"
msgstr ""

#. Label of the contact_person (Link) field in DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Contact Name"
msgstr "Name des Rechnungskontakts"

#. Label of the period_type (Select) field in DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Period is based on"
Expand All @@ -53,7 +76,13 @@ msgstr "Rechnungszeit"
msgid "Company"
msgstr "Unternehmen"

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.js:28
#. Label of the contact_display (Small Text) field in DocType 'Simple
#. Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Contact"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.js:73
msgid "Create current {0} invoice"
msgstr "Aktuelle {0} Rechnung erstellen"

Expand Down Expand Up @@ -89,7 +118,7 @@ msgstr ""
msgid "Disabled"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:135
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:195
msgid "Failed to create subscription invoice"
msgstr "Fehler beim Erstellen der Abo-Rechnung"

Expand Down Expand Up @@ -129,15 +158,21 @@ msgstr ""
msgid "Monthly"
msgstr "Monatlich"

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:57
#. Description of the 'Additional Customer Data' (Section Break) field in
#. DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Optional. If empty, defaults are set on invoice generation"
msgstr "Optional. Wenn leer, werden bei der Rechnungserstellung die Standardwerte gesetzt."

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:107
msgid "Please amend Subscription {0} before creating a Sales Invoice."
msgstr "Bitte ändern Sie das Abo {0} bevor Sie eine Rechnung erstellen."

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:51
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:101
msgid "Please enable Subscription {0} before creating a Sales Invoice."
msgstr "Bitte aktivieren Sie das Abo {0} bevor Sie eine Rechnung erstellen."

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:54
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:104
msgid "Please submit Subscription {0} before creating a Sales Invoice."
msgstr "Bitte buchen Sie das Abo {0} bevor Sie eine Rechnung erstellen."

Expand All @@ -151,7 +186,7 @@ msgstr ""
msgid "Quarterly"
msgstr "Vierteljährlich"

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:124
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:184
msgid "Sales Invoice already exists for this period: {}"
msgstr "Rechnung für diese Periode existiert bereits: {}"

Expand All @@ -160,6 +195,18 @@ msgstr "Rechnung für diese Periode existiert bereits: {}"
msgid "Selling"
msgstr ""

#. Label of the shipping_address_display (Text Editor) field in DocType
#. 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Shipping Address"
msgstr ""

#. Label of the shipping_address_name (Link) field in DocType 'Simple
#. Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Shipping Address Name"
msgstr ""

#. Name of a DocType
#. Label of a Link in the Simple Subscription Selling Workspace
#. Label of a shortcut in the Simple Subscription Selling Workspace
Expand All @@ -184,8 +231,7 @@ msgstr "Vertrieb"
msgid "Start Date"
msgstr "Startdatum"

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:209
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:221
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:271
msgid "Start Date is required for frequency {0}."
msgstr "Startdatum ist für die Frequenz {0} erforderlich."

Expand Down Expand Up @@ -233,3 +279,6 @@ msgstr "Kalendermonate"
msgid "start date"
msgstr "Startdatum"

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:90
msgid "{0} {1} does not belong to Customer {2}."
msgstr "{0} {1} gehört nicht zu Kunde {2}."
65 changes: 57 additions & 8 deletions simple_subscription/locale/main.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ msgstr ""
msgid "Accounts User"
msgstr ""

#. Label of the additional_customer_data_section (Section Break) field in
#. DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Additional Customer Data"
msgstr ""

#. Label of the amended_from (Link) field in DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Amended From"
Expand All @@ -36,6 +42,23 @@ msgstr ""
msgid "Biennial"
msgstr ""

#. Label of the billing_address_display (Text Editor) field in DocType
#. 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Address"
msgstr ""

#. Label of the customer_address (Link) field in DocType 'Simple
#. Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Address Name"
msgstr ""

#. Label of the contact_person (Link) field in DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Contact Name"
msgstr ""

#. Label of the period_type (Select) field in DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Billing Period is based on"
Expand All @@ -51,7 +74,13 @@ msgstr ""
msgid "Company"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.js:28
#. Label of the contact_display (Small Text) field in DocType 'Simple
#. Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Contact"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.js:73
msgid "Create current {0} invoice"
msgstr ""

Expand Down Expand Up @@ -87,7 +116,7 @@ msgstr ""
msgid "Disabled"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:135
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:195
msgid "Failed to create subscription invoice"
msgstr ""

Expand Down Expand Up @@ -127,15 +156,21 @@ msgstr ""
msgid "Monthly"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:57
#. Description of the 'Additional Customer Data' (Section Break) field in
#. DocType 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Optional. If empty, defaults are set on invoice generation"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:107
msgid "Please amend Subscription {0} before creating a Sales Invoice."
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:51
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:101
msgid "Please enable Subscription {0} before creating a Sales Invoice."
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:54
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:104
msgid "Please submit Subscription {0} before creating a Sales Invoice."
msgstr ""

Expand All @@ -149,7 +184,7 @@ msgstr ""
msgid "Quarterly"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:124
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:184
msgid "Sales Invoice already exists for this period: {}"
msgstr ""

Expand All @@ -158,6 +193,18 @@ msgstr ""
msgid "Selling"
msgstr ""

#. Label of the shipping_address_display (Text Editor) field in DocType
#. 'Simple Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Shipping Address"
msgstr ""

#. Label of the shipping_address_name (Link) field in DocType 'Simple
#. Subscription'
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.json
msgid "Shipping Address Name"
msgstr ""

#. Name of a DocType
#. Label of a Link in the Simple Subscription Selling Workspace
#. Label of a shortcut in the Simple Subscription Selling Workspace
Expand All @@ -182,8 +229,7 @@ msgstr ""
msgid "Start Date"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:209
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:221
#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:271
msgid "Start Date is required for frequency {0}."
msgstr ""

Expand Down Expand Up @@ -231,3 +277,6 @@ msgstr ""
msgid "start date"
msgstr ""

#: simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.py:90
msgid "{0} {1} does not belong to Customer {2}."
msgstr ""
50 changes: 50 additions & 0 deletions simple_subscription/simple_subscription/doctype/simple_subscription/simple_subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
// Copyright (c) 2022, ALYF GmbH and contributors
// For license information, please see license.txt

function customer_link_query(frm, query) {
return {
query: query,
filters: { link_doctype: "Customer", link_name: frm.doc.customer },
};
}

frappe.ui.form.on("Simple Subscription", {
setup: function (frm) {
for (const field of ["customer_address", "shipping_address_name"]) {
frm.set_query(field, () =>
customer_link_query(frm, "frappe.contacts.doctype.address.address.address_query")
);
}

frm.set_query("contact_person", () =>
customer_link_query(frm, "frappe.contacts.doctype.contact.contact.contact_query")
);

frm.set_query("item", "items", function () {
return {
filters: {
Expand All @@ -21,6 +38,39 @@ frappe.ui.form.on("Simple Subscription", {
});
},

customer: function (frm) {
// address and contact are customer specific, don't keep the previous customer's
for (const field of ["customer_address", "shipping_address_name", "contact_person"]) {
frm.set_value(field, null);
}
},

customer_address: function (frm) {
erpnext.utils.get_address_display(frm, "customer_address", "billing_address_display");
},

shipping_address_name: function (frm) {
erpnext.utils.get_address_display(frm, "shipping_address_name", "shipping_address_display");
},

contact_person: function (frm) {
const contact = frm.doc.contact_person;
if (!contact) {
frm.set_value("contact_display", "");
return;
}

frappe.call({
method: "frappe.contacts.doctype.contact.contact.get_contact_details",
args: { contact },
callback: (r) =>
// the selection may have moved on while the call was in flight
r.message &&
frm.doc.contact_person === contact &&
frm.set_value("contact_display", r.message.contact_display),
});
Comment thread
greptile-apps[bot] marked this conversation as resolved.
},

refresh: function (frm) {
if (frm.doc.docstatus !== 1 || frm.doc.disabled === 1) return;

Expand Down
Loading
Loading