Commit Graph

29 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Stephane Wirtel 21f104a506 [IMP] Update the copyright to 2009
bzr revid: stephane@tinyerp.com-20090104221250-55q32ayj2t8kzb2k
2009-01-04 23:12:50 +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
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
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
ced 84a75ad1e0 HR_TIMESHEET: add rounding on report
bzr revid: ced-34ebab8e03cc0a1de06b656d2717b2005cc6e007
2007-02-15 09:56:05 +00:00
pinky a83dce15e0 New trunk
bzr revid: pinky-dedd7f8a42bd4557112a0513082691b8590ad6cc
2006-12-07 13:41:40 +00:00