Commit Graph

68 Commits

Author SHA1 Message Date
Nicolas Seinlet 8347d36bf1 [FIX] use inner join to avoid null id's in read_group 2014-12-29 15:22:35 +01:00
qdc f57787e07e [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-26 11:56:49 +02:00
Christophe Simonis 5a5f811d23 [REVERT] commit 5e5c73e
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
qdc 5e5c73e7ba [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-22 09:49:09 +02:00
Géry Debongnie 366a30db95 [FIX] correct various date issues in reporting
* remove old 'day', 'month', 'field' and replace them by the actual
date/datetime field
* remove weird cast to char when creating the view to prevent crash
when grouping on them
* remove duplicates (such as 'creation_date' and 'create_date')
* fix typing errors (field type date defined as a datetime in the
postgres view)
* fix search view definition
2014-07-30 15:11:22 +02:00
tpa-odoo d2f3bb953d [IMP] move hr timesheet analysis report in to hr_timesheet 2014-06-17 13:53:33 +02:00
Simon Lejeune 49fe785e64 [REM] hr_timesheet: removed xsl/models of user(s) timesheet reports as they are not available since rev 9064 revid:ged@openerp.com-20140127161718-uo6pperke86pqq5v. They are already replaced by graphviews.
bzr revid: sle@openerp.com-20140425113228-obzblo2nmkmo2q58
2014-04-25 13:32:28 +02:00
Thibault Delavallée 1aa92dbc46 [FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
2013-12-20 17:55:19 +01:00
Denis Ledoux 1508c5dd00 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
Xavier ALT 6df572aae4 [FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign
bzr revid: xal@openerp.com-20131219135147-jpli369iqlanf3t3
2013-12-19 14:51:47 +01:00
Martin Trigaux cca8bb4d64 [FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
Somesh Khare (OpenERP) 4ed53ad39e [FIX]hr_holidays, hr_timesheet: XMLSyntaxError Error occurred when company name have ampersand '&' sign (Case: Ref 591630)
bzr revid: skh@openerp.com-20130422124943-04zhbhbj9snvikqv
2013-04-22 18:19:43 +05:30
Vo Minh Thu b39e0617fc [REF] hr_timesheet: removed openerp.pooler imports.
bzr revid: vmt@openerp.com-20130327124307-1ibgcdpt7paigmdw
2013-03-27 13:43:07 +01:00
Vo Minh Thu ca89ae8f71 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206151316-u1eqx41ltjpz2lrd
2012-12-06 16:13:16 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
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
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