Merge pull request #5751 from expsa/ee

[IMP] odex_benefit: IMP benefit*

odex25_benefit/odex_benefit/i18n/ar_001.po

@@ -17668,5 +17668,30 @@ msgid ""
 msgstr "<b>تم تغيير الحالة:</b> %s → تم الحساب<br/><b>تم الإرجاع بواسطة:</b> "
 "%s<br/><b>السبب:</b> %s"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__max_limit_period__year_from_request
+msgid "Year from date of request"
+msgstr "السنة من تاريخ الطلب"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__max_limit_period__calendar_year
+msgid "Calendar year"
+msgstr "سنة ميلادية"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allowed_period
+msgid "Allowed Period"
+msgstr "الفترة"
+
+#. module: odex_benefit
+#: model:ir.model.fields,help:odex_benefit.field_services_settings__allowed_period
+msgid ""
+"Specify the maximum allowed number of months or years based on the selected "
+"period type."
+msgstr "حدد الحد الأقصى المسموح به من الأشهر أو السنوات بناءً على نوع الفترة المحددة."
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__researcher_family_wizard__assignment_type__end_assignment
+msgid "End Assignment"
+msgstr "انهاء التكليف"
 

odex25_benefit/odex_benefit/models/service_request.py

@@ -989,9 +989,8 @@ class ServiceRequest(models.Model):
 
                         existing_requests = Service.search(calendar_year_domain)
                         total_spent = sum(existing_requests.mapped('requested_service_amount'))
-                        remaining_amount = rec.service_cat.max_amount - total_spent
 
-                        rec.service_max_amount = max(remaining_amount, 0.0)
+                        rec.service_max_amount = rec.service_cat.max_amount - total_spent
                     elif rec.max_limit_period == "year_from_request":
                         current_date = rec.date.date() if isinstance(rec.date, datetime) else rec.date
                         allowed_years = rec.service_cat.allowed_period or 1

odex25_benefit/odex_benefit/models/services_settings.py

@@ -113,8 +113,8 @@ class ServicesSettings(models.Model):
         ('calendar_year', 'Calendar year'),
     ], string='Maximum Limit Period')
     allowed_period = fields.Integer(
-        string='Maximum Allowed Period', default=1,
-        help='Specify the maximum allowed number of months or years based on the selected period type.'
+        string='Allowed Period', default=1,
+        help='Specify the allowed number of months or years based on the selected period type.'
     )
     max_months_limit = fields.Integer(
         string='Maximum Number of Months',

odex25_benefit/odex_benefit_project/i18n/ar_001.po

@@ -78,4 +78,30 @@ msgstr "اعتماد إدارة المالية"
 #. module: odex_benefit_project
 #: model:ir.model.fields,field_description:odex_benefit_project.field_service_request__project_expected_delivery_date
 msgid "Expected Delivery Date"
-msgstr "التاريخ المتوقع للتسليم"
+msgstr "التاريخ المتوقع للتسليم"
+
+#. module: odex_benefit_project
+#: model:ir.model.fields,field_description:odex_benefit_project.field_service_request__project_state
+msgid "Project Status"
+msgstr "حالة المشروع"
+
+#. module: odex_benefit_project
+#: model:ir.model.fields.selection,name:odex_benefit_project.selection__service_request__project_state__new
+msgid "New"
+msgstr "جديد"
+
+#. module: odex_benefit_project
+#: model:ir.model.fields.selection,name:odex_benefit_project.selection__service_request__project_state__open
+msgid "Running"
+msgstr "قيد التنفيذ"
+
+#. module: odex_benefit_project
+#: model:ir.model.fields.selection,name:odex_benefit_project.selection__service_request__project_state__hold
+msgid "Hold"
+msgstr "معلّق"
+
+#. module: odex_benefit_project
+#: model:ir.model.fields.selection,name:odex_benefit_project.selection__service_request__project_state__close
+msgid "Closed"
+msgstr "تم"
+