openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-add-fields-on-payslip-run-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-add-fields-on-payslip-run-mtr/+merge/61349

hr_payroll:-The following changes has been made for Payslip Run:-
-> on payslip run added 3 fields:-
1) date_start
2) date_end
3) credit_note
-> assigned value to date_start and date_end as per the generated payslip.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-add-fields-on-payslip-run-mtr/+merge/61349
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-payroll-add-fields-on-payslip-run-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2011-05-12 11:57:19 +0000
+++ hr_payroll/hr_payroll.py	2011-05-18 05:17:26 +0000
@@ -211,7 +211,10 @@
         'state': fields.selection([
             ('draft', 'Draft'),
             ('close', 'Close'),
-        ], 'State', select=True, readonly=True)
+        ], 'State', select=True, readonly=True),
+        'date_start': fields.date('Date From', required=False),
+        'date_end': fields.date('Date To', required=False),
+        'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
     }
     _defaults = {
         'state': 'draft',

=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml	2011-05-12 07:02:53 +0000
+++ hr_payroll/hr_payroll_view.xml	2011-05-18 05:17:26 +0000
@@ -649,8 +649,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Payslips Run">
-                <group col="6" colspan="6">
+                <group col="4" colspan="2">
                     <field name="name"/>
+                    <field name="credit_note"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
                 </group>
                 <notebook colspan="6">
                     <page string="Payslips">

=== modified file 'hr_payroll/wizard/hr_payroll_payslips_by_employees.py'
--- hr_payroll/wizard/hr_payroll_payslips_by_employees.py	2011-05-12 07:21:31 +0000
+++ hr_payroll/wizard/hr_payroll_payslips_by_employees.py	2011-05-18 05:17:26 +0000
@@ -37,14 +37,17 @@
     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]
         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):
-            slip_data = slip_pool.onchange_employee_id(cr, uid, [], time.strftime('%Y-%m-01'), str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10], emp.id, contract_id=False, context=context)
+            slip_data = slip_pool.onchange_employee_id(cr, uid, [], from_date, to_date, emp.id, contract_id=False, context=context)
             res = {
                 'employee_id': emp.id,
                 'name': slip_data['value'].get('name', False),
@@ -55,6 +58,7 @@
                 'worked_days_line_ids': [(0, 0, x) for x in slip_data['value'].get('worked_days_line_ids', False)]
             }
             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'}