From fffe872d834818e5349e88973a303ff35278b744 Mon Sep 17 00:00:00 2001 From: ahmed-nouri051 Date: Thu, 12 Jun 2025 09:21:22 +0200 Subject: [PATCH] apply changement on respartner --- .../exp_official_mission/__manifest__.py | 1 + odex25_hr/exp_official_mission/i18n/ar_001.po | 9 + .../exp_official_mission/models/attendance.py | 7 + .../views/res_partner_form_view.xml | 15 + .../exp_official_mission/views/training.xml | 592 ++++++++++-------- 5 files changed, 363 insertions(+), 261 deletions(-) create mode 100644 odex25_hr/exp_official_mission/views/res_partner_form_view.xml diff --git a/odex25_hr/exp_official_mission/__manifest__.py b/odex25_hr/exp_official_mission/__manifest__.py index f28e5d335..84433653f 100644 --- a/odex25_hr/exp_official_mission/__manifest__.py +++ b/odex25_hr/exp_official_mission/__manifest__.py @@ -25,6 +25,7 @@ 'views/ticket_view.xml', 'views/course_view.xml', 'views/appraisal_view.xml', + 'views/res_partner_form_view.xml', 'views/training_menus.xml', 'wizard/employee_selection_wizard.xml', 'wizard/training_appraisal.xml', diff --git a/odex25_hr/exp_official_mission/i18n/ar_001.po b/odex25_hr/exp_official_mission/i18n/ar_001.po index 85a94cfa9..a3e80e378 100644 --- a/odex25_hr/exp_official_mission/i18n/ar_001.po +++ b/odex25_hr/exp_official_mission/i18n/ar_001.po @@ -2754,3 +2754,12 @@ msgstr "الموارد البشرية" #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_type_form_view msgid "Analytic Account" msgstr "الحساب التحليلي" + + + + + +#. module: exp_official_mission +#: model:ir.model.fields,field_description:exp_official_mission.field_res_partner_training +msgid "Training" +msgstr "تدريب" diff --git a/odex25_hr/exp_official_mission/models/attendance.py b/odex25_hr/exp_official_mission/models/attendance.py index 4fd768659..039949191 100644 --- a/odex25_hr/exp_official_mission/models/attendance.py +++ b/odex25_hr/exp_official_mission/models/attendance.py @@ -8,3 +8,10 @@ class AttendanceTransactions(models.Model): official_id = fields.Many2one('hr.official.mission', string='Mission Request') total_mission_hours = fields.Float() mission_name = fields.Many2one(related='official_id.mission_type', string='Mission Type', store=True) + + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + training = fields.Boolean(string="Training",default=True) \ No newline at end of file diff --git a/odex25_hr/exp_official_mission/views/res_partner_form_view.xml b/odex25_hr/exp_official_mission/views/res_partner_form_view.xml new file mode 100644 index 000000000..1bb06f82e --- /dev/null +++ b/odex25_hr/exp_official_mission/views/res_partner_form_view.xml @@ -0,0 +1,15 @@ + + + + + res.partner.form.inherit.training + res.partner + + + + + + + + + \ No newline at end of file diff --git a/odex25_hr/exp_official_mission/views/training.xml b/odex25_hr/exp_official_mission/views/training.xml index 9c46a8b03..95779c8e2 100644 --- a/odex25_hr/exp_official_mission/views/training.xml +++ b/odex25_hr/exp_official_mission/views/training.xml @@ -11,8 +11,8 @@ + parent="employee_requests.employee_request_menu_item" + action="employee_training_action" /> Employee Training @@ -20,242 +20,291 @@
-
- -
- - + + + domain="[('work_state', '=', 'training'),('special_hours', '!=', True)]" + attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> + attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> - - + attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> + + + attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> - + attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> + + attrs="{'required': [('state', '=', 'depart_manager')], + 'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> - - + attrs="{'required': [('state', '=', 'depart_manager')], + 'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }" /> + + - + - - - - + attrs="{'readonly':[('state','!=','draft')]}" /> + + + + - + attrs="{'readonly':[('state','!=','draft')]}" /> + - - + + + attrs="{'readonly':[('state','!=','depart_manager')], 'required': [('state', '=', 'depart_manager')],'invisible':[('related_with_financial','=',False)]}" /> + 'required':[('move_type','=','payroll'),('state', '=', 'depart_manager'),('related_with_financial','=',True)]}" /> + + attrs="{'invisible':['|',('state','!=','approve'),('Tra_cost_invo_id','=',False)]}" + groups="hr_base.group_account_manager,hr.group_hr_user,hr_base.group_division_manager" /> - + - - - + + + - - -
-
+ +
+
+ attrs="{'readonly':[('state','not in',('depart_manager','direct_manager','send','draft'))]}"> - - - - + + + + - + - + + widget="float_time" /> + readonly="1" force_save="1" /> + attrs="{'column_invisible':[('parent.related_with_financial','=',False)]}" + readonly="0" /> - - + groups="hr_base.group_account_manager,hr.group_hr_user,hr_base.group_division_manager" /> + + - - - - - - - - + + + + - - - - + + + + - - - - + + + +
-
+
- - - + + +
@@ -488,23 +557,26 @@ Employee Training Course hr.official.mission.employee - - - - - - - - - - - - - - - -