Commit Graph

91 Commits

Author SHA1 Message Date
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
HDA (OpenERP) d514c8c694 [MERGE]
bzr revid: hda@tinyerp.com-20091001120743-ccchg1bds3iu2hb3
2009-10-01 17:37:43 +05:30
HDA (OpenERP) 7d3a5b51ba [Merged] stable and trunk addons
bzr revid: hda@tinyerp.com-20090924104621-7p53erkfs9xa0bev
2009-09-24 16:16:21 +05:30
GPA(Open ERP) 60550c799d [FIX] hr_timesheet_sheet : casting correction for a view
lp bug: https://launchpad.net/bugs/431864 fixed

bzr revid: jvo@tinyerp.com-20090922051911-6ujs6cwfgegmqxfe
2009-09-22 10:49:11 +05:30
ACH(OpenERP) c6e801a2d1 [FIX] hr_timesheet_sheet : Rounding value problem in float_time widget
lp bug: https://launchpad.net/bugs/424177 fixed

bzr revid: jvo@tinyerp.com-20090911142257-s8prbnz3lgymqsvu
2009-09-11 19:52:57 +05:30
Jay (Open ERP) 0e728b69f6 [FIX] hr_timesheet_sheet : date interval corrected for attendances
lp bug: https://launchpad.net/bugs/393798 fixed

bzr revid: jvo@tinyerp.com-20090630151137-hrcfrqavdi2zlz7a
2009-06-30 20:41:37 +05:30
Jay (Open ERP) 25177a0fe5 [FIX] Bug 368698 : Warning resolved(ref:.GPA)
bzr revid: jvo@tinyerp.com-20090501095606-te74htk5inczcmit
2009-05-01 15:26:06 +05:30
Jay (Open ERP) 61106b0fff [FIX]Bug 352191 : Corrected
bzr revid: jvo@tinyerp.com-20090331113253-bxgu0qdaqjoi7psq
2009-03-31 17:02:53 +05:30
Jay (Open ERP) aaf478c220 [FIX]Bug 352191 : Corrected hr_attendance creation for timesheet when date=last date of timesheet
bzr revid: jvo@tinyerp.com-20090331094433-2n8u78s90jqwexe2
2009-03-31 15:14:33 +05:30
Fabien Pinckaers 5d61607688 bugfix
bzr revid: fp@tinyerp.com-20090121193358-a2o75diozf29c0hq
2009-01-21 20:33:58 +01:00
Stephane Wirtel 618cc03cca [FIX] hr_timesheet_sheet - Can't remove a confirmed timesheet
lp bug: https://launchpad.net/bugs/319186 fixed

bzr revid: stephane@tinyerp.com-20090120203258-eegloe0sqmygrwcj
2009-01-20 21:32:58 +01:00
Stephane Wirtel 3199d71f92 [FIX] hr_timesheet_sheet: The name and the user are readonly when the state is confirmed or done
lp bug: https://launchpad.net/bugs/319163 fixed

bzr revid: stephane@tinyerp.com-20090120185108-76awzargwf81rfcw
2009-01-20 19:51:08 +01:00
Fabien Pinckaers f4ae3f7e26 modifs
bzr revid: fp@tinyerp.com-20090115165702-9qo212e0614c5ovo
2009-01-15 17:57:02 +01: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
pso (tiny) eaa876bb45 merge
bzr revid: solanki.priyesh@gmail.com-20081222065441-0wrzqih2ylonvcrr
bzr revid: pso@tinyerp.com-20081224060924-rgyj1jvh5cihcbxl
bzr revid: pso@tinyerp.com-20081224072046-4ooxerfj3rmd3sn6
2008-12-24 12:50:46 +05:30
Fabien Pinckaers d67e5ca42f bugfix
bzr revid: fp@tinyerp.com-20081220051116-mz11ck1kj0ygpazb
2008-12-20 06:11:16 +01:00
Priyesh 4e60986d81 merge
bzr revid: solanki.priyesh@gmail.com-20081211115303-xhue9l8ao0uwbl7x
2008-12-11 17:23:03 +05:30
Priyesh ac68d17cc5 minor change
bzr revid: solanki.priyesh@gmail.com-20081211115052-oi8314q6m9kr5v8r
2008-12-11 17:20:52 +05:30
Christophe Simonis 1a0de2f0f9 [FIX] psycopg2: %d -> %s
bzr revid: christophe@tinyerp.com-20081210142955-ewfr1qhzq9l1tjzn
2008-12-10 15:29:55 +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
Fabien Pinckaers cac4fe35ca better_views
bzr revid: fp@tinyerp.com-20081027152913-hbizvoble601g1l9
2008-10-27 16:29:13 +01:00
Fabien Pinckaers c949d120fc Improved:
Sales Management
	Project Manegement
	Stock Management
	Accounting

bzr revid: fp@tinyerp.com-20080907232439-bod5fedw3o7w7u47
2008-09-08 01:24:39 +02:00
Fabien Pinckaers ca24f48de3 Modifs
bzr revid: fp@tinyerp.com-20080828230810-nt2h294l3w6ox3iy
2008-08-29 01:08:10 +02:00
Joel Grand-Guillaume 57ae896b10 Add constraint on hr_timesheet_sheet to prevent keyerror when bropwsing all timesheet
bzr revid: joel.grandguillaume@camptocamp.com-20080819091524-rcdsj0mlfznubs87
2008-08-19 11:15:24 +02: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