Merge pull request #273 from expsa/dev_odex25_hr

Dev odex25 hr

odex25_hr/employee_requests/i18n/ar_001.po

@@ -2518,19 +2518,6 @@ msgstr "السبب"
 msgid "Receiving driving License :"
 msgstr "استلام رخصة القيادة:"
 
-#. module: employee_requests
-#: code:addons/employee_requests/models/hr_clearance_form.py:0
-#: code:addons/employee_requests/models/hr_clearance_form.py:0
-#: code:addons/employee_requests/models/hr_clearance_form.py:0
-#: code:addons/employee_requests/models/hr_clearance_form.py:0
-#: code:addons/employee_requests/models/hr_clearance_form.py:0
-#: code:addons/employee_requests/models/other_request.py:0
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
-#, python-format
-msgid "Refuse"
-msgstr "مرفوض"
-
 #. module: employee_requests
 #: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__refuse_cause
 msgid "Refuse Cause"
@@ -2539,17 +2526,24 @@ msgstr "سبب الرفض"
 #. module: employee_requests
 #: code:addons/employee_requests/models/employee_department_jobs.py:0
 #: code:addons/employee_requests/models/employee_effective_form.py:0
-#: code:addons/employee_requests/models/employee_overtime_request.py:0
 #: code:addons/employee_requests/models/house_allowance_advance.py:0
-#: code:addons/employee_requests/models/hr_personal_permission.py:0
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view
 #, python-format
 msgid "Refused"
 msgstr "مرفوض"
 
+#. module: employee_requests
+#: code:addons/employee_requests/models/employee_overtime_request.py:0
+#: code:addons/employee_requests/models/hr_personal_permission.py:0
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view
+#, python-format
+msgid "Refuse"
+msgstr "رفض"
+
 #. module: employee_requests
 #: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__refused_by
 msgid "Refused By"
@@ -3802,13 +3796,19 @@ msgid "Print Salary Confirmation"
 msgstr "طباعة تثبيت الراتب"
 
 #. module: employee_requests
-#: code:addons/employee_requests/models/employee_overtime_request.py:0
+#: code:addons/employee_requests/models/hr_personal_permission.py:0
 #, python-format
-msgid "Sorry, The Approval For The Direct Manager %s Only OR HR Manager!"
-msgstr "للأسف، لموافقة المدير المباشر %s فقط او مدير الموارد البشرية !"
+msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
+msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
 
 #. module: employee_requests
 #: code:addons/employee_requests/models/employee_overtime_request.py:0
 #, python-format
-msgid "Sorry, The Approval For The Department Manager %s Only OR HR Manager!"
-msgstr "للأسف، لموافقة مدير الإدارة %s فقط او مدير الموارد البشرية !"
+msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
+msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
+
+#. module: employee_requests
+#: code:addons/employee_requests/models/employee_overtime_request.py:0
+#, python-format
+msgid "Sorry, The Approval For The Department Manager '%s' Only OR HR Manager!"
+msgstr "للأسف، لموافقة مدير الإدارة '%s' فقط او مدير الموارد البشرية !"

odex25_hr/employee_requests/models/employee_overtime_request.py

@@ -150,10 +150,10 @@ class employee_overtime_request(models.Model):
         #self.state = "direct_manager"
         for rec in self:
            if rec.employee_id.parent_id:
-              if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid:
+              if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
                  rec.write({'state': 'direct_manager'})
               else:
-                  raise exceptions.Warning(_('Sorry, The Approval For The Direct Manager %s Only OR HR Manager!')%(rec.employee_id.parent_id.name))
+                  raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
            else:
                rec.write({'state': 'direct_manager'})
 
@@ -162,10 +162,10 @@ class employee_overtime_request(models.Model):
         #self.state = "financial_manager"
         for rec in self:
            if rec.employee_id.coach_id:
-              if rec.employee_id.coach_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid:
+              if rec.employee_id.coach_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
                  rec.write({'state': 'financial_manager'})
               else:
-                  raise exceptions.Warning(_('Sorry, The Approval For The Department Manager %s Only OR HR Manager!')%(rec.employee_id.coach_id.name))
+                  raise exceptions.Warning(_("Sorry, The Approval For The Department Manager '%s' Only OR HR Manager!")%(rec.employee_id.coach_id.name))
            else:
                rec.write({'state': 'financial_manager'})
 

odex25_hr/employee_requests/models/hr_personal_permission.py

@@ -295,10 +295,10 @@ class HrPersonalPermission(models.Model):
         #self.state = "direct_manager"
         for rec in self:
            if rec.employee_id.parent_id:
-              if rec.employee_id.parent_id.user_id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid:
+              if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
                  rec.write({'state': 'direct_manager'})
               else:
-                  raise exceptions.Warning(_('Sorry, The Approval For The Direct Manager %s Only OR HR Manager!')%(rec.employee_id.parent_id.name))
+                  raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
            else:
                rec.write({'state': 'direct_manager'})
 

odex25_hr/employee_requests/views/employee_overtime_request.xml

@@ -30,30 +30,30 @@
 
                         <button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object"
                                 states="submit" groups="hr_base.group_division_manager"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object"
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
                                 states="submit" groups="hr_base.group_division_manager"/>
 
                         <button name="financial_manager" string="Department Manager" class="oe_highlight" type="object"
                                 states="direct_manager" groups="hr_base.group_department_manager"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object"
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
                                 states="direct_manager" groups="hr_base.group_department_manager"/>
 
                         <button name="hr_aaproval" string="HR Approval" class="oe_highlight" type="object"
                                 states="financial_manager" groups="hr.group_hr_user, hr.group_hr_manager"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object"
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
                                 states="financial_manager" groups="hr.group_hr_user, hr.group_hr_manager"/>
 
                         <button name="executive_office" string="Executive Approval" class="oe_highlight" type="object"
                                 groups="hr_base.group_general_manager,hr_base.group_executive_manager"
                                 attrs="{'invisible':['|',('state','!=','hr_aaproval'),('exception','!=',True)]}"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object"
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
                                 groups="hr_base.group_general_manager,hr_base.group_executive_manager"
                                 attrs="{'invisible':['|',('state','!=','hr_aaproval'),('exception','!=',True)]}"/>
 
                         <button name="validated" string="Finance Approval" class="oe_highlight" type="object"
                                 groups="hr_base.group_account_manager"
                                 states="executive_office"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object"
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
                                 states="executive_office" groups="hr_base.group_account_manager"/>
 
                         <button name="re_draft" string="RE-Draft" class="oe_highlight" type="object"

odex25_hr/employee_requests/views/hr_personal_permission.xml

@@ -7,7 +7,7 @@
             <field name="view_mode">tree,form,calendar</field>
         </record>
 
-        <record model="ir.ui.view" id="view_permission_calendar">
+      <record model="ir.ui.view" id="view_permission_calendar">
             <field name="name">hr.personal.permission.calendar</field>
             <field name="model">hr.personal.permission</field>
             <field name="arch" type="xml">
@@ -25,55 +25,58 @@
             <field name="arch" type="xml">
                 <form>
                     <header>
-                        <button name="send" string="Submit" class="oe_highlight" type="object" states="draft" groups="base.group_user"/>
+                        <button name="send" string="Submit" class="oe_highlight" type="object"
+                                states="draft" groups="base.group_user"/>
 
-                        <button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object" states="send" groups="hr_base.group_division_manager"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object" states="send" groups="hr_base.group_division_manager"/>
+                        <button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object"
+                                states="send" groups="hr_base.group_division_manager"/>
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
+                                states="send" groups="hr_base.group_division_manager"/>
 
-                        <button name="approve" string="HR Approve" class="oe_highlight" type="object" states="direct_manager" groups="hr.group_hr_user"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object" states="direct_manager" groups="hr.group_hr_user"/>
-                        <button name="draft_state" string="RE-Draft" class="oe_highlight" type="object" states="approve" groups="hr.group_hr_user"/>
-                        <button name="draft_state" string="RE-Draft" class="oe_highlight" type="object" states="refused" groups="hr.group_hr_user" confirm="Are you sure to Reset To Draft This Record?"/>
+                        <button name="approve" string="HR Approve" class="oe_highlight" type="object"
+                                states="direct_manager" groups="hr.group_hr_user"/>
+                        <button name="refused" string="Refuse" class="oe_highlight" type="object"
+                                states="direct_manager" groups="hr.group_hr_user"/>
+                        <button name="draft_state" string="RE-Draft" class="oe_highlight" type="object"
+                                states="approve" groups="hr.group_hr_user"/>
+                        <button name="draft_state" string="RE-Draft" class="oe_highlight" type="object"
+                                states="refused" groups="hr.group_hr_user" confirm="Are you sure to Reset To Draft This Record?"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
                         <group>
                             <group string="Permission Info">
-                                <field name="date" string="Date Request" attrs="{'readonly':[('state','!=','draft')],'required':1}"/>
-
-                                <label for='time_permission_from' string="Time"/>
-                                <div class="row">
-                                    <div class="col-6">
-                                        <label for='time_permission_from' string="Time from"/>
-                                        <field name="time_permission_from" widget="float_time" attrs="{'readonly':[('state' , '!=' , 'draft')],'required':1}"/>
-                                    </div>
-                                    <div class="col-6">
-                                        <label for='time_permission_to' string="Time To"/>
-                                        <field name="time_permission_to" widget="float_time" attrs="{'readonly':[('state' , '!=' , 'draft')],'required':1}"/>
-                                    </div>
-                                </div>
-                                <field name="date_from" invisible="1" string="Date From" attrs="{'readonly':[('state' , '!=' , 'draft')],'required':1}"/>
-                                <field name="date_to" invisible="1" string="Date To" attrs="{'readonly':[('state' , '!=' , 'draft')],'required':1}"/>
+                                <field name="date" string="Date Request"
+                                       attrs="{'readonly':[('state','!=','draft')],'required':1}"/>
+                                <field name="date_from" string="Date From"
+                                       attrs="{'readonly':[('state' , '!=' , 'draft')],'required':1}"/>
+                                <field name="date_to" string="Date To"
+                                       attrs="{'readonly':[('state' , '!=' , 'draft')],'required':1}"/>
                                 <field name="duration" string="Duration" attrs="{'readonly':1}" widget="float_time"/>
                                 <field name="balance" string="Permission Limit" readonly="1" widget="float_time"/>
                                 <field name="permission_number" force_save="True" string="Permission Per Month" widget="float_time"/>
-                                <field name="type_exit" string="Type Exit" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="type_exit" string="Type Exit"
+                                       attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group string="Employee Info">
-                                <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                                <field name="from_hr_department" string="Another Employee" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="employee_id" string="Employee" attrs="{'readonly': ['|',('from_hr_department','=',False),('state','!=','draft')],'required':True}"/>
+                                 <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                                <field name="from_hr_department" string="Another Employee"
+                                       attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="employee_id" string="Employee"
+                                       attrs="{'readonly': ['|',('from_hr_department','=',False),('state','!=','draft')],'required':True}"/>
                                 <field name="employee_no" string="Employee No" readonly="1"/>
                                 <field name="job_id" string="Job Title" readonly="1"/>
                                 <field name="department_id" string="Department" readonly="1"/>
                             </group>
                         </group>
                         <group>
-                            <field name="mission_purpose" string="Reasons" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="mission_purpose" string="Reasons"
+                                   attrs="{'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <!--notebook>
                             <page string="Attachments" name="attachments">
-                                <field name="attach_ids" string="Attachments" attrs="{'readonly':[('state','!=','draft')]}">
+                                <field name="attach_ids" string="Attachments"
+                                       attrs="{'readonly':[('state','!=','draft')]}">
                                     <tree editable="bottom">
                                         <field name="name" string="attachment Name"/>
                                         <field name="datas" string="file content"/>
@@ -81,12 +84,15 @@
                                 </field>
                             </page>
                             <page string="Refusal Causes" name="refusal_causes">
-                                <field name="refuse_cause" placeholder="Refuse Cause .........." attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="refuse_cause" placeholder="Refuse Cause .........."
+                                       attrs="{'readonly':[('state','!=','draft')]}"/>
                             </page>
                             <page string="Information" name="information">
                                 <group>
-                                    <field name="approved_by" string="Approved By" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                    <field name="refused_by" string="Refused By" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                    <field name="approved_by" string="Approved By"
+                                           attrs="{'readonly':[('state','!=','draft')]}"/>
+                                    <field name="refused_by" string="Refused By"
+                                           attrs="{'readonly':[('state','!=','draft')]}"/>
                                 </group>
                             </page>
                         </notebook-->

odex25_hr/hr_holidays_public/i18n/ar_001.po

@@ -3587,5 +3587,5 @@ msgstr ""
 #. module: hr_holidays_public
 #: code:addons/hr_holidays_public/models/hr_holidays.py:0
 #, python-format
-msgid "Sorry, The Approval For The Direct Manager %s Only OR HR Manager!"
-msgstr "للأسف، لموافقة المدير المباشر %s فقط او مدير الموارد البشرية !"
+msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
+msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"

odex25_hr/hr_holidays_public/models/hr_holidays.py

@@ -984,10 +984,10 @@ class HRHolidays(models.Model):
         #The Approval For The Direct Manager only
         for rec in self:
            if rec.employee_id.parent_id:
-              if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid:
+              if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
                  rec.write({'state': 'direct_manager'})
               else:
-                  raise exceptions.Warning(_('Sorry, The Approval For The Direct Manager %s Only OR HR Manager!')%(rec.employee_id.parent_id.name))
+                  raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
            else:
                rec.write({'state': 'direct_manager'})