Commit Graph

288 Commits

Author SHA1 Message Date
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
Christophe Simonis d2ff95f665 replace tabs with 4 spaces
bzr revid: christophe@tinyerp.com-20080722151128-f5zy75tsn8pgtndd
2008-07-22 17:11:28 +02:00
Christophe Simonis 1f43329f0e * translation of nearly all exceptions
* the export of translations per module take only the files of these modules

bzr revid: chs@tinyerp.com-77721e34d87043c4008239f004c7c616f6d4dc82
2008-07-08 08:13:12 +00: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 e623c1da80 Add constraint to disable the possibility to enter an attendance outside the sheet
bzr revid: ced-b67f9dd9f7bbd40491e23466a61f7b590b10999b
2008-01-18 14:49:43 +00:00
Fabien Pinckaers aa88c7316b Simple Typo
bzr revid: fp@tinyerp.com-ca8c04cd6fe4038ada63043b0ba096c5c42a6007
2007-12-17 17:33:51 +00:00
ced 0237f62a81 Fix _sheet function in timesheet when called with a list of non unique id
bzr revid: ced-0077ba46e97cd7b1afbfe1a9fed3096a0d7bef4c
2007-12-13 13:39:42 +00:00
ced 6c23b98d24 Fix in search sheet_id with many args
bzr revid: ced-60a496258797d2ea99d55eebc3a6bcea9f9356a1
2007-11-26 15:46:25 +00:00
ced 21f9d54b28 Add fnct_search to sheet_id
bzr revid: ced-d0f64b66824ae3efb44258a2c8f4fc390c8c9f8e
2007-11-21 15:24:43 +00:00
ced 0f66f8358f Fix sheet function on attendance
Must return a value for all ids

bzr revid: ced-215b2a85699f8f916dd2502bf74cf938c807231d
2007-10-31 14:14:13 +00:00
ced 79f8455aad Fix view for new field function sheet_id and improve fields_mod
bzr revid: ced-34cb68b361cc596c935667c947d5fe6f529226e7
2007-09-21 06:31:47 +00:00
ced c4f7e985c6 Improve many2one for timesheet
bzr revid: ced-8fb2064a09bfcabc0539be585dc0232351913836
2007-09-20 11:04:27 +00:00
ced 32ad57b54f Fix view timesheet by day to take only sign_in/sign_out action
bzr revid: ced-96083cca776eb529bd439ab453a118dfb8892e7c
2007-09-20 11:04:21 +00:00
ced 95cd7398da Imrpove timesheet
field sheet_id become a field function

bzr revid: ced-e4c07aa6527f478bffc1271150f8cc6ef14b1712
2007-09-20 08:48:33 +00:00
ced 302b65f12a Improve check on timesheet
bzr revid: ced-bf8967632bf6d711d4598b3bdfa3f6de9c7fca0c
2007-09-14 13:42:14 +00:00
ced 7888751245 And one more improvment on fields function in hr_timesheet_sheet
bzr revid: ced-978abb8d42141450a034d154e1b6ea287810d15c
2007-08-31 06:41:15 +00:00
ced bfe53d94db One more improvment on fields.function in hr_timesheet_sheet
bzr revid: ced-31f6ad520f48e16a6d58988d426f6b9f92e1d720
2007-08-31 06:15:12 +00:00
ced 7bde947542 Improve speed of hr_timesheet_sheet
bzr revid: ced-b69b374a08ca5c1a953738a87fd91d845f5e7a7e
2007-08-30 14:22:22 +00:00
Fabien Pinckaers ba0a99deb0 Bugfix for multi-company
bzr revid: fp@tinyerp.com-d811d5cdf9b076f7f82acd70573deb2c9759c8d4
2007-07-20 10:11:19 +00:00
ced ba31e00dee hr_timesheet_sheet: allow creation of timesheet_line when sheet in state 'new'
bzr revid: ced-6b64fc35685a1c188e5bdf2549bc0b28c8ee7a11
2007-07-12 15:31:04 +00:00
ced dfc9dbe270 hr_timesheet_sheet: add name_get to sheet
bzr revid: ced-75cb8d25fe3163fb30b5eda6d3f394b38e7dfecf
2007-07-09 09:08:41 +00:00
ced 89b312484b hr_timesheet_sheet: fix difference in view by day
bzr revid: ced-3efbc707ade4d84a9b9091e13d94f901fc6db0b4
2007-07-04 08:38:20 +00:00
ced e39807ae86 HR_TIMESHEET_SHEET: add 'Set to Draft' button
bzr revid: ced-747d8d50c2a56831777bf70b8a260d6b94df099b
2007-06-18 10:20:48 +00:00
ced 7e141539e0 HR_TIMESHEET_SHEET: bugfix speed improve
bzr revid: ced-1349292a48b62d348109063a73073639bc9cb5d1
2007-06-18 07:30:42 +00:00
ced bacfe37310 HR_TIMESHEET_SHEET: improve speed
bzr revid: ced-d9a553d91b34f43319838080851d568e7b94f5f5
2007-06-15 15:10:46 +00:00
Fabien Pinckaers 687ff0df82 Better views and graphs
Better demo data

bzr revid: fp@tinyerp.com-7ace400ea4961ce4b6dea4fb25eda4b8efd6150e
2007-06-10 10:44:02 +00:00
ced e980813d4d CLIENT,KERNEL: new tag act_window for new relate implementation
bzr revid: ced-774fa598d18bfb26cf59e94de536c6afd5bf531b
2007-05-24 05:26:36 +00:00
ced 72aac92732 HR_TIMESHEET_SHEET: fix goto button out of constraint
bzr revid: ced-b29b380fce0d75170f65d5a4ae0b0f3227e97ae6
2007-05-07 05:30:24 +00:00
bch 7cdc2697f7 hr_timesheet_sheet: gui improvement : new button and other button moved
bzr revid: bch-c8e404f61a3a09c6925a0db0c2fffd0f757eeb3f
2007-04-25 12:37:56 +00:00
ced 6bff06bdf3 HR_TIMESHEET_SHEET: fix total attendance to count only sign_in and sign_out
bzr revid: ced-4161812fbb9e0f8a44d6878933967543b3351499
2007-04-24 10:53:41 +00:00
ced ae9c14730d HR_TIMESHEET(_SHEET): improve sign in/out and view name
bzr revid: ced-b967016431a5929a873402632937ee72cbccf48a
2007-04-24 09:57:49 +00:00
ced 8e5c782a06 HR_TIMESHEET_SHEET: add invoice rate to report by account
bzr revid: ced-dd39a06610b8080dab88b517bbdfdcf0e052eb88
2007-04-17 10:16:29 +00:00
ced ef4159c2c3 HR_TIMESHEET_SHEET: fix workflow
bzr revid: ced-b83bc1fb87c00d058996c8968f82e3b303f3d259
2007-04-16 11:41:24 +00:00
ced 81865eae1b HR_TIMESHEET_SHEET: fix date compare to datetime
bzr revid: ced-c3f2ec79c8bebadc22685127c03b230b4809be41
2007-04-16 06:19:24 +00:00
ced bbead97ca8 HR_TIMESHEET_SHEET: use constraints
bzr revid: ced-45f8304aae8ff328257bce62332da9b3ff23fa66
2007-04-13 08:44:07 +00:00
ced 089863c406 HR_TIMESHEET_SHEET, CLIENT, KERNEL: improve hr_timesheet_sheet, add context to one2many, improve error message for orm
bzr revid: ced-45596d43ab63775e008e5e629bebb06564ebbfa2
2007-03-26 13:52:53 +00:00
ced bfff615b9b CLIENT/SERVER: improve tiny_socket for exception and remove some bad print
bzr revid: ced-98db01e251bf6cbd81f8f09392f6076722534fbf
2007-03-13 15:11:29 +00:00
pinky 18049778c2 Modifs timesheet
bzr revid: pinky-e71f1c2e8d72af0477efb07b2f156ef7e2ae92ad
2007-03-07 06:26:01 +00:00
pinky 6a99028203 Timesheet improved
bzr revid: pinky-63b95fbc47630808b77fa3345e7bd02b7ba5a1ad
2007-03-06 09:55:17 +00:00
pinky f5284f3bd8 Timesheet
bzr revid: pinky-970b9a72923a1021b5753707b850d22d6d3f4b03
2007-03-06 06:23:48 +00:00
pinky 64216c3578 Added timesheet improved
bzr revid: pinky-fcc0eb67412745596f7b8f758f83ebab4ae4b52f
2007-03-05 18:22:32 +00:00