Commit Graph

52 Commits

Author SHA1 Message Date
Numerigraphe - Lionel Sausin 779fa653c1 [IMP] Added missing vim mode lines
lp bug: https://launchpad.net/bugs/524279 fixed

bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
Stéphane Bidoul f3bc8f3324 [FIX] hr_timesheet:Employee Timesheet report now uses unit factor correctly
lp bug: https://launchpad.net/bugs/788297 fixed

bzr revid: mtr@mtr-20110621095117-69bkgohrkkwv5n01
2011-06-21 15:21:17 +05:30
mtr b4945ac8ff [FIX] hr_timesheet: fixed employee and employees timesheet report, shows correct values(without using unit_factor)
lp bug: https://launchpad.net/bugs/788297 fixed

bzr revid: mtr@mtr-20110613062321-z23jvc1z5my3q08b
2011-06-13 11:53:21 +05:30
Jay Vora (OpenERP) 591782def9 [FIX] Hr_Timesheet : Timesheet report should be available for those employees who have user associated with them.
bzr revid: jvo@tinyerp.com-20110207113837-ajxt2kis1xpa6rk8
2011-02-07 17:08:37 +05:30
qdp-launchpad@tinyerp.com 717ea6f930 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110117180222-rvby5kh871sxfoyh
2011-01-17 19:02:22 +01:00
Mustufa Rangwala ae717cd9ac [MERGE] [6.0RC1][hr_timesheet] Problems printing timesheet reports
bzr revid: mra@mra-laptop-20110117111333-yieqqvd0ljh3c8mf
2011-01-17 16:43:33 +05:30
Mustufa Rangwala 2f09faba42 [MERGE] an employee shouldn't be able to see expenses and holidays of others employee
bzr revid: mra@mra-laptop-20110117102556-evp00eqczxuy5l5z
2011-01-17 15:55:56 +05:30
mtr bfea6901f1 [IMP] hr_timesheet:added space(Enter)
bzr revid: mtr@mtr-20110117094353-1eaz08p2ckgmjquo
2011-01-17 15:13:53 +05:30
mtr 00683a79af [IMP] hr_timesheet:again removed extra space
bzr revid: mtr@mtr-20110117093644-692ixf9oxk0jkn4i
2011-01-17 15:06:44 +05:30
mtr 60acda9965 [IMP] hr_timesheet: removed the extra space
bzr revid: mtr@mtr-20110117092604-sy4hkiugo3prx3pe
2011-01-17 14:56:04 +05:30
ARA (OpenERP) 2ee52c73f3 [FIX]hr_timesheet: Problems printing timesheet reports
lp bug: https://launchpad.net/bugs/695960 fixed

bzr revid: ara@tinyerp.com-20110117090955-ofb3iiabb99e3zqt
2011-01-17 14:39:55 +05:30
mtr d24d1f6a45 [IMP] hr_timesheet: uncommit the changes made for Bug #695960
bzr revid: mtr@mtr-20110117051337-9ge2j1n6waoodvqm
2011-01-17 10:43:37 +05:30
Alberto Luengo Cabanillas (Pexego) 0d842d2fa2 [FIX] hr_timesheet:print reports having employee name/surname with accents
lp bug: https://launchpad.net/bugs/695960 fixed

bzr revid: mtr@mtr-20110113114909-q19c08vax7dxgy1v
2011-01-13 17:19:09 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
apa-tiny 00c8da07a3 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20101229085352-c3ui6wb0or9smsjr
2010-12-29 14:23:52 +05:30
OpenERP 773dd8a18c [FIX] hr_timesheet: added missing context to get_month_name and get_weekday_name.
lp bug: https://launchpad.net/bugs/685568 fixed

bzr revid: openerp@vmt-hp4520s-20101221142237-9c7cc3dr11du5npl
2010-12-21 15:22:37 +01:00
apa (OpenERP) 4c41bbb80a [IMP]:improved hr reports.
bzr revid: apa@tinyerp.com-20101215104802-95pv1tz74fuj433b
2010-12-15 16:18:02 +05:30
pso 73f259cfac [FIX] hr_timesheet: Improved timesheet report (solved confusion between user and employee)
lp bug: https://launchpad.net/bugs/669533 fixed

bzr revid: pso@tinyerp.com-20101102135024-jiqodh1tkynyxgsh
2010-11-02 19:20:24 +05:30
apa-tiny a82e2f729c merged from trunk
bzr revid: apa@tinyerp.com-20101011094034-3gqu5rsswp784gr0
2010-10-11 15:10:34 +05:30
Vir (Open ERP) a141d983d9 [MOD] hr_* : applied changes from usability branch
bzr revid: vir@tinyerp.com-20101008132247-3m1ff2ngm3im61pn
2010-10-08 18:52:47 +05:30
apa-tiny c8afabf6fd improved
bzr revid: apa@tinyerp.com-20101005083626-8km5a3kb8hexmi8d
2010-10-05 14:06:26 +05:30
DHS(OpenERP) debb9fac86 [FIX] hr_timesheet : Reports Corrected
bzr revid: ach@tinyerp.com-20100923132454-ms7s6fnonf1hw590
2010-09-23 18:54:54 +05:30
rch (Open ERP) 252cb55691 [IMP/ADD]: Header in hr_attendance xsl report - 'Attendance By Month' with saperate header template for xsl landscape rport. Add FormatLang in header's date of hr reports.
bzr revid: rch_open_erp-20100914132035-ny793gedcmah1pem
2010-09-14 18:50:35 +05:30
rch (Open ERP) 433ce6f932 [IMP/ADD]: Header in hr_timesheet xsl reports with saterate template for xsl landscape rport.
bzr revid: rch_open_erp-20100914114055-s1ap8zky5sm6kcbe
2010-09-14 17:10:55 +05:30
apa-tiny 5d0022be5c [IMP]hr_timesheet:improved report.
bzr revid: apa@tinyerp.com-20100830070541-pf03io6pbta7h3t2
2010-08-30 12:35:41 +05:30
Jni (Open ERP) 35cc919184 [MOV]:hr_timesheet,hr_timesheet_sheet:Moved Timesheet Analysis in to the hr_timesheet_sheet module.
bzr revid: jni@tinyerp.com-20100707135458-11y9sep9trk3x8x1
2010-07-07 19:24:58 +05:30
nel@tinyerp.com 975b6c4988 [IMP] holidays,timesheet: report views
bzr revid: nel@tinyerp.com-20100707123649-3iqzh8uzzsmrq22b
2010-07-07 14:36:49 +02:00
psi (Open ERP) 18e0728ccb [IMP] hr_*: changes accourding to the Piratepad
bzr revid: psi@tinyerp.co.in-20100630124520-hr4ktw5yocnt9ijy
2010-06-30 18:15:20 +05:30
Fabien Pinckaers fde1a06f5a [IMP] report on hr_timesheet + fixes
bzr revid: fp@tinyerp.com-20100625100743-m0sklyrvtad4ykoy
2010-06-25 12:07:43 +02:00
mra (Open ERP) c2bdeba0c2 [ADD] hr_timesheet: Print Employee Timesheet and Users Timesheet => OSV Memory
bzr revid: mra@tinyerp.com-20100420061138-bpn2ai9nebmdhqh5
2010-04-20 11:41:38 +05:30
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
PSO(OpenERP) eb0b928cc0 Changed licencing terms
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30
ChristopheChauvet(syleam) 41e8ed59ef changed encoding to coding in all py files
lp bug: https://launchpad.net/bugs/357182 fixed

bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
2009-10-13 11:28:37 +05:30
Najlaâ EL KHAYAT 7856ace733 [FIX] Name of user in employees timesheet
bzr revid: nel@tinyerp.com-20090401142911-n0f6pil2r71dr973
2009-04-01 16:29:11 +02:00
Stephane Wirtel 21f104a506 [IMP] Update the copyright to 2009
bzr revid: stephane@tinyerp.com-20090104221250-55q32ayj2t8kzb2k
2009-01-04 23:12:50 +01:00
Stephane Wirtel 218ddfe735 [REF] Replace Tiny ERP by Open ERP
bzr revid: stephane@tinyerp.com-20081210225543-fxxae0fqe4tgc3ud
2008-12-10 23:55:43 +01:00
Christophe Simonis 1a0de2f0f9 [FIX] psycopg2: %d -> %s
bzr revid: christophe@tinyerp.com-20081210142955-ewfr1qhzq9l1tjzn
2008-12-10 15:29:55 +01:00
qdp 7f9fe360f3 *merge of the ~activity/openobject-addons/trunk branch. Improvement of translatability and small bugfixes
*small modifs on mrp_repair module

bzr revid: qdp@tinyerp.com-20081208170840-ryh5435c5heqsngl
2008-12-08 18:08:40 +01:00
Fabien Pinckaers 1823c50af3 bugfix
bzr revid: fp@tinyerp.com-20081120163428-5ey7sgcp6zzfvf43
2008-11-20 17:34:28 +01:00
apa-tiny d914a6b41f Hr timesheet report prob solved-vir
bzr revid: patelamit2003@gmail.com-20081112044918-60mzdmuxis8yebbp
2008-11-12 10:19:18 +05:30
apa-tiny 377a379cce Hr timesheet report prob solved-vir
bzr revid: patelamit2003@gmail.com-20081112044826-oc252vxl70f78hce
2008-11-12 10:18:26 +05:30
Christophe Simonis f5fad0ba30 passing modules in GPL-3
bzr revid: christophe@tinyerp.com-20081103191856-jhcivvwb16fvz2os
2008-11-03 20:18:56 +01:00
Christophe Simonis 3e3d897e88 add encoding comment and vim comment
bzr revid: christophe@tinyerp.com-20080723144147-77o5t9adx26a84lt
2008-07-23 16:41:47 +02:00
Christophe Simonis d2ff95f665 replace tabs with 4 spaces
bzr revid: christophe@tinyerp.com-20080722151128-f5zy75tsn8pgtndd
2008-07-22 17:11:28 +02:00
Fabien Pinckaers 0929bc31f2 Improvement in timesheet summary report
bzr revid: fp@tinyerp.com-20080714171900-dai682wte08bkgaj
2008-07-14 19:19:00 +02:00
stw 0feb782c6a add Copyright and GPL license into the Header of Python files
bzr revid: stw-d9a6d631f7cfdab5a120a6b0104ce2dbf8644841
2008-06-16 11:00:21 +00:00
stw 0ffac0fe0c add the svn:keywords Id on all .py, .xml, .bat
bzr revid: stw-3687e75a6129c56b847ba26d6b256cdafeb444ab
2008-06-16 06:44:24 +00:00
qdp 8ddcbe88ed in report user_timesheet and users_timesheet, the background of sunday column is now grey even if there is no saturday before.
bzr revid: qdp-3df256bffe6dc332b35a06b922a0e442c63a2e8d
2008-01-09 11:26:21 +00:00
Fabien Pinckaers 839e52b075 Small Modifs on colors in timesheets
bzr revid: fp@tinyerp.com-817423891898fa25e3c82e8bb7844ae38e028ed0
2007-03-29 13:01:50 +00:00
ced 84a75ad1e0 HR_TIMESHEET: add rounding on report
bzr revid: ced-34ebab8e03cc0a1de06b656d2717b2005cc6e007
2007-02-15 09:56:05 +00:00