odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
vra 2010-10-27 19:43:28 +05:30
parent 30ff99be31
commit c0561bea93
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -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:

8
addons/hr_payroll_account/hr_payroll_demo.xml
View File

@ -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 -->