|
@@ -84,66 +84,42 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
// payslip
|
|
// payslip
|
|
fectchHrPayslip: function() {
|
|
fectchHrPayslip: function() {
|
|
var self = this;
|
|
var self = this;
|
|
- var defer = $.Deferred();
|
|
|
|
var fields = ['id', 'name', 'employee_id', 'date_from', 'date_to', 'move_id', 'number', 'line_ids', 'journal_id'];
|
|
var fields = ['id', 'name', 'employee_id', 'date_from', 'date_to', 'move_id', 'number', 'line_ids', 'journal_id'];
|
|
var domain = [['payslip_run_id', 'in', [self.id]], ['state', '=', 'done']];
|
|
var domain = [['payslip_run_id', 'in', [self.id]], ['state', '=', 'done']];
|
|
var payslip = new instance.web.Model('hr.payslip');
|
|
var payslip = new instance.web.Model('hr.payslip');
|
|
- payslip.query(fields).filter(domain).all().then(function(results) {
|
|
|
|
- defer.resolve(results);
|
|
|
|
- });
|
|
|
|
-
|
|
|
|
- return defer;
|
|
|
|
|
|
+ return payslip.query(fields).filter(domain).all();
|
|
},
|
|
},
|
|
// Hr payslip Line
|
|
// Hr payslip Line
|
|
fectchHrPayslipLine: function(payslip) {
|
|
fectchHrPayslipLine: function(payslip) {
|
|
- var defer = $.Deferred();
|
|
|
|
var payslip_id = _.map(payslip, function(map) {
|
|
var payslip_id = _.map(payslip, function(map) {
|
|
return map.id;
|
|
return map.id;
|
|
});
|
|
});
|
|
var fields = ['id', 'name', 'code', 'total', 'amount', 'slip_id'];
|
|
var fields = ['id', 'name', 'code', 'total', 'amount', 'slip_id'];
|
|
var domain = [['slip_id', 'in', payslip_id], ['code', '=', 'NET']];
|
|
var domain = [['slip_id', 'in', payslip_id], ['code', '=', 'NET']];
|
|
var payslipLine = new instance.web.Model('hr.payslip.line');
|
|
var payslipLine = new instance.web.Model('hr.payslip.line');
|
|
- payslipLine.query(fields).filter(domain).all().then(function(results) {
|
|
|
|
- defer.resolve(results);
|
|
|
|
- });
|
|
|
|
|
|
+ return payslipLine.query(fields).filter(domain).all();
|
|
|
|
|
|
- return defer;
|
|
|
|
},
|
|
},
|
|
// Diario de Salario
|
|
// Diario de Salario
|
|
fectchJournal: function() {
|
|
fectchJournal: function() {
|
|
- var defer = $.Deferred();
|
|
|
|
var fields = ['id', 'name', 'code', 'type', 'currency', 'default_debit_account_id', 'default_credit_account_id'];
|
|
var fields = ['id', 'name', 'code', 'type', 'currency', 'default_debit_account_id', 'default_credit_account_id'];
|
|
var domain = [['active', '=', true], ['type', 'in', ['bank', 'cash']], ['currency', '=', false]];
|
|
var domain = [['active', '=', true], ['type', 'in', ['bank', 'cash']], ['currency', '=', false]];
|
|
var journalSalario = new instance.web.Model('account.journal');
|
|
var journalSalario = new instance.web.Model('account.journal');
|
|
- journalSalario.query(fields).filter(domain).all().then(function(results) {
|
|
|
|
- defer.resolve(results);
|
|
|
|
- });
|
|
|
|
-
|
|
|
|
- return defer;
|
|
|
|
|
|
+ return journalSalario.query(fields).filter(domain).all();
|
|
},
|
|
},
|
|
// Company
|
|
// Company
|
|
fectchCompany: function() {
|
|
fectchCompany: function() {
|
|
- var defer = $.Deferred();
|
|
|
|
var fields = ['id','name', 'currency_id'];
|
|
var fields = ['id','name', 'currency_id'];
|
|
var domain = [['id', '=', 1]];
|
|
var domain = [['id', '=', 1]];
|
|
var resCompanyIds = new instance.web.Model('res.company');
|
|
var resCompanyIds = new instance.web.Model('res.company');
|
|
- resCompanyIds.query(fields).filter(domain).all().then(function (results) {
|
|
|
|
- defer.resolve(results);
|
|
|
|
- });
|
|
|
|
-
|
|
|
|
- return defer;
|
|
|
|
|
|
+ return resCompanyIds.query(fields).filter(domain).all();
|
|
},
|
|
},
|
|
// Res currecy
|
|
// Res currecy
|
|
fectchCurency : function() {
|
|
fectchCurency : function() {
|
|
- var defer = $.Deferred();
|
|
|
|
var fields = ['id','name', 'symbol', 'rate_silent', 'base', 'decimal_separator', 'decimal_places', 'thousands_separator', 'symbol_position'];
|
|
var fields = ['id','name', 'symbol', 'rate_silent', 'base', 'decimal_separator', 'decimal_places', 'thousands_separator', 'symbol_position'];
|
|
var domain = [['active','=', true]];
|
|
var domain = [['active','=', true]];
|
|
var resCurrecy = new instance.web.Model('res.currency');
|
|
var resCurrecy = new instance.web.Model('res.currency');
|
|
- resCurrecy.query(fields).filter(domain).all().then(function(results) {
|
|
|
|
- defer.resolve(results);
|
|
|
|
- });
|
|
|
|
-
|
|
|
|
- return defer;
|
|
|
|
|
|
+ return resCurrecy.query(fields).filter(domain).all();
|
|
},
|
|
},
|
|
/* Verificar modulo instalados */
|
|
/* Verificar modulo instalados */
|
|
fetchVerifyModule: function(module) {
|
|
fetchVerifyModule: function(module) {
|
|
@@ -412,6 +388,9 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
|
|
|
|
if (local.widgetInstance) {
|
|
if (local.widgetInstance) {
|
|
local.widgetInstance.updateId(record.id);
|
|
local.widgetInstance.updateId(record.id);
|
|
|
|
+ if (this.$el.find('.payslip-payments').length !== 0){
|
|
|
|
+ return
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (this.$el.find('.payslip-payments').length !== 0 )
|
|
if (this.$el.find('.payslip-payments').length !== 0 )
|
|
@@ -419,8 +398,7 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
|
|
|
|
local.widgetInstance = new local.PayslipPaymentsWidget(this);
|
|
local.widgetInstance = new local.PayslipPaymentsWidget(this);
|
|
|
|
|
|
- var elemento = this.$el.find('.oe_form_sheet.oe_form_sheet_width');
|
|
|
|
- elemento = elemento.find('.oe_right.oe_button_box.eiru-payslip-payments');
|
|
|
|
|
|
+ var elemento = this.$el.find('.oe_form').find('.eiru-payslip-payments');
|
|
|
|
|
|
local.widgetInstance.appendTo(elemento);
|
|
local.widgetInstance.appendTo(elemento);
|
|
local.widgetInstance.updateId(record.id);
|
|
local.widgetInstance.updateId(record.id);
|