Merge pull request #265 from alyf-de/link-user-to-member

alyf-de · May 7, 2024 · 97030b5 · 97030b5
2 parents a5eda78 + 5b21ded
commit 97030b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/landa/organization_management/report/member_contact_list/member_contact_list.py b/landa/organization_management/report/member_contact_list/member_contact_list.py
@@ -1,10 +1,10 @@
 # Copyright (c) 2013, Real Experts GmbH and contributors
 # For license information, please see license.txt
 
-import pandas as pd
-
 import frappe
+import pandas as pd
 from frappe import _
+
 from ..member.member import Member, get_link_filters, remove_duplicate_indices
 
 

diff --git a/landa/organization_management/user/user.py b/landa/organization_management/user/user.py
@@ -25,6 +25,9 @@ def validate(doc: User, event=None):
 				_("User {0} is already linked to LANDA Member {1}").format(existing_user, doc.landa_member)
 			)
 
+	if not doc.landa_member and not frappe.flags.in_test:
+		frappe.throw(_("Please link the user to a LANDA Member."))
+
 	if not doc.module_profile and not frappe.flags.in_test:
 		doc.module_profile = "LANDA User"
 

diff --git a/landa/translations/de.csv b/landa/translations/de.csv
@@ -89,3 +89,4 @@ Extra Columns,Zusätzliche Spalten,
 Water Body Status,Gewässerstatus,
 Row {0}: Item {1} is not valid for year of settlement {2}.,Zeile {0}: Artikel {1} ist nicht gültig für das Abrechnungsjahr {2}.,
 We've received your query!,Wir haben Ihre Anfrage erhalten!,
+Please link the user to a LANDA Member.,Bitte verknüpfen Sie den Benutzer mit einem Mitglied.,