Browse Source

[FIX] Mejorar en código QWEB

adrielso 7 years ago
parent
commit
425b4596fc
2 changed files with 19 additions and 21 deletions
  1. 11 19
      static/src/js/payslip_payments.js
  2. 8 2
      static/src/xml/hr_payslip_payments.xml

+ 11 - 19
static/src/js/payslip_payments.js

@@ -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

+ 8 - 2
static/src/xml/hr_payslip_payments.xml

@@ -41,12 +41,18 @@
                             </div>
                             <div class="col-xs-6">
                                 <label class="label-descrip labe-input">Monto a Pagar : </label>
-                                <input class="details-employee amount-net" readonly='readonly'></input>
+                                <input class="details-employee amount-net" readonly='readonly' t-attf-value="{{ data.amount }}"></input>
                             </div>
-
+                        </div>
+                        <div class="row">
                             <div class="col-xs-6">
                                 <label class="label-descrip labe-input">Método de pago: </label>
                                 <select class="current-journal">
+                                    <t t-foreach="journal" t-as="journal">
+                                        <option t-attf-value="{{ journal_value.id }}" >
+                                            <t t-esc="journal_value.name"/>
+                                        </option>
+                                    </t>
                                 </select>
                             </div>
                             <div class="col-xs-6">