[IMP] hr_payroll: added fields on wizard and improved code so that generated payslip have date from payslip run

bzr revid: mtr@mtr-20110524114117-pqqarqenjwwempmj

addons/hr_payroll/hr_payroll.py

@@ -212,12 +212,14 @@ class hr_payslip_run(osv.osv):
             ('draft', 'Draft'),
             ('close', 'Close'),
         ], 'State', select=True, readonly=True),
-        'date_start': fields.date('Date From', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'date_end': fields.date('Date To', required=False, readonly=True, states={'draft': [('readonly', False)]}),
+        'date_start': fields.date('Date From', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'date_end': fields.date('Date To', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'credit_note': fields.boolean('Credit Note', readonly=True, states={'draft': [('readonly', False)]}, help="If its checked, indicates that all payslips generated from here are refund payslips."),
     }
     _defaults = {
         'state': 'draft',
+        'date_start': lambda *a: time.strftime('%Y-%m-01'),
+        'date_end': lambda *a: str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10],
     }
 
     def draft_payslip_run(self, cr, uid, ids, context=None):

addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py

@@ -32,18 +32,46 @@ class hr_payslip_employees(osv.osv_memory):
     _description = 'Generate payslips for all selected employees'
     _columns = {
         'employee_ids': fields.many2many('hr.employee', 'hr_employee_group_rel', 'payslip_id', 'employee_id', 'Employees'),
+        'date_from': fields.date('Date From', readonly=True),
+        'date_to': fields.date('Date To', readonly=True),
+        'credit_note': fields.boolean('Credit Note', readonly=True),
     }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary
+         @return: A dictionary which of fields with values.
+        """
+        if context is None:
+            context = {}
+        run_pool = self.pool.get('hr.payslip.run')
+        res = super(hr_payslip_employees, self).default_get(cr, uid, fields, context=context)
+        active_id = context and context.get('active_id', False)
+        if active_id:
+            data = run_pool.read(cr, uid, active_id, ['date_start', 'date_end', 'credit_note'])
+        if 'date_from' in fields:
+            res.update({'date_from': data['date_start']})
+        if 'date_to' in fields:
+            res.update({'date_to': data['date_end']})
+        if 'credit_note' in fields:
+            res.update({'credit_note': data['credit_note']})
+        return res
 
     def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
         run_pool = self.pool.get('hr.payslip.run')
         slip_ids = []
-        from_date = time.strftime('%Y-%m-01')
-        to_date = str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10]
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
+        from_date =  data.get('date_from')
+        to_date = data.get('date_to')
         if not data['employee_ids']:
             raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip(s)"))
         for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
@@ -55,10 +83,12 @@ class hr_payslip_employees(osv.osv_memory):
                 'contract_id': slip_data['value'].get('contract_id', False),
                 'payslip_run_id': context.get('active_id', False),
                 'input_line_ids': [(0, 0, x) for x in slip_data['value'].get('input_line_ids', False)],
-                'worked_days_line_ids': [(0, 0, x) for x in slip_data['value'].get('worked_days_line_ids', False)]
+                'worked_days_line_ids': [(0, 0, x) for x in slip_data['value'].get('worked_days_line_ids', False)],
+                'date_from': from_date,
+                'date_to': to_date,
+                'credit_note': data.get('credit_note'),
             }
             slip_ids.append(slip_pool.create(cr, uid, res, context=context))
-        run_pool.write(cr, uid, context.get('active_ids', []), {'date_start': from_date, 'date_end': to_date})
         slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 

addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml

@@ -8,6 +8,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payslips by Employees">
+                    <field name="date_from" />
+                    <field name="date_to" />
+                    <field name="credit_note" />
                     <group colspan="4" >
                         <separator string="Payslips by Employees" colspan="4"/>
                         <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s)" />