From c0561bea93de77160d20d0231ce487921472f07b Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Wed, 27 Oct 2010 19:43:28 +0530
Subject: [PATCH] [FIX][IMP] hr_payroll, hr_payroll_account: improved the demo
 for default account, fixed the datetime traceback in payslip compute action.

bzr revid: vra@tinyerp.com-20101027141328-hs3qcosrckpzpbm5
---
 addons/hr_payroll/hr_payroll.py               | 2 +-
 addons/hr_payroll_account/hr_payroll_demo.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 77afdf15676..5ba7a0660ba 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -24,7 +24,6 @@ import time
 from datetime import date
 from datetime import datetime
 from datetime import timedelta
-import datetime
 
 import netsvc
 from osv import fields, osv
@@ -1090,6 +1089,7 @@ class hr_payslip(osv.osv):
 
         #Check for the Holidays
         def get_days(start, end, month, year, calc_day):
+            import datetime
             count = 0
             for day in range(start, end):
                 if datetime.date(year, month, day).weekday() == calc_day:
diff --git a/addons/hr_payroll_account/hr_payroll_demo.xml b/addons/hr_payroll_account/hr_payroll_demo.xml
index 3aecf5455c5..c1d31e0664c 100644
--- a/addons/hr_payroll_account/hr_payroll_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_demo.xml
@@ -3,19 +3,19 @@
     <data>
     
         <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.payslip.line">
-            <field name="account_id" ref="account.a_expense"/>
+            <field name="account_id" ref="account.a_salary_expense"/>
         </record>
         
         <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.payslip.line">
-            <field name="account_id" ref="account.a_expense"/>
+            <field name="account_id" ref="account.a_salary_expense"/>
         </record>
 
         <record id="hr_payroll.hr_payslip_line_professionaltax1" model="hr.payslip.line">
-            <field name="account_id" ref="account.a_pay"/>
+            <field name="account_id" ref="account.a_salary_expense"/>
         </record>
 
         <record id="hr_payroll.hr_payslip_line_providentfund1" model="hr.payslip.line">
-            <field name="account_id" ref="account.a_pay"/>
+            <field name="account_id" ref="account.a_salary_expense"/>
         </record>
 
         <!-- Payslip -->