Selaa lähdekoodia

[FIX] Simplificar el proceso de pagos desde el procesamiento de nominas.

adrielso 6 vuotta sitten
vanhempi
commit
f06984d1d7

+ 2 - 2
static/src/css/style.css

@@ -42,8 +42,8 @@
 }
 
 .eiru-payslip-payments {
-    width: auto !important;
-    height: auto !important;
+    width: auto;
+    float: left;
 }
 .payslip-payment-unity {
     width: auto !important;

+ 9 - 31
static/src/js/payslip_payments.js

@@ -84,66 +84,42 @@ openerp.eiru_payslip_payments = function(instance, local) {
         // payslip
         fectchHrPayslip: function() {
             var self = this;
-            var defer = $.Deferred();
             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 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
         fectchHrPayslipLine: function(payslip) {
-            var defer = $.Deferred();
             var payslip_id = _.map(payslip, function(map) {
                 return map.id;
             });
             var fields = ['id', 'name', 'code', 'total', 'amount', 'slip_id'];
             var domain = [['slip_id', 'in', payslip_id], ['code', '=', 'NET']];
             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
         fectchJournal: function() {
-            var defer = $.Deferred();
             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 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
         fectchCompany: function() {
-            var defer = $.Deferred();
             var fields = ['id','name', 'currency_id'];
             var domain = [['id', '=', 1]];
             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
         fectchCurency : function() {
-            var defer = $.Deferred();
             var fields = ['id','name', 'symbol', 'rate_silent', 'base', 'decimal_separator', 'decimal_places', 'thousands_separator', 'symbol_position'];
             var domain = [['active','=', true]];
             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 */
         fetchVerifyModule: function(module) {
@@ -412,6 +388,9 @@ openerp.eiru_payslip_payments = function(instance, local) {
 
                 if (local.widgetInstance) {
                     local.widgetInstance.updateId(record.id);
+                    if (this.$el.find('.payslip-payments').length !== 0){
+                        return
+                    }
                 }
 
                 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);
 
-                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.updateId(record.id);

+ 3 - 6
static/src/xml/eiru_payslip_payments.xml

@@ -2,11 +2,8 @@
 
 <templates xml:space="preserve">
     <t t-name="eiru_payslip_payments.PayslipWidget">
-        <div class="payslip-payments">
-            <button class="payslip-payments oe_stat_button btn btn-default oe_inline">
-                <div class="stat_button_icon fa fa-money"></div>
-                <div>Pagar Nómina</div>
-            </button>
-        </div>
+        <button class="payslip-payments oe_button oe_form_button oe_highlight">
+            <div>Pagar Nómina</div>
+        </button>
   </t>
 </templates>

+ 4 - 3
view/payslip_payments.xml

@@ -6,11 +6,12 @@
             <field name="model">hr.payslip.run</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
-                <label for="name" position="before">
-                    <div class="oe_right oe_button_box eiru-payslip-payments" attrs="{'invisible': [('state','!=','close')]}"></div>
-                </label>
+                <field name="state" position="before">
+                    <div class="eiru-payslip-payments" attrs="{'invisible': [('state','!=','close')]}"></div>
+                </field>
             </field>
         </record>
+
 		<!--ADD botton en  payslip -->
 		<record id="view_eiru_payment_payslip_unity" model="ir.ui.view">
 			<field name="name">view.eiru.payment.payslip.unity</field>