pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Hr_holidays: Dashboard => In My Leaves by type, put the collumn Allocated Leaves and Taken Leaves

Browse Source 
bzr revid: mra@mra-laptop-20101102100339-e52gre33iilvicnx
This commit is contained in:
Mustufa Rangwala
2010-11-02 15:33:39 +05:30
parent ab38d5247d c70d2c9a54
commit 278d452d7b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/report/available_holidays_view.xml
+4 -4
View File
@@ -34,8 +34,8 @@
<field name="arch" type="xml">
<graph string="Available Holidays" type="bar">
<field name="holiday_status_id"/>
<field name="taken_leaves" string="Leave Days" operator="+"/>
<field name="remaining_leave" string="Remaining Days" operator="+"/>
<field name="taken_leaves" string="Taken Leaves" operator="+"/>
<field name="max_leave" string="Allocated Leaves" operator="+"/>
</graph>
</field>
</record>
@@ -48,10 +48,10 @@
<search string="Leaves">
<group>
<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
<filter icon="terp-go-month" string=" Month " name="month"
<filter icon="terp-go-month" string=" Month " name="month"
domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Available Leaves of current month"/>
<filter icon="terp-go-month" string=" Month-1 " separator="1"
<filter icon="terp-go-month" string=" Month-1 " separator="1"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Available Leaves of last month"/>
<separator orientation="vertical"/>