[MERGE]:hr
authorAmit Patel <apa@tinyerp.com>
Mon, 24 Sep 2012 09:53:03 +0000 (15:23 +0530)
committerAmit Patel <apa@tinyerp.com>
Mon, 24 Sep 2012 09:53:03 +0000 (15:23 +0530)
commit9428b6ca789b11af093c92c3a9774b2d74b9e16b
treebdf6347b851468d92f152ff06c61ec851029e76f
parent6b56b3aa1f46f3ff61a5c34578159e6bcdb648ab
parent10eb5a5591fae750e1ef153eb9044e9534a09cc3
[MERGE]:hr

bzr revid: apa@tinyerp.com-20120924095303-hb975qddyibkmmi3
addons/analytic/analytic.py
addons/analytic/analytic_view.xml
addons/hr_holidays/hr_holidays.py