|
@@ -180,12 +180,12 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
|
var self = this;
|
|
|
var defer = $.Deferred();
|
|
|
var company = self.company.shift();
|
|
|
- var currency = self.getCurrencyCompany(company.currency_id[0]).shift()
|
|
|
+ var currency = self.getCurrencyCompany(company.currency_id[0]).shift();
|
|
|
|
|
|
self.asyncLoopFactory(self.payslipNew.length, function(loop) {
|
|
|
var payslip = self.payslipNew[loop.iteration()];
|
|
|
self.showPayments(payslip, currency).then(function(results) {
|
|
|
- self.reloadLine()
|
|
|
+ self.reloadLine();
|
|
|
if (results){
|
|
|
loop.next();
|
|
|
}
|
|
@@ -193,6 +193,7 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
|
}, function(results) {
|
|
|
defer.resolve(results);
|
|
|
});
|
|
|
+
|
|
|
return defer;
|
|
|
},
|
|
|
// reloadLine
|
|
@@ -204,6 +205,7 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
|
var self = this;
|
|
|
var defer = $.Deferred();
|
|
|
var state = true;
|
|
|
+
|
|
|
var headerModalName = [{
|
|
|
name: payslip.name
|
|
|
}];
|
|
@@ -211,50 +213,40 @@ openerp.eiru_payslip_payments = function(instance, local) {
|
|
|
var dataPayslip = [{
|
|
|
employee: payslip.employee,
|
|
|
periodo: payslip.periodo,
|
|
|
- ref: payslip.number
|
|
|
- }]
|
|
|
-
|
|
|
+ ref: payslip.number,
|
|
|
+ amount: accounting.formatMoney(payslip.ammout, currency.symbol, currency.decimal_places, currency.thousands_separator, currency.decimal_separator)
|
|
|
+ }];
|
|
|
var modal = Qweb.render('EiruPayslipPaymentsModal', {
|
|
|
data: dataPayslip,
|
|
|
dataName: headerModalName,
|
|
|
+ journal: self.accountJournal
|
|
|
});
|
|
|
|
|
|
$('.openerp_webclient_container').after(modal);
|
|
|
$('.expired-account-modal').modal();
|
|
|
- // Total
|
|
|
- $('.expired-account-modal').find('.amount-net').val(accounting.formatMoney(payslip.ammout, currency.symbol, currency.decimal_places, currency.thousands_separator, currency.decimal_separator))
|
|
|
- // Referencia de Pago
|
|
|
+ // Referencia de Pago\
|
|
|
+
|
|
|
var journal_ref = $('.expired-account-modal').find('.journal-ref');
|
|
|
- // Cargara los metodo de pago
|
|
|
var journal = $('.expired-account-modal').find('.current-journal');
|
|
|
- _.each(self.accountJournal, function(item) {
|
|
|
- journal.append('<option value="'+item.id+'">'+item.name+'</option>');
|
|
|
- })
|
|
|
// Click Cerrar
|
|
|
$('.expired-account-modal').on('hidden.bs.modal', function (e) {
|
|
|
- // self.reloadLine()
|
|
|
defer.resolve(false);
|
|
|
self.removeModal(e);
|
|
|
+ });
|
|
|
|
|
|
- // return defer;
|
|
|
- })
|
|
|
// clcik boton pagar
|
|
|
var contenido = $('.expired-account-modal').find('.payments-payslip');
|
|
|
contenido.click(function(e) {
|
|
|
-
|
|
|
self.paymentsPayslip(payslip,journal.val(), journal_ref.val()).then(function(insert) {
|
|
|
return insert;
|
|
|
}).then(function(journal) {
|
|
|
if (!journal)
|
|
|
state = false;
|
|
|
-
|
|
|
- // self.reloadLine()
|
|
|
defer.resolve(state);
|
|
|
})
|
|
|
self.removeModal(e);
|
|
|
});
|
|
|
|
|
|
-
|
|
|
return defer;
|
|
|
},
|
|
|
// Remover
|