From 9aea3cd7fedad1c810999d9d3c2d2dd5f756a4a2 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Tue, 22 Sep 2020 12:02:51 +0000
Subject: [PATCH] work on reports

---
 .../__pycache__/hr_payslip.cpython-36.pyc     | Bin 27758 -> 28280 bytes
 hr_payroll_community/models/hr_payslip.py     |  11 +++++++----
 2 files changed, 7 insertions(+), 4 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 ec261b2f641f0a5b7f8cd7c54034ee9fa3f14361..c8f392df19bcce10ac7a9de3aa5d1fc1bc9fd6ff 100644
GIT binary patch
delta 4216
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
a$bG&6Gvk4I(S>%Wdxks5o$L0x7yK8Ms{MNa

delta 4003
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

diff --git a/hr_payroll_community/models/hr_payslip.py b/hr_payroll_community/models/hr_payslip.py
index 3a1f938..7652589 100644
--- a/hr_payroll_community/models/hr_payslip.py
+++ b/hr_payroll_community/models/hr_payslip.py
@@ -162,11 +162,14 @@ class HrPayslip(models.Model):
             contract_ids = payslip.contract_id.ids or \
                            self.get_contract(payslip.employee_id, payslip.date_from, payslip.date_to)
             for input_line in payslip.input_line_ids:
+                print('input====================',input_line.code)
+                loan_deduct = 0.0
+                other_deduct = 0.0
                 if input_line.code == 'LO':
                     loan_deduct = input_line.amount
-                else:
+                if not input_line.code == 'LO':
                     other_deduct +=  input_line.amount
-                print('tets+++++++++++++++++',loan_deduct,other_deduct)
+                print('tets+++++++++++++++++',input_line.code,loan_deduct,other_deduct)
             for contract in self.contract_id:
                 total_salary = contract.wage + contract.other_allowance + contract.hra + contract.travel_allowance
                 net_salary = (total_salary -(loan_deduct + other_deduct) )
@@ -182,8 +185,8 @@ class HrPayslip(models.Model):
                     'housing_allowance':contract.hra,
                     'travel_allowance':contract.travel_allowance,
                     'total_salary':total_salary,
-                    'loan_deduct': loan_deduct,
-                    'monthly_deduct':other_deduct
+                    'loan_deduct': sum(input_line.amount for input_line in payslip.input_line_ids if input_line.code == 'LO'),
+                    'monthly_deduct':sum(input_line.amount for input_line in payslip.input_line_ids if not input_line.code == 'LO'),
                     'net_salary':net_salary
                     })]
                 print('list_value============',list_value)