work on payroll

This commit is contained in:
sonal arora
2020-09-20 10:32:00 +00:00
parent 33aed253cf
commit f0af45d9da
18 changed files with 4 additions and 4 deletions

View File

@@ -664,5 +664,5 @@ class EmployeeSalary(models.Model):
travel_allowance = fields.Float('Transportation Allowance') travel_allowance = fields.Float('Transportation Allowance')
total_salary = fields.Float('Total Salary') total_salary = fields.Float('Total Salary')
monthly_deduct = fields.Float('Monthly Deduction in AED') monthly_deduct = fields.Float('Monthly Deduction in AED')
deduction_start_date = fields.date('Deduction Start Date') deduction_start_date = fields.Date('Deduction Start Date')
deduction_end_date = fields.date('Deduction End Date') deduction_end_date = fields.Date('Deduction End Date')

View File

@@ -12,3 +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_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.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_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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
12 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
13 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
14 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
15 access_employee_salary_rule employee.salary.rule.user model_employee_salary_rule hr.group_hr_user 1 1 0 0

View File

@@ -7,7 +7,6 @@ from odoo.exceptions import UserError
class MultiHRPayslipDoneWiz(models.TransientModel): class MultiHRPayslipDoneWiz(models.TransientModel):
_name = 'multi.hr.payslip.done.wiz' _name = 'multi.hr.payslip.done.wiz'
@api.multi
def done_multi_hr_payslip(self): def done_multi_hr_payslip(self):
hr_payslip_ids = self.env['hr.payslip'].browse(self._context.get('active_ids')) hr_payslip_ids = self.env['hr.payslip'].browse(self._context.get('active_ids'))
for payslip in hr_payslip_ids: for payslip in hr_payslip_ids:

View File

@@ -11,7 +11,7 @@
<form string="Done"> <form string="Done">
<h3>Click on Confirm to submit payslips for Confirm multi HR Payslip. </h3> <h3>Click on Confirm to submit payslips for Confirm multi HR Payslip. </h3>
<footer> <footer>
<button name="done_multi_hr_payslip" string="Submit To Approve" type="object" class="oe_highlight"/> <button name="done_multi_hr_payslip" string="Confirm" type="object" class="oe_highlight"/>
<button string="Cancel" class="oe_link" special="cancel"/> <button string="Cancel" class="oe_link" special="cancel"/>
</footer> </footer>
</form> </form>