clearcorp team mailing list archive

[Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>]

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll into lp:openerp-costa-rica.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/139566

Fix filters payroll_report_for_month.py
Fix button confirm_payslips, process_sheet compute the payslips
Force_period modifies periods in move and move_lines
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/139566
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.

=== modified file 'l10n_cr_hr_payroll/l10n_cr_hr_payroll.py'
--- l10n_cr_hr_payroll/l10n_cr_hr_payroll.py	2012-10-23 19:20:52 +0000
+++ l10n_cr_hr_payroll/l10n_cr_hr_payroll.py	2012-12-12 20:20:25 +0000
@@ -86,6 +86,7 @@
             payslips = payslip_obj.browse(cr, uid, payslip_run.slip_ids, context)
             for payslip in payslips:
                 payslip_id = payslip.id
+                payslip_id.compute_sheet()
                 payslip_id.process_sheet()
 
 hr_payslip_run()
@@ -144,5 +145,17 @@
         })
 
         return res
+    
+    def process_sheet(self, cr, uid, ids, context=None):
+        res =  super(HrPayslip, self).process_sheet(cr, uid, ids, context=context)
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        for payslip in self.browse(cr, uid, ids, context=context):
+            if payslip.forced_period_id:
+                self.write(cr, uid, [payslip.id], {'period_id': payslip.forced_period_id.id}, context=context)
+                account_move_obj.write(cr, uid, [payslip.move_id.id], {'period_id': payslip.forced_period_id.id}, context=context)
+                for line in payslip.move_id.line_id:
+                    account_move_line_obj.write(cr, uid, line.id, {'period_id': payslip.forced_period_id.id}, context=context)
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_cr_hr_payroll/report/payroll_report_for_month.py'
--- l10n_cr_hr_payroll/report/payroll_report_for_month.py	2012-10-23 16:16:01 +0000
+++ l10n_cr_hr_payroll/report/payroll_report_for_month.py	2012-12-12 20:20:25 +0000
@@ -73,7 +73,7 @@
         payslips_ids = []
         payslips = []
             
-        payslips_ids = self.pool.get('hr.payslip').search(cr, uid, [('forced_period_id.date_start', '>=' , start_period.date_start), ('forced_period_id.date_stop', '<=' , stop_period.date_stop)])
+        payslips_ids = self.pool.get('hr.payslip').search(cr, uid, [('period_id.date_start', '>=' , start_period.date_start), ('period_id.date_stop', '<=' , stop_period.date_stop)])
         
         if len(payslips_ids) > 0:    
             payslips = self.pool.get('hr.payslip').browse(cr, uid, payslips_ids)