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

[IMP] hr_holidays: Improve demo data, hr_timesheet_invoice:Imoprove search view 

bzr revid: psi@tinyerp.co.in-20100521064654-buj0bu0pwaxfj8eu
This commit is contained in:
psi (Open ERP) 2010-05-21 12:16:54 +05:30
parent 7be3eedde5
commit 48e2594272
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_holidays/hr_holidays.py
View File

@ -50,7 +50,7 @@ class hr_holidays_status(osv.osv):
def get_days(self, cr, uid, ids, employee_id, return_false, context={}):
res = {}
for record in self.browse(cr, uid, ids, context):
for record in self.browse(cr, uid, ids, context=context):
res[record.id] = {}
max_leaves = leaves_taken = 0
if not return_false:

35
addons/hr_holidays/hr_holidays_demo.xml
View File

@ -8,32 +8,43 @@
<field name="color_name">black</field>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_allocation_cl">
<field name="name">Trip with Family</field>
<field name="holiday_status_id" ref="holiday_status_cl"/>
<field name="type">add</field>
<field name="date_from">2010-01-01 08:00</field>
<field name="date_to">2010-01-03 18:00</field>
<field name="number_of_days_temp">1</field>
<field name="employee_id" ref="hr.employee1"/>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_cl">
<field name="name">Going For Tour</field>
<field name="name">Trip with Family</field>
<field name="holiday_status_id" ref="holiday_status_cl"/>
<field name="date_from">2010-01-01 08:00</field>
<field name="date_to">2010-01-01 18:00</field>
<field name="date_to">2010-01-03 18:00</field>
<field name="number_of_days_temp">1</field>
<field name="employee_id" ref="hr.employee1"/>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_cl1">
<field name="name">Family Function</field>
<field name="holiday_status_id" ref="holiday_status_cl"/>
<field name="date_from">2010-03-10 08:00</field>
<field name="date_to">2010-03-14 18:00</field>
<field name="number_of_days_temp">5</field>
<field name="employee_id" ref="hr.employee1"/>
</record>
<!-- Sick leave -->
<record model="hr.holidays.status" id="holiday_status_sl">
<field name="name">Sick Leave</field>
<field name="color_name">red</field>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_allocation_sl">
<field name="name">Doctor Appointment</field>
<field name="holiday_status_id" ref="holiday_status_sl"/>
<field name="type">add</field>
<field name="date_from">2010-02-01 00:00</field>
<field name="date_to">2010-02-03 08:00</field>
<field name="number_of_days_temp">3</field>
<field name="employee_id" ref="hr.employee1"/>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_sl">
<field name="name">Sickness</field>
<field name="name">Doctor Appointment</field>
<field name="holiday_status_id" ref="holiday_status_sl"/>
<field name="date_from">2010-02-01 00:00</field>
<field name="date_to">2010-02-03 08:00</field>

6
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -443,11 +443,11 @@
<field name="arch" type="xml">
<search string="Search Timesheet Lines">
<group col='15' colspan='4'>
<field name="date"/>
<separator orientation="vertical"/>
<filter icon="terp-project" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection"/>
<field name="product_id" widget="selection"/>
<field name="analytic_account_id" widget="selection"/>
<field name="general_account_id" widget="selection"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="4" col="20">