From 21bb7be1ca595779b38c3765ef63c78911392d40 Mon Sep 17 00:00:00 2001 From: sonal arora Date: Mon, 21 Sep 2020 08:09:54 +0000 Subject: [PATCH] work on payroll --- .../__pycache__/hr_payslip.cpython-36.pyc | Bin 27314 -> 27758 bytes hr_payroll_community/models/hr_payslip.py | 31 +++++++++++---- .../views/hr_payslip_views.xml | 37 ++++++++++-------- 3 files changed, 44 insertions(+), 24 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 8de5fe9250b574d63fd0ecd76aed4559b4c9c230..ec261b2f641f0a5b7f8cd7c54034ee9fa3f14361 100644 GIT binary patch delta 1512 zcmZ8hYitx%6rOYU(dq2Aoh~iic6ZCRWmlUP+R`qOmprS0BPxw zAP)OFW`_$>S|-1eOd)fXY(?AgCn@TrwWo@9!_934d%B9OnyiLQEjd71jMX#HpIURS6nFkX3%l>nq^8QuP<*QF0q!TOMZ-2`Q4X6EQ2O~(;` zqgsxS9Vk)7Zz?c1bxQM>M{fchT{ypvWx`7jc zL;kY;SYlEu+fsT$e^kgHzjKDp@sB`Yg{+4~WSao7wd_u2Glrf>8u7zCSC;R1`U#rE z?&i*}J|YshVJTBUvB^+J+)KlL*Kq#J-R5lbM+`1wwB;2zW&YOE#Na*CzB~<($80Fz zI7w=^@ocC7x3M}Lhf|mde+_?{o9=0|Gdq}CM<0M2U+DY-YH?!4d2pG^$`2Sc;O4%1 z{Jwhz>ddj88w^4e_#C>?9r*wY!ekI=O2;&>7j8p6Kl`x~EQG;w2#*UEh!r?;HE z%Ri4w|8lCLtN#q)#s1F-AB)D}Mf1n#HAc?6TVI23F}W>8{K~c=!p7}U1`OldKL!QE zJLW+)Kiv@mF!1K!02DDYw2TtkJG2)dXuiI4tqp?s%kX!!^U_F?uyu5Vsy9Ywi2puX zgjzE-_JcU;rxgtt-{*iHQ`@K776MK^LN#wPasPS-jq0mOM&Nn#f#e9lG(OAELI&HlW_)R^l6e8I>~F*)nlbC*4JC*z z(H!YI?j=@lu|{G`i8*-__i>r~=WMYC%Mb8ozU;KbgL5qAwbr)q);WkZTD;BTO~ieC zxyAj&T|7j30b;RnO*f!7-~> z^6F4FkqJgMKEr2{#^G!xU$a|um=&@DSe(2B@8J5>y|H{{G+}7L0X=)P9dxg_C>2&@ zPgeH{PuZmzi^}>^3g}$|x&`zISS6rWfan`NB49Pa0Ja?P!7l6=?4iGTYi|=io@yMJ z5!0RYf2?LL%R93f&7cO4ssDQfa{4i`)aqu@nK9QCRTbw{RnovOQ={SkUKCa6iQbMW zq_+5E=(QrcTU?QTeVF(>qfQW+$)b0e3^I6FHDNWVWYp`6Lj@0Yyci0tq>D?#ZYB=5 X0d(RM>DH=Q2|PhhjYst~dwTx?Ut5+p delta 1159 zcmZ8gZA@Eb6u#%Z?WOAnl!Bw9rIdAi2`od_CBP<33ZaallWiIomQ8yEfZpr+k+x5p{{D_KQpb5IDvw!wyCeuWx{xBvk({syyEjQ1TbI$ud z=e+N^=l%T(T>Ku)T{fF}@Ayo_e(Zv|(bZ5U2!e$$K*)SYwD`3u1cb@uJgATq9`|6# z)plr16_O_MHxSGOOF_(wiw{s#qP;_TL)OYg)lgs{a053`+@|j)HYCdl6$Cq>k{i!R z)8Y)|jiiuNqpnbmDnyKP5APRv88;mkNbOKX(%T9wAQT`kImoF}C6)0FXIKG1n3HhG z9cYu3U36k4O;of_MKg(5Boj?Vm8GIRosG*%B$`U47oxK-a+vVA@TjNV z*FvrUX4uHgU=~eK4Oa3D^hqT)K)H6!v&`UqJm2spNma?`i)i*~lzXJEGkZKZ8HfQ0|GuYv_vJKg}JmfrdSgG%h^JVxm+ zb^gYn9?xxGfxB_e{{?Kt?j0|JTU*=l7Xv?j+I!I7S`>-8%2dXqqZosl64xovo% z-;E#jTG2XCi9L23_BXlkQ12#~#Fu+7(wRqh2En&TyVrXqX5=}gS$9jMw?NU8p42Yw znr7^#pn3aWVp2(P4o}rom9BUif4J|-JA0IK&@sU z>k*+A_l*BYN?#~O{7h(^y7g0Np6vT4@?g=vnYgN#nvnjbdMFvnA*7Iw~A?hsV+NKc!4dv;Y7A diff --git a/hr_payroll_community/models/hr_payslip.py b/hr_payroll_community/models/hr_payslip.py index 717d008..4a83eb8 100644 --- a/hr_payroll_community/models/hr_payslip.py +++ b/hr_payroll_community/models/hr_payslip.py @@ -162,14 +162,20 @@ class HrPayslip(models.Model): contract_ids = payslip.contract_id.ids or \ self.get_contract(payslip.employee_id, payslip.date_from, payslip.date_to) for contract in self.contract_id: - print('contract++++++++++++++++=',contract) + print('contract++++++++++++++++=',contract.wage,contract.hra,contract.other_allowance,contract.travel_allowance) + total_salary = contract.wage + contract.other_allowance + contract.hra + contract.travel_allowance list_value =[(0, 0, { - 'emloyee_payslip_id':self.id, + 'date_from':payslip.date_from, + 'date_to':payslip.date_to, + 'state':payslip.state, + 'number':payslip.number, + 'emloyee_payslip_id':payslip.id, 'employee_id':payslip.employee_id.id, 'basic_salary':contract.wage, - 'other_allowances':contract.other_allowance, + 'other_allowance':contract.other_allowance, 'housing_allowance':contract.hra, - 'travel_allowance':contract.travel_allowance + 'travel_allowance':contract.travel_allowance, + 'total_salary':total_salary })] print('list_value============',list_value) payslip.emp_salary_line_ids = list_value @@ -674,14 +680,23 @@ class EmployeeSalary(models.Model): #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') 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') + total_salary = fields.Float('Gross Salary') + loan_deduct = fields.Float('Loan Deduduction') + monthly_deduct = fields.Float('Other Deduction') 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,) + date_from = fields.Date(string='Date From') + date_to = fields.Date(string='Date To') + number = fields.Char(string='Reference') + net_salary = fields.Float('Net Salary') + state = fields.Selection([ + ('draft', 'Draft'), + ('verify', 'Waiting'), + ('done', 'Done'), + ('cancel', 'Rejected'), + ], string='Status', index=True, readonly=True, copy=False, default='draft',) diff --git a/hr_payroll_community/views/hr_payslip_views.xml b/hr_payroll_community/views/hr_payslip_views.xml index cde93e1..3aaf5ba 100644 --- a/hr_payroll_community/views/hr_payslip_views.xml +++ b/hr_payroll_community/views/hr_payslip_views.xml @@ -5,17 +5,21 @@ employee.salary.rule.tree employee.salary.rule - + + + + - - - - - + + + + + + @@ -34,10 +38,9 @@ - + + - - @@ -47,15 +50,17 @@ - Employee SalaryRule + Employee Payslip Details employee.salary.rule - tree,form - + tree,form + @@ -309,7 +314,7 @@ - +