From 1ece768807d4161d96f72ca261d45e11bc64341f Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Sun, 20 Sep 2020 21:48:05 +0000
Subject: [PATCH] work on payroll

---
 .../__pycache__/hr_payslip.cpython-36.pyc     | Bin 26644 -> 27314 bytes
 hr_payroll_community/models/hr_payslip.py     |  31 +++++++++++++-----
 .../security/ir.model.access.csv              |   2 +-
 .../views/hr_payslip_views.xml                |   8 +++--
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/hr_payroll_community/models/__pycache__/hr_payslip.cpython-36.pyc b/hr_payroll_community/models/__pycache__/hr_payslip.cpython-36.pyc
index 558be6bd05df298e7ad809ec18f6e884b30c67bf..8de5fe9250b574d63fd0ecd76aed4559b4c9c230 100644
GIT binary patch
delta 4499
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
A-2eap

delta 3872
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
E7m0niNdN!<

diff --git a/hr_payroll_community/models/hr_payslip.py b/hr_payroll_community/models/hr_payslip.py
index 3d21e7e..717d008 100644
--- a/hr_payroll_community/models/hr_payslip.py
+++ b/hr_payroll_community/models/hr_payslip.py
@@ -63,7 +63,7 @@ class HrPayslip(models.Model):
     input_line_ids = fields.One2many('hr.payslip.input', 'payslip_id', string='Payslip Inputs',
                                      readonly=True, states={'draft': [('readonly', False)]})
     emp_salary_line_ids = fields.One2many('employee.salary.rule', 'emloyee_payslip_id', string='Salary rule',
-                                     readonly=True)
+                                     )
     paid = fields.Boolean(string='Made Payment Order ? ', readonly=True, copy=False,
                           states={'draft': [('readonly', False)]})
     note = fields.Text(string='Internal Note', readonly=True, states={'draft': [('readonly', False)]})
@@ -156,14 +156,23 @@ class HrPayslip(models.Model):
             number = payslip.number or self.env['ir.sequence'].next_by_code('salary.slip')
             # delete old payslip lines
             payslip.line_ids.unlink()
+            payslip.emp_salary_line_ids.unlink()
             # set the list of contract for which the rules have to be applied
             # if we don't give the contract, then the rules to apply should be for all current contracts of the employee
             contract_ids = payslip.contract_id.ids or \
                            self.get_contract(payslip.employee_id, payslip.date_from, payslip.date_to)
-            for contract in contract_ids:
+            for contract in self.contract_id:
                 print('contract++++++++++++++++=',contract)
-            self.emp_salary_line_ids[(0, 0, {
-                'employee_id': self.employee_id.id})]
+                list_value =[(0, 0, {
+                    'emloyee_payslip_id':self.id,
+                    'employee_id':payslip.employee_id.id,
+                    'basic_salary':contract.wage,
+                    'other_allowances':contract.other_allowance,
+                    'housing_allowance':contract.hra,
+                    'travel_allowance':contract.travel_allowance
+                    })]
+                print('list_value============',list_value)
+                payslip.emp_salary_line_ids = list_value
             lines = [(0, 0, line) for line in self._get_payslip_lines(contract_ids, payslip.id)]
             payslip.write({'line_ids': lines, 'number': number})
         return True
@@ -659,14 +668,20 @@ class EmployeeSalary(models.Model):
     _name = 'employee.salary.rule'
     _description = 'Employee Payslip Salary Rule'
 
-    employee_id = fields.Many2one('hr.employee', string='Employee', required=True, readonly=True, 
+    employee_id = fields.Many2one('hr.employee', string='Employee', 
         help="Employee")
     emloyee_payslip_id = fields.Many2one('hr.payslip', string='Pay Slip',index=True, help="Payslip")
-    basic_salary = fields.Float()
+    #basic_salary = fields.Float()
+    basic_salary = fields.Integer('Basic Salary',help="Employee's monthly gross wage.")
     other_allowance = fields.Float()
-    housing_allowance = fields.Float('Housing Allowance')
-    travel_allowance = fields.Float('Transportation Allowance')
+    #housing_allowance = fields.Float('Housing Allowance')
+    #travel_allowance = fields.Float('Transportation Allowance')
+    other_allowances = fields.Monetary(string="Other Allowance", help="Other allowances")
+    housing_allowance = fields.Monetary(string='HRA', tracking=True, help="House rent allowance.")
+    travel_allowance = fields.Monetary(string="Travel Allowance", help="Travel allowance")
     total_salary = fields.Float('Total Salary')
     monthly_deduct = fields.Float('Monthly Deduction in AED')
     deduction_start_date = fields.Date('Deduction Start Date')
     deduction_end_date = fields.Date('Deduction End Date')
+    currency_id = fields.Many2one(string="Currency", related='company_id.currency_id', readonly=True)
+    company_id = fields.Many2one('res.company', default=lambda self: self.env.company,)
diff --git a/hr_payroll_community/security/ir.model.access.csv b/hr_payroll_community/security/ir.model.access.csv
index e94f4b7..ccbbb8c 100644
--- a/hr_payroll_community/security/ir.model.access.csv
+++ b/hr_payroll_community/security/ir.model.access.csv
@@ -12,4 +12,4 @@ access_hr_rule_input_officer,hr.rule.input.office,model_hr_rule_input,hr_payroll
 access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,hr_payroll_community.group_hr_payroll_community_user,1,1,1,1
 access_hr_contract_advantage_template,hr.contract.advantage.template.user,model_hr_contract_advantage_template,hr_payroll_community.group_hr_payroll_community_user,1,1,1,1
 access_hr_contract_advantage_template_hr_user,hr.contract.advantage.template.hr.user,model_hr_contract_advantage_template,hr.group_hr_user,1,0,0,0
-access_employee_salary_rule,employee.salary.rule.user,model_employee_salary_rule,hr.group_hr_user,1,1,0,0
+access_employee_salary_rule,employee.salary.rule.user,model_employee_salary_rule,hr.group_hr_user,1,1,1,1
diff --git a/hr_payroll_community/views/hr_payslip_views.xml b/hr_payroll_community/views/hr_payslip_views.xml
index ef45abd..f1e1592 100644
--- a/hr_payroll_community/views/hr_payslip_views.xml
+++ b/hr_payroll_community/views/hr_payslip_views.xml
@@ -258,13 +258,15 @@
                             <tree string="Employee Salary Rule" editable="bottom">
                                 <field name="employee_id"/>
                                 <field name="basic_salary"/>
-                                <field name="other_allowance"/>
+                                <field name="other_allowances"/>
                                 <field name="housing_allowance"/>
                                 <field name="travel_allowance"/>
                                 <field name="total_salary"/>
                                 <field name="monthly_deduct"/>
                                 <field name="deduction_start_date"/>
-                                <field name="deduction_end_date"/>
+				<field name="deduction_end_date"/>
+				<field name="currency_id"/>
+				<field name="company_id"/>
                             </tree>
                         </field>
                     </page>
@@ -423,4 +425,4 @@
         res_model="hr.payslip.line"
         id="act_contribution_reg_payslip_lines"/>
 
-</odoo>
\ No newline at end of file
+</odoo>