[MERGE] polish3_hr_payroll: add constraint on dates, default value for expenses journal, and rename report

bzr revid: rco@openerp.com-20111130140107-t3ta1kmcy70smavd

addons/hr_payroll/hr_payroll.py

@@ -298,6 +298,14 @@ class hr_payslip(osv.osv):
                     context=context).company_id.id,
     }
 
+    def _check_dates(self, cr, uid, ids, context=None):
+        for payslip in self.browse(cr, uid, ids, context=context):
+            if payslip.date_from > payslip.date_to:
+                return False
+        return True
+
+    _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]  
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}

addons/hr_payroll/hr_payroll_report.xml

@@ -6,7 +6,7 @@
             auto="False"
             id="payslip_report"
             model="hr.payslip"
-            name="test.pdf"
+            name="payslip"
             rml="hr_payroll/report/report_payslip.rml"
             string="Employee PaySlip" />
 

addons/hr_payroll/hr_payroll_view.xml

@@ -262,7 +262,7 @@
                     <group col="6" colspan="4">
                         <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
-                        <field name="date_from"/>
+                        <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="contract_id" groups="base.group_extended" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="struct_id" groups="base.group_extended" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="date_to"/>

addons/hr_payroll/report/report_payslip.py

@@ -44,6 +44,6 @@ class payslip_report(report_sxw.rml_parse):
             res = payslip_line.browse(self.cr, self.uid, ids)
         return res
 
-report_sxw.report_sxw('report.test.pdf', 'hr.payslip', 'hr_payroll/report/report_payslip.rml', parser=payslip_report)
+report_sxw.report_sxw('report.payslip', 'hr.payslip', 'hr_payroll/report/report_payslip.rml', parser=payslip_report)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_payroll_account/hr_payroll_account.py

@@ -40,6 +40,17 @@ class hr_payslip(osv.osv):
         'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
     }
 
+    def _get_default_journal(self, cr, uid, context=None):
+        model_data = self.pool.get('ir.model.data')
+        res = model_data.search(cr, uid, [('name', '=', 'expenses_journal')])
+        if res:
+            return model_data.browse(cr, uid, res[0]).res_id
+        return False
+
+    _defaults = {
+        'journal_id': _get_default_journal,
+    }
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}