|
@@ -139,16 +139,14 @@ class HrPayslip(models.Model):
|
|
|
|
|
|
input_payslip = payslip_input.create(input_line)
|
|
|
|
|
|
- if input_payslip:
|
|
|
- if (values['salary_rule'] == 'ADL'):
|
|
|
-
|
|
|
- ValueStatement = {
|
|
|
- 'id_imput': input_payslip.id,
|
|
|
- 'journal_id': values['journal'],
|
|
|
- 'journal_ref': values['journal_ref']
|
|
|
- }
|
|
|
+ if (input_payslip) and (values['salary_rule'] == 'ADL'):
|
|
|
+ value_statement = {
|
|
|
+ 'id_imput': input_payslip.id,
|
|
|
+ 'journal_id': values['journal'],
|
|
|
+ 'journal_ref': values['journal_ref']
|
|
|
+ }
|
|
|
|
|
|
- self.bank_statement_import(ValueStatement)
|
|
|
+ self.bank_statement_import(value_statement)
|
|
|
|
|
|
return True if input_payslip else False
|
|
|
|
|
@@ -160,8 +158,6 @@ class HrPayslip(models.Model):
|
|
|
payslip_input = self.env['hr.payslip.input'].search([('id', '=', values['id_imput'])])
|
|
|
### consultar payslip
|
|
|
payslip = self.env['hr.payslip'].search([('id', '=', payslip_input.payslip_id.id)])
|
|
|
- ### consultar salariRule
|
|
|
- salary_rule = self.env['hr.salary.rule'].search([('code', '=', payslip_input.code)])
|
|
|
### consultar accountJournal
|
|
|
journal = self.env['account.journal'].search([('id', '=', values['journal_id'])])
|
|
|
### Consultar Caja Abierta, Método de Pagos, Fecha de Hoy
|
|
@@ -192,7 +188,7 @@ class HrPayslip(models.Model):
|
|
|
'amount': payslip_input.amount,
|
|
|
'account_id': bank_statement.journal_id.internal_account_id.id,
|
|
|
'ref': payslip_input.code,
|
|
|
- 'name': str(payslip_input.name)+"(Ref. pago: "+str(values['journal_ref']) if values['journal_ref'] else payslip_input.name,
|
|
|
+ 'name': str(payslip_input.name)+"(Ref. pago: "+str(values['journal_ref'])+")" if values['journal_ref'] else payslip_input.name,
|
|
|
'partner_id': payslip.employee_id.address_home_id.id,
|
|
|
'note': payslip_input.id,
|
|
|
}
|
|
@@ -200,7 +196,7 @@ class HrPayslip(models.Model):
|
|
|
|
|
|
return True if statement_line else False
|
|
|
|
|
|
- # Eliminar Adelanto/Comision
|
|
|
+ # Eliminar Comision
|
|
|
@api.model
|
|
|
def unlink_payslip_input(self,values):
|
|
|
payslip_input =self.env['hr.payslip.input'].search([('id', '=', values['input_id']),('payslip_id', '=', values['id'])])
|
|
@@ -208,7 +204,7 @@ class HrPayslip(models.Model):
|
|
|
|
|
|
return True if payslip_input else False
|
|
|
|
|
|
- # Actualizar Aelanto Comision
|
|
|
+ # Actualizar Comision
|
|
|
@api.model
|
|
|
def write_payslip_input(self, values):
|
|
|
paylip_input = self.env['hr.payslip.input'].search([('payslip_id', '=', values['id']),('id', '=', values['input_id'])])
|