|
@@ -35,6 +35,7 @@
|
|
|
var refreshAdvancement = this.$el.find('.refresh-advancement');
|
|
|
var printAdvancement = this.$el.find('.print-advancement');
|
|
|
var printCommission = this.$el.find('.print-commission');
|
|
|
+ var printHoraExtras = this.$el.find('.print-hora-extras');
|
|
|
var exportCash = this.$el.find('.export-cash');
|
|
|
|
|
|
// create
|
|
@@ -57,6 +58,10 @@
|
|
|
printCommission.click(function() {
|
|
|
self.fetchPrintAdvancement('CMS', 'Comisión');
|
|
|
});
|
|
|
+ // Hora Extras
|
|
|
+ printHoraExtras.click(function() {
|
|
|
+ self.fetchPrintAdvancement('HORA_EXTRA', 'Hora Extras');
|
|
|
+ });
|
|
|
exportCash.click(function() {
|
|
|
self.fetchExportCash();
|
|
|
});
|
|
@@ -214,7 +219,7 @@
|
|
|
/* Description: Consulta Reglas Salarial (ADL CMS)*/
|
|
|
fetchSalaryRule: function() {
|
|
|
var salaryRule = new openerp.web.Model('hr.salary.rule');
|
|
|
- return salaryRule.query(['name','code']).filter([['code','in',['ADL','CMS']]]).all();
|
|
|
+ return salaryRule.query(['name','code']).filter([['code','in',['ADL','CMS', 'HORA_EXTRA']]]).all();
|
|
|
},
|
|
|
/* Consultar método de pagos */
|
|
|
fetchJournal: function() {
|
|
@@ -464,13 +469,22 @@
|
|
|
var hrPayslipInput = new openerp.web.Model('hr.payslip.input');
|
|
|
return hrPayslipInput.query(fields).filter(domain).all();
|
|
|
},
|
|
|
+ getpayslipInputUpdate: function(codes) {
|
|
|
+ var self = this;
|
|
|
+ return _.filter(self.payslipInput, function(item) {
|
|
|
+ return _.contains(codes, item.code)
|
|
|
+ // return item.code === code;
|
|
|
+ });
|
|
|
+ },
|
|
|
/* Description: Unir payslip_input con salary_rule*/
|
|
|
joinInputSalari: function() {
|
|
|
var self = this;
|
|
|
var defer = $.Deferred();
|
|
|
var inputSalari = [];
|
|
|
var rule;
|
|
|
- var payslipInput = self.getpayslipInput('CMS');
|
|
|
+ // var payslipInput = self.getpayslipInput('CMS');
|
|
|
+ // var types = ['CMS','HORA_EXTRA']
|
|
|
+ var payslipInput = self.getpayslipInputUpdate(['CMS','HORA_EXTRA']);
|
|
|
|
|
|
_.each(payslipInput, function(item) {
|
|
|
rule = self.getSalaryRule(item.code).shift();
|
|
@@ -725,7 +739,6 @@
|
|
|
self.salaryRule = salaryRule;
|
|
|
return self.showPrintAdvancement(type, title);
|
|
|
});
|
|
|
- //
|
|
|
},
|
|
|
/* Consultar Usuario (res.User) */
|
|
|
fetchResUser: function() {
|