Commit Graph

682 Commits

Author SHA1 Message Date
Fabien Pinckaers 664997207a [MERGE] fix XML symbol in attendance & timesheet reports
bzr revid: fp@tinyerp.com-20121112084455-lmmujwjx79sla0d2
2012-11-12 09:44:55 +01:00
Fabien Meghazi 22ad7a70f7 [MERGE] trunk
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
Ajay Chauhan (OpenERP) 41c43df23a [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121102101051-y8tqa85i5bx7c3r7
2012-11-02 15:40:51 +05:30
Ajay Chauhan (OpenERP) 67d88f64e1 [IMP] hr_attendance: set default value of dates according to week
bzr revid: cha@tinyerp.com-20121102094931-3os8m29tjm8tdnhs
2012-11-02 15:19:31 +05:30
Ajay Chauhan (OpenERP) 18cbe26757 [IMP] hr_attendance: set correct end date of week in report
bzr revid: cha@tinyerp.com-20121102090524-32mzyakopzv7xka2
2012-11-02 14:35:24 +05:30
Ajay Chauhan (OpenERP) b0a204350f [IMP] hr_attendance: change font-size in report
bzr revid: cha@tinyerp.com-20121102063933-twdqxhomtnagygmv
2012-11-02 12:09:33 +05:30
Ajay Chauhan (OpenERP) 42df1b6c07 [IMP] hr_attendance: change formatting of 'Attendance by week' report
bzr revid: cha@tinyerp.com-20121101134713-ru850hpdj8w914ji
2012-11-01 19:17:13 +05:30
Mayur Maheshwari (OpenERP) aea578ad6a [FIX]hr : Company name with & throws error when opening report
bzr revid: mma@tinyerp.com-20121101092543-w91bmpwbxed5ftkd
2012-11-01 14:55:43 +05:30
Fabien Meghazi a2715888c1 [IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
bzr revid: fme@openerp.com-20121031103148-r1slfpl2kcnajjd3
2012-10-31 11:31:48 +01:00
Ajay Chauhan (OpenERP) 4f555e059f [IMP] hr_attendance: made lines visible even if employee is absent for whole week
bzr revid: cha@tinyerp.com-20121030064707-m12g44n2i9q8eun0
2012-10-30 12:17:07 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Ajay Chauhan (OpenERP) 4288a65ccf [IMP] hr_attendance: add 'Total' label in another row in report
bzr revid: cha@tinyerp.com-20121029090235-ltcg4rmgu8jrnt9d
2012-10-29 14:32:35 +05:30
Ajay Chauhan (OpenERP) 6cfffae349 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121029050259-0vimwnu84f2dvk2g
2012-10-29 10:32:59 +05:30
Fabien Pinckaers 619390d23c [IMP] timesheets
bzr revid: fp@tinyerp.com-20121026080137-bluybqibtsjgb25n
2012-10-26 10:01:37 +02:00
Ajay Chauhan (OpenERP) d9900b497a [IMP] hr_attendance: made little change in header of report
bzr revid: cha@tinyerp.com-20121023115929-enc932x4kdk077i4
2012-10-23 17:29:29 +05:30
Ajay Chauhan (OpenERP) b7bc79d9c3 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121018060531-wl123qyuvlccjyfc
bzr revid: cha@tinyerp.com-20121022053314-olinyyizlbcmf9y2
2012-10-22 11:03:14 +05:30
Fabien Pinckaers 6c15bcce12 [MERGE] HR
bzr revid: fp@openerp.com-20121021195925-sbsfni9i10r2o2bw
2012-10-21 21:59:25 +02:00
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
pankita shah (Open ERP) a098bdc7f1 [IMP] improve condition
bzr revid: shp@tinyerp.com-20121019050621-kz81td0dsdt4681o
2012-10-19 10:36:21 +05:30
pankita shah (Open ERP) 1bb1b98a31 [IMP] warning message replace is posterior to by comes before
bzr revid: shp@tinyerp.com-20121019045723-rt8fqmuk11vsgiak
2012-10-19 10:27:23 +05:30
pankita shah (Open ERP) 5cf77ecb5a [IMP] improve action message as per suggection
bzr revid: shp@tinyerp.com-20121018130444-bu8iv6kez1xt1js1
2012-10-18 18:34:44 +05:30
pankita shah (Open ERP) e0424795b6 [IMP] warning message and fix tracback
bzr revid: shp@tinyerp.com-20121018113949-wcgkj455rwd81z3h
2012-10-18 17:09:49 +05:30
pankita shah (Open ERP) e48e2a42dc [IMP] warning mesage and fix traceback ehen click chanwork button
bzr revid: atp@tinyerp.com-20121015054845-myi61ts7o2p4bg1e
bzr revid: atp@tinyerp.com-20121016175913-lbq3ymr9y7qz0tae
bzr revid: shp@tinyerp.com-20121018105933-c40om6nmwjw2xz7s
2012-10-18 16:29:33 +05:30
Ajay Chauhan (OpenERP) bac6c2151f [IMP] hr_attendance: made report visible & added header in 'Attendance by Week' report
bzr revid: cha@tinyerp.com-20121016072635-aqx7jmysakwkg7fz
2012-10-16 12:56:35 +05:30
Ajay Chauhan (OpenERP) ece648faed [IMP] hr_attendance: added column for total in 'Attendance by Month' report
bzr revid: cha@tinyerp.com-20121015093009-69xzo9iutecnhnc5
2012-10-15 15:00:09 +05:30
pankita shah (Open ERP) 6761871c4e [IMP] indentation of active ids of timesheet.py
bzr revid: shp@tinyerp.com-20121008051014-fvftsi2mt44abyyn
2012-10-08 10:40:14 +05:30
pankita shah (Open ERP) f00e26b9ca [FIX] weekly,monthly report problem in hr module
bzr revid: shp@tinyerp.com-20121004130606-ju9ahpnk20qxeeyr
2012-10-04 18:36:06 +05:30
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Fabien Pinckaers fbe0c03df3 [FIX] Attendances rules
bzr revid: fp@tinyerp.com-20120927191804-szqoktzis42qju2h
2012-09-27 21:18:04 +02:00
Fabien Pinckaers 816f50974a [MERGE] optionnal attendances visible
bzr revid: fp@tinyerp.com-20120927174758-zp58w2phycwm30l7
2012-09-27 19:47:58 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Pinakin Nayi (OpenERP) fb05869829 [IMP]improve help
bzr revid: pna@tinyerp.com-20120924102002-5ege35d024t2br6h
2012-09-24 15:50:02 +05:30
Pinakin Nayi (OpenERP) 95afcc93bc [IMP]merge branch
bzr revid: pna@tinyerp.com-20120924082300-9unb65nu3asph4x6
2012-09-24 13:53:00 +05:30
Pinakin Nayi (OpenERP) 4550c4ced8 [IMP]attendance related fields and menu hide
bzr revid: pna@tinyerp.com-20120924081934-2e2bj1fa4pstrg91
2012-09-24 13:49:34 +05:30
Harry (OpenERP) 2deb110a23 [IMP] hr_attendance: refactor code
bzr revid: hmo@tinyerp.com-20120924063951-ub602rou1p9wtt7p
2012-09-24 12:09:51 +05:30
Pinakin Nayi (OpenERP) 4d9fa19122 [IMP]sign in or sign out button enable if attendance group
bzr revid: pna@tinyerp.com-20120924051724-m5b74g2kfw8c337h
2012-09-24 10:47:24 +05:30
Pinakin Nayi (OpenERP) 008d5d35d7 [IMP]add config file in hr_attendance
bzr revid: pna@tinyerp.com-20120921134405-0q3mwq6dsp2fw4yu
2012-09-21 19:14:05 +05:30
Pinakin Nayi (OpenERP) 713dff9dba [IMP]group attendance to restrict attendance related fields and views
bzr revid: pna@tinyerp.com-20120921070809-x62vwxdyhw7pyciw
2012-09-21 12:38:09 +05:30
Fabien Pinckaers fabf4971aa [FIX] timesheet_sheet should not crash anymmore when tests are performed at 23:59
bzr revid: fp@tinyerp.com-20120917081451-ugk1qi0le22kn44n
2012-09-17 10:14:51 +02:00
Launchpad Translations on behalf of openerp 063c548209 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120911045051-qhkumfcarekjpsm0
2012-09-11 04:50:51 +00:00
niv-openerp a3abba201e [FIX] hr_attendance: minor javascript bug
bzr revid: nicolas.vanhoren@openerp.com-20120910100152-eru3fdxalv4lhqek
2012-09-10 12:01:52 +02:00
niv-openerp 84ce8fa76c [IMP] hr_attendance: more visual improvements
bzr revid: nicolas.vanhoren@openerp.com-20120907143109-n7dw17g6ogtk2grj
2012-09-07 16:31:09 +02:00
niv-openerp ce11811c05 [IMP] hr_attendance: visual improvements
bzr revid: nicolas.vanhoren@openerp.com-20120907143044-czya93nj76yx2ofg
2012-09-07 16:30:44 +02:00
Fabien Pinckaers c1c36798f5 [MERGE] employee form view
bzr revid: fp@tinyerp.com-20120907135538-pvr31vip94l7n5jc
2012-09-07 15:55:38 +02:00
niv-openerp 280d9e426d [IMP] changed tooltip
bzr revid: nicolas.vanhoren@openerp.com-20120907122337-pb8pia5e753zzi32
2012-09-07 14:23:37 +02:00
niv-openerp 2698e6dd27 [IMP] hr_attendance: Changed style of sign in/sign out
bzr revid: nicolas.vanhoren@openerp.com-20120907115120-dg8xn97oh9pek7k5
2012-09-07 13:51:20 +02:00
niv-openerp 69c3ac117d fixed small bug with tipsy
bzr revid: nicolas.vanhoren@openerp.com-20120906142143-wxo087d2r6y6pln8
2012-09-06 16:21:43 +02:00
niv-openerp 6eec6cf691 Changed tipsy
bzr revid: nicolas.vanhoren@openerp.com-20120906141646-r9wgdi9uhjdd5124
2012-09-06 16:16:46 +02:00
niv-openerp 56e2d8984d added tipsy
bzr revid: nicolas.vanhoren@openerp.com-20120906141051-mhgqkoycwxf8flp5
2012-09-06 16:10:51 +02:00
niv-openerp bebed68373 changed most style
bzr revid: nicolas.vanhoren@openerp.com-20120906135745-pgmzrv94jvv3imuq
2012-09-06 15:57:45 +02:00