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/6.1.

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/188391

[IMP] Filter periods in payroll_report_for_month
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/188391
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.

=== modified file 'l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py'
--- l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py	2012-09-19 22:41:39 +0000
+++ l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py	2013-09-30 16:49:02 +0000
@@ -21,16 +21,21 @@
 ##############################################################################
 
 from osv import osv
-
+import time
 
 class PayrollReportForMonthWizard(osv.osv_memory):
     
     _inherit = "trial.balance.webkit"
     _name = "payroll.report.for.month"
     _description = "Payroll Report for Month"
-
+    
+    def _get_fiscalyear(self, cr, uid, context=None):
+        now = time.strftime('%Y-%m-%d')
+        fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now)], limit=1 )
+        return fiscalyears and fiscalyears[0] or False
+        
     _defaults = {
-            'fiscalyear_id': '',
+            'fiscalyear_id': _get_fiscalyear,
             'filter': 'filter_period',
     }
 

=== modified file 'l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml'
--- l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml	2012-10-19 21:39:40 +0000
+++ l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml	2013-09-30 16:49:02 +0000
@@ -29,13 +29,7 @@
                         <attribute name="invisible">True</attribute>
                     </page>
                     <field name="fiscalyear_id" position="attributes">
-                        <attribute name="attrs">{'invisible': True}</attribute>
-                    </field>
-                    <field name="period_from" position="replace">
-                        <field name="period_from" domain="[('state', '=', 'draft'),('special', '=', False)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4" widget="selection"/>
-                    </field>
-                    <field name="period_to" position="replace">
-                        <field name="period_to" domain="[('state', '=', 'draft'),('special', '=', False)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4" widget="selection"/>
+                        <attribute name="required">True</attribute>
                     </field>
                      <field name="filter" position="attributes">
                         <attribute name="readonly">True</attribute>