Merge PR #137 into 16.0

Signed-off-by carmenbianca
OCA · Jun 14, 2024 · 4cec087 · 4cec087
2 parents 349408f + dbdcf23
commit 4cec087
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/l10n_be_cooperator_website_national_number/controllers/main.py b/l10n_be_cooperator_website_national_number/controllers/main.py
@@ -8,17 +8,13 @@
 class WebsiteSubscription(WebsiteSubscription):
     def get_values_from_user(self, values, is_company):
         values = super().get_values_from_user(values, is_company)
-        if request.env.user.login != "public":
-            partner = request.env.user.partner_id
-            company = request.env.company
-            if not is_company and company.require_national_number:
-                national_number_id_category = request.env.ref(
-                    "l10n_be_partner_identification.l10n_be_national_registry_number_category"
-                ).id
-                national_number = partner.id_numbers.filtered(
-                    lambda id_num: id_num.category_id.id == national_number_id_category
-                ).name
-                values["national_number"] = national_number
+        if (
+            request.env.user.login != "public"
+            and request.env.company.get_display_national_number(is_company)
+        ):
+            values[
+                "national_number"
+            ] = request.env.user.partner_id.get_be_national_register_number()
         return values
 
     def fill_values(self, values, is_company, logged, load_from_user=False):

diff --git a/l10n_be_cooperator_website_national_number/readme/newsfragments/137.bugfix.rst b/l10n_be_cooperator_website_national_number/readme/newsfragments/137.bugfix.rst
@@ -0,0 +1,2 @@
+National register number is correctly pre-filled even when it is not required.
+Previously it was only pre-filled if it was required.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		National register number is correctly pre-filled even when it is not required.
		Previously it was only pre-filled if it was required.