feat(Statement of Fees and Payments): link Organization (LAN-844)

alyf-de · Sep 3, 2024 · afc29c1 · afc29c1
1 parent 5cd1ab9
commit afc29c1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/landa/landa_sales/doctype/statement_of_fees_and_payments/statement_of_fees_and_payments.json b/landa/landa_sales/doctype/statement_of_fees_and_payments/statement_of_fees_and_payments.json
@@ -11,6 +11,7 @@
   "customer_name",
   "column_break_ur9om",
   "year_of_settlement",
+  "organization",
   "section_break_ksfci",
   "billing_address",
   "billing_address_display",
@@ -142,11 +143,19 @@
    "fieldtype": "Small Text",
    "label": "Billing Address Display",
    "read_only": 1
+  },
+  {
+   "fetch_from": "customer.organization",
+   "fieldname": "organization",
+   "fieldtype": "Link",
+   "label": "Organization",
+   "options": "Organization",
+   "read_only": 1
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-09-03 20:26:47.382849",
+ "modified": "2024-09-03 20:32:40.153494",
  "modified_by": "Administrator",
  "module": "LANDA Sales",
  "name": "Statement of Fees and Payments",

diff --git a/landa/landa_sales/doctype/statement_of_fees_and_payments/statement_of_fees_and_payments.py b/landa/landa_sales/doctype/statement_of_fees_and_payments/statement_of_fees_and_payments.py
@@ -16,18 +16,21 @@ def before_save(self):
 		self.calculate_totals()
 
 	def validate(self):
-		if (
-			existing := frappe.db.exists(
-				"Statement of Fees and Payments",
-				{
-					"customer": self.customer,
-					"company": self.company,
-					"year_of_settlement": self.year_of_settlement,
-					"docstatus": ("!=", DocStatus.cancelled()),
-					"name": ("!=", self.name),
-				},
-			)
-			and self.docstatus != DocStatus.cancelled()
+		if self.docstatus == DocStatus.cancelled():
+			return
+
+		if not self.organization:
+			frappe.throw(_("This Statement of Fees and Payments must be linked to an Organization"))
+
+		if existing := frappe.db.exists(
+			"Statement of Fees and Payments",
+			{
+				"customer": self.customer,
+				"company": self.company,
+				"year_of_settlement": self.year_of_settlement,
+				"docstatus": ("!=", DocStatus.cancelled()),
+				"name": ("!=", self.name),
+			},
 		):
 			frappe.throw(
 				_(

diff --git a/landa/translations/de.csv b/landa/translations/de.csv
@@ -105,3 +105,4 @@ Sum of Sales,Rechnungssumme,
 Sum of Payments,Zahlungssumme,
 Statement of Fees and Payments,Beitragsabrechnung,
 A Statement of Fees and Payments for the same customer and year already exists: {0},Es existiert bereits eine Beitragsabrechnung für denselben Verein und dasselbe Jahr: {0},
+This Statement of Fees and Payments must be linked to an Organization,Diese Beitragsabrechnung muss mit einem Verein verknüpft sein,