Commit Graph

115 Commits

Author SHA1 Message Date
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
ARA (OpenERP) 9944b0a261 [FIX]hr_timesheet_sheet: wrong coloumn in timesheet view
lp bug: https://launchpad.net/bugs/697673 fixed

bzr revid: ara@tinyerp.com-20110106053521-foflkifrz4rbqck9
2011-01-06 11:05:21 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
François Degrave b05d9cfe25 [FIX] HR sign in/sign out
bzr revid: fde@openerp.com-20101229123900-mxl4umxn1tqjjpar
2010-12-29 13:39:00 +01:00
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
Mustufa Rangwala e20452310d [FIX] Timesheet allows sign in in the future
lp bug: https://launchpad.net/bugs/676445 fixed

bzr revid: mra@mra-laptop-20101210061404-xs52l3jkalw87fil
2010-12-10 11:44:04 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Mustufa Rangwala fa454743f4 [REF]
bzr revid: mra@mra-laptop-20101102111112-5ik1xz0m6mw96saa
2010-11-02 16:41:12 +05:30
Mustufa Rangwala 23065b08de [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101021043001-s0f3f217o9vcp783
2010-10-21 10:00:01 +05:30
Vir (Open ERP) c7d50354fb [FIX] hr_timesheet_sheet : date_from and date_to problem, hr_evaluation : date deadline problem fixed
bzr revid: vir@tinyerp.com-20101020132948-1ax61wd33j1ejj18
2010-10-20 18:59:48 +05:30
pso 4fb47235f6 [IMP] hr modules: removed unused vars
bzr revid: pso@tinyerp.com-20101019120326-9or5zt16zo4g4ayz
2010-10-19 17:33:26 +05:30
Harry (Open ERP) e087ab8bb8 [IMP] : Removed mx.DateTime and used datetime object.
bzr revid: uco@tinyerp.com-20101015140153-tyy27fby84tijohb
2010-10-15 19:31:53 +05:30
Vir (Open ERP) 4b0c69ab39 [IMP] hr_timesheet_sheet : set a server action for my timesheet menu
bzr revid: vir@tinyerp.com-20101013120039-b4ffcjiv26koodwu
2010-10-13 17:30:39 +05:30
qdp-launchpad@tinyerp.com 834f85ab4f [IMP] hr_timesheet_sheet: set the timesheet sheet working per employee instead of per user
bzr revid: qdp-launchpad@tinyerp.com-20101006163901-7x4wz3abc3a1qqbm
2010-10-06 18:39:01 +02:00
olt@tinyerp.com 6d1dedeee9 [FIX] hr_timesheet_sheet, mrp: don't pass a dict or list to fromkeys second argument (it's only evaluated once)
bzr revid: olt@tinyerp.com-20100922083838-80ikcizior7qkcic
2010-09-22 10:38:38 +02:00
olt@tinyerp.com 8951c84d31 [IMP] hr_timesheet_sheet: performance improvement: rewriten one2many_mod2.get to execute one sql query
bzr revid: olt@tinyerp.com-20100921130739-w55cdmr4ps0twa9y
2010-09-21 15:07:39 +02:00
Vir (Open ERP) 0077d84028 [ADD/MOD] hr_timesheet_sheet : Current timesheet menu added for user, improvemetns in access rights
bzr revid: vir@tinyerp.com-20100916055956-zkrajl66gv7y50b7
2010-09-16 11:29:56 +05:30
apa-tiny 3fd8ddc9e3 [IMP]:hr_timesheet_sheet:add description
bzr revid: apa@tinyerp.com-20100901120441-s8y6mzyzlqt56tib
2010-09-01 17:34:41 +05:30
Jay (Open ERP) 53411e0686 [FIX] hr_timesheet_sheet : timesheet should only be confirmed when no. of sign in entries equal to sign out
bzr revid: jvo@tinyerp.com-20100811155857-fdsy4zuntywb7eda
2010-08-11 21:28:57 +05:30
PSI (OpenERP) 4b1348a989 [IMP] hr related modules improvements
bzr revid: mra@mra-laptop-20100727071145-4n3z9i1jj1zosp8z
2010-07-27 12:41:45 +05:30
PSI (Openerp) 9c0ae10d6a [IMP] hr and its related modules improvements
bzr revid: mra@mra-laptop-20100721123948-r2fi24sbelnfk7pr
2010-07-21 18:09:48 +05:30
Mustufa Rangwala e02ec78cfe [IMP] HR Modules improvements (ref: PSI)
bzr revid: mra@mra-laptop-20100713133802-jgzks42h9x83ivmz
2010-07-13 19:08:02 +05:30
JMA (OpenERP) 4cf1362e3b [FIX] Security fixes for sql injections
bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
2010-06-10 19:04:19 +05:30
mra (Open ERP) 38dd957438 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
psi (Open ERP) 1fa0bc873d [IMP] hr_timesheet_sheet: small change
bzr revid: psi@tinyerp.co.in-20100519131739-fq8eatkfprj7qatp
2010-05-19 18:47:39 +05:30
psi (Open ERP) 84dfed9da7 [IMP] account, hr_contract, hr_timesheet, project: small changes, clean
bzr revid: psi@tinyerp.co.in-20100519130703-fgog8lo8zgh8g4rk
2010-05-19 18:37:03 +05:30
gpa e70dd4a5a4 [FIX] hr_timesheet_sheet: Add a default value for the context keyword
bzr revid: gpa@tinyerp.com-20100511071529-78miiuyibt8gyvvm
2010-05-11 12:45:29 +05:30
mra (Open ERP) 1e86221189 [FIX] hr_timesheet_sheet: to link attendaces with timesheet (employee now attchaed with resource so change the query)
bzr revid: mra@tinyerp.com-20100309063603-3sxf2efirreqoneq
2010-03-09 12:06:03 +05:30
Vir (Open ERP) ddfcd40423 [IMP] department_id added in expense,timesheet,applicant,holidays. Department view put in comment in resource and set in hr
bzr revid: vir@tinyerp.com-20100217084938-wb9ixv8ey4ah6j9i
2010-02-17 14:19:38 +05:30
HDA (OpenERP) 93bd614c8e merged to remove sql injection
bzr revid: hda@tinyerp.com-20100201082939-fj0u5f0pvlgq7j3k
2010-02-01 13:59:39 +05:30
HDA (OpenERP) 404bf5ca1a [FIX] module:hr_timesheet_sheet postgres view
bzr revid: hda@tinyerp.com-20100129064057-jc3piy42kusbr716
2010-01-29 12:10:57 +05:30
HDA (OpenERP) 0b2bb31992 Merge from stable
bzr revid: hda@tinyerp.com-20100121151350-58pcefq2tdw2ge2l
2010-01-21 20:43:50 +05:30
HDA (OpenERP) 92ae38eb0a Project management improvements
bzr revid: hda@tinyerp.com-20100119073547-dqn2c0i9ycx6kp3a
2010-01-19 13:05:47 +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
Jay (Open ERP) a23b83db01 [FIX] Functional fields should have context as an argument when we use fnct_searc method
lp bug: https://launchpad.net/bugs/504670 fixed

bzr revid: jvo@tinyerp.com-20100108113858-dp3e8pm5px4uspum
2010-01-08 17:08:58 +05:30
Harry (Open ERP) b16b33b9fb [MERGE] merge from lp:~openerp-commiter/openobject-addons/ergonomy-search-views
bzr revid: hmo@tinyerp.com-20091224110142-drqpn9il4e25v377
2009-12-24 16:31:42 +05:30
Vir (Open ERP) ec58eefc89 [IMP] Help added on timesheet state field.Changed caption from 'Status' to 'State'
bzr revid: vir@tinyerp.com-20091224070523-rlhk6rcijp5cujy2
2009-12-24 12:35:23 +05:30
Fabien Pinckaers cbd41d602b [FIX] multi company_default
bzr revid: fp@tinyerp.com-20091223171639-hgvyetizdgyh0itv
2009-12-23 18:16:39 +01:00
Jay (Open ERP) f5a36da0c1 [FIX] HR_Timesheet_sheet : timesheet cannot be deleted which have attendance entries encoded
lp bug: https://launchpad.net/bugs/496991 fixed

bzr revid: jvo@tinyerp.com-20091221130004-75pxba8k30an2qpj
2009-12-21 18:30:04 +05:30
RGA(OpenERP) 1e1c996161 [REF] HR_attendance : Code optimized for sign in and out
bzr revid: jvo@tinyerp.com-20091221110305-jvrdec4s2cfu69qt
2009-12-21 16:33:05 +05:30
nch@tinyerp.com 7d1b6aadb5 [MERGE]
bzr revid: nch@tinyerp.com-20091127084026-qmju10co18vkywrd
2009-11-27 14:10:26 +05:30
Panos Christeas 8d0b4a7418 [MERGE] merge from lp:~xrg/openobject-addons/doc2-5.2
bzr revid: hmo@tinyerp.com-20091126135400-z32iycvadbt9so8n
2009-11-26 19:24:00 +05:30
nch@tinyerp.com 719291b5c0 [IMP]:hr_timesheet_sheet sql queries to parameterized query
bzr revid: nch@tinyerp.com-20091126061900-zmfo84ck4yngci9p
2009-11-26 11:49:00 +05:30
gpa ac0348f28a [IMP]account,hr_timesheet_sheet,product,project,purchase,sale modules: company_id [ADD] multi_company module.
bzr revid: gpa@gpa-desktop-20091120134742-xzwscqyhzxsbijt5
2009-11-20 19:17:42 +05:30
vra 80861660c6 merge multi_company, multi_company_account, multi_company_hr_timesheet_sheet, multi_company_product, multi_company_project, multi_company_purchase modules.
bzr revid: vra@tinyerp.com-20091110124920-qho0im1rrx3mf4sf
2009-11-10 18:19:20 +05:30
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