Ver Fonte

[FIX] Mejora, en generar nominas ahora permite cancelar el pago de la misma

adrielso há 7 anos atrás
pai
commit
6fa4924f80

+ 8 - 6
model/eiru_payslip_generator.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from openerp import api, fields, models
+from openerp import workflow
 
 class EiruPayslipGenerator(models.Model):
     _inherit = 'hr.payslip'
@@ -10,6 +11,7 @@ class EiruPayslipGenerator(models.Model):
         payslip_run = self.env['hr.payslip.run'].search([('id', 'in', [values])])
         employee = self.env['hr.employee'].search([('active', '=', True)])
         payslip_ids = []
+        slip_id = []
 
         for emp in employee:
             slip_data = self.onchange_employee_id(payslip_run.date_start, payslip_run.date_end, emp.id)
@@ -27,12 +29,12 @@ class EiruPayslipGenerator(models.Model):
                     'credit_note': payslip_run.credit_note,
                     'journal_id' : payslip_run.journal_id.id
                 }
-                # Create nominas
-                id_payslip = payslip.create(res)
-                payslip_ids.append(id_payslip)
-
-                id_payslip.hr_verify_sheet()
-                id_payslip.process_sheet()
+                # Crear Prayslip
+                slip_id = payslip.create(res)
+                payslip_ids.append(slip_id)
+                # Workflow Loco
+                slip_id.signal_workflow('hr_verify_sheet')
+                slip_id.signal_workflow('process_sheet')
 
         if payslip_ids:
             payslip_run.write({'state': 'close'})

+ 16 - 1
static/src/js/payslip_generator.js

@@ -9,12 +9,27 @@ openerp.eiru_payslip_generator = function(instance, local) {
 
         init: function(parent) {
             this._super(parent);
+            this.buttons = parent.$buttons;
         },
         start: function() {
             var self = this;
-            this.$el.click(function(){
+            this.$el.click(function() {
                 self.fectchInitial()
             });
+            self.buttons.click(function(e) {
+                /* E (Editar) */
+                if (e.target.accessKey === 'E')
+                    self.$el.css('display','none');
+                /* C (Crear) */
+                if (e.target.accessKey === 'C')
+                    self.$el.css('display','none');
+                /* S (Guarrdar) */
+                if (e.target.accessKey === 'S')
+                    self.$el.css('display','flex');
+                /* D (Cancelar) */
+                if (e.target.accessKey === 'D')
+                    self.$el.css('display','flex');
+            });
         },
         updateId: function(id) {
             var self = this;

+ 2 - 6
static/src/xml/eiru_payslip_generator.xml

@@ -2,15 +2,11 @@
 
 <templates xml:space="preserve">
     <t t-name="eiru_payslip_generator.PayslipWidget">
-        <div class="eiru-payslip" id="pagos">
-            <button class="eiru-generador oe_stat_button btn btn-default oe_inline" id="generar">
+        <div class="eiru-payslip">
+            <button class="eiru-generador oe_stat_button btn btn-default oe_inline">
                 <div class="stat_button_icon fa fa-cogs"></div>
                 <div>Generar Nómina</div>
             </button>
-             <!-- <button class="eiru-payments oe_stat_button btn btn-default oe_inline" id='payments'>
-                <div class="stat_button_icon fa fa-money"></div>
-                <div>Pagar Nómina</div>
-            </button> -->
         </div>
   </t>
 </templates>

+ 1 - 1
view/payslip_generator.xml

@@ -7,7 +7,7 @@
             <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-generator" attrs="{'invisible': [('state','!=','draft')]}" ></div>
+                    <div class="oe_right oe_button_box eiru-payslip-generator" attrs="{'invisible': [('state','!=','draft')]}"></div>
                 </label>
             </field>
         </record>