diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-11-02 15:33:39 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-11-02 15:33:39 +0530 |
| commit | 278d452d7b719aef94d9ffc19bb4c457698ffbc0 (patch) | |
| tree | 6ae144c0cd5a3a48f98d63ff1c769067c71ae58b | |
| parent | ab38d5247df3e1fc7e3959f5fc188dc4fe8e25dd (diff) | |
| parent | c70d2c9a5493a4332f13c9f914ff2fa6ea5cfe07 (diff) | |
[MERGE] Hr_holidays: Dashboard => In My Leaves by type, put the collumn Allocated Leaves and Taken Leaves
bzr revid: mra@mra-laptop-20101102100339-e52gre33iilvicnx
| -rw-r--r-- | addons/hr_holidays/report/available_holidays_view.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index 374e6300cd0..60f47fb656a 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -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','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',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','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(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','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Available Leaves of last month"/> <separator orientation="vertical"/> |