Commit Graph

288 Commits

Author SHA1 Message Date
Fabien Pinckaers 6c15bcce12 [MERGE] HR
bzr revid: fp@openerp.com-20121021195925-sbsfni9i10r2o2bw
2012-10-21 21:59:25 +02:00
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Ajay Chauhan (OpenERP) 142253b76e [IMP] hr_timesheet_sheet: made changes in warning message
bzr revid: cha@tinyerp.com-20121011122036-ff1kevlg121t2yz7
2012-10-11 17:50:36 +05:30
Atul Patel (OpenERP) b27b12db1b [FIX]: Fix onchange account id problem
bzr revid: atp@tinyerp.com-20121011121201-h6030emuz00t55nv
2012-10-11 17:42:01 +05:30
Atul Patel (OpenERP) e2a28b011a [FIX]: Fix on_change_analytic_id problem
bzr revid: atp@tinyerp.com-20121010150849-u4cldadvfjzmw8mj
2012-10-10 20:38:49 +05:30
Atul Patel (OpenERP) f935c9e482 [FIX]: get sheet id using timesheet line user id
bzr revid: atp@tinyerp.com-20121010124716-hdaebwpsowpowhl7
2012-10-10 18:17:16 +05:30
Atul Patel (OpenERP) eb20086d59 [REM]: Remove print statement
bzr revid: atp@tinyerp.com-20121010111151-cgylp0roe61vhzs9
2012-10-10 16:41:51 +05:30
Atul Patel (OpenERP) 98eaf2c2bc [FIX]: Fix on_change_account_id() argument problem
bzr revid: atp@tinyerp.com-20121010103450-n4gt4ikp05t6b8yu
2012-10-10 16:04:50 +05:30
pankita shah (Open ERP) 28bc19896d [MERGE] merged with lp:openobject-addons
bzr revid: shp@tinyerp.com-20121010052449-hvnp0e53d1sp6xs2
2012-10-10 10:54:49 +05:30
Atul Patel (OpenERP) bea6f1bbf3 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121009132059-fd0jvi6nuh9jyrl7
2012-10-09 18:50:59 +05:30
Atul Patel (OpenERP) 82138688a2 [FIX]: Fix analytic line shown.
bzr revid: atp@tinyerp.com-20121008154647-bdxw4ajq5hgb7jsk
2012-10-08 21:16:47 +05:30
niv-openerp a21489c8c8 Added on_change
bzr revid: nicolas.vanhoren@openerp.com-20121004134858-bsjtmlpbr4v9zv4d
2012-10-04 15:48:58 +02:00
niv-openerp dbd69a0e9e merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121002122939-xr3by0mdqzri0lss
2012-10-02 14:29:39 +02:00
niv-openerp 6679892393 fixed line duplication bug
bzr revid: nicolas.vanhoren@openerp.com-20121002121103-wyvshcyky324nc6r
2012-10-02 14:11:03 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
niv-openerp 7c1339928b Removed day by day
bzr revid: nicolas.vanhoren@openerp.com-20121001154605-nemay3pze49ejjld
2012-10-01 17:46:05 +02:00
Fabien Pinckaers 0eee48d30a [MERGE] auto-follow Sales Team, Projet, HR Manager
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00
Atul Patel (OpenERP) 1c1978fbb7 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120927041011-e90b4710saidnlcf
2012-09-27 09:40:11 +05:30
Atul Patel (OpenERP) d050d743ee [FIX]: override write method into hr module..
bzr revid: atp@tinyerp.com-20120926184445-3o03o0n4oxgprern
2012-09-27 00:14:45 +05:30
Atul Patel (OpenERP) 7f08d3d176 [FIX]: Fix employee manager id
bzr revid: atp@tinyerp.com-20120925173320-z4vn1ir2bwp9gu5l
2012-09-25 23:03:20 +05:30
Atul Patel (OpenERP) e8cf471e19 [IMP]: Manager should able to follow his employee requests
bzr revid: atp@tinyerp.com-20120924103812-eg1nflvk68cble4m
2012-09-24 16:08:12 +05:30
Fabien Pinckaers be779f57d0 [IMP] useability timesheets
bzr revid: fp@tinyerp.com-20121029150809-86cieq1flmb45ubl
2012-10-29 16:08:09 +01:00
Quentin (OpenERP) 62d16ecd3e [MERGE] staging branch with bugfixes + add of an option to enable the check total feature on supplier invoices
bzr revid: qdp-launchpad@openerp.com-20121029091713-z4vx02bzf9bswceu
2012-10-29 10:17:13 +01:00
Quentin (OpenERP) 149451bdf5 [FIX] hr_timesheet_sheet: default date on timehseet lines should be the date_from of the timesheet if today isn't included in the date_from and date_to
bzr revid: qdp-launchpad@openerp.com-20121025145443-5iuohn57h6uxn04t
2012-10-25 16:54:43 +02:00
niv-openerp 6e2b27e7a9 [MERGE] hr_attendance: removed some wizard and added widget to sign in/sign out
bzr revid: nicolas.vanhoren@openerp.com-20120907084438-bnxmscn1zt8u0aex
2012-09-07 10:44:38 +02:00
Stephane Wirtel 28b6979371 [FIX] account: Add an ondelete=cascade on the payment term line
[FIX] crm_claim: Fix a bug with the precedence of a menuitem
[FIX] hr_timesheet_sheet: Fix the ids of name_get

bzr revid: stw@openerp.com-20120906125407-8lbgehsf0yvy35vw
2012-09-06 14:54:07 +02:00
Harry (OpenERP) 86b4fac6dc [MERGE]
bzr revid: hmo@tinyerp.com-20120905133804-6fmqbv70oun3y3cn
2012-09-05 19:08:04 +05:30
Mayur Maheshwari (OpenERP) 6c337bcd64 [IMP]hr_timesheet_sheet :improved as per ids
bzr revid: mma@tinyerp.com-20120821090750-zkr0loqnmslqslcr
2012-08-21 14:37:50 +05:30
Mayur Maheshwari (OpenERP) 1937247840 [IMP]hr_timesheet_sheet :improve name_get method
bzr revid: mma@tinyerp.com-20120821055150-60n2k2fva99mqi9m
2012-08-21 11:21:50 +05:30
Mayur Maheshwari (OpenERP) 4e435d335d [FIX]hr_timesheet_sheet :fix the issue open timesheet by account from timesheet form view and pass a appropriate ids in name_get
lp bug: https://launchpad.net/bugs/1038023 fixed

bzr revid: mma@tinyerp.com-20120817104702-qpzqc8w1s9pccr83
2012-08-17 16:17:02 +05:30
Antonin Bourguignon b0e8ae4c7d [IMP] error messages
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')

bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
help c5427f3faa [IMP]improved exception warnings as per suggestion
bzr revid: help-20120731124210-7vjw7puesjm3884p
2012-07-31 18:12:10 +05:30
Saurang Suthar(OpenERP) 25d650e96e [IMP] Improved warning messages for hr* modules
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
Pinakin Nayi (OpenERP) 881148d4b1 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe
2012-07-13 17:46:13 +05:30
Pinakin Nayi (OpenERP) 27226c12b2 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
Harry (OpenERP) 763fa6ce81 [MERGE] merged with trunk
bzr revid: hmo@tinyerp.com-20120524164328-vxx3yol4c4bhonfv
2012-05-24 22:13:28 +05:30
Harry (OpenERP) 80ef7b58dd [IMP] hr_timesheet_sheet: improve API to signin/signout with new method 'attendance_action_change'
bzr revid: hmo@tinyerp.com-20120511073320-ilnxqtenca01l563
2012-05-11 13:03:20 +05:30
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Quentin (OpenERP) a5b56361e4 [FIX] hr_timesheet_sheet: fixed the automatic computation of sheet_id field on hr.analytic.timesheet object. Before it was not automatically triggered at the creation and it was causing a problem in a YAML test of module project_timesheet
bzr revid: qdp-launchpad@openerp.com-20120313150347-230dwv8a96y1j04x
2012-03-13 16:03:47 +01:00
Numerigraphe - Lionel Sausin 2d2a44dcf2 [FIX] unmutable default in the remaining modules
[REF] coding style consistency

lp bug: https://launchpad.net/bugs/525808 fixed

bzr revid: ls@numerigraphe.fr-20120305184003-er00xtj9vtcw7gna
2012-03-05 19:40:03 +01:00
Raphael Collet e3582f6de7 [IMP] hr_timesheet_sheet: small improvements
bzr revid: rco@openerp.com-20120106092520-hcg9kl17hbgl5mum
2012-01-06 10:25:20 +01:00
Raphael Collet f6e24e2ea9 [MERGE] from trunk
bzr revid: rco@openerp.com-20120106083217-15db2s9i3wi7f5xr
2012-01-06 09:32:17 +01:00
Stefan Rijnhart d47cfde798 [FIX] hr_timesheet_sheet : Weekly timesheet created on monday covers two weeks
lp bug: https://launchpad.net/bugs/897662 fixed

bzr revid: mdi@tinyerp.com-20111208062856-y957nmoedj2nwxk5
2011-12-08 11:58:56 +05:30
Guewen Baconnier dbb682f8dc [FIX] hr : hr_timesheet_sheet: Timesheets big performance issues
lp bug: https://launchpad.net/bugs/798732 fixed

bzr revid: bde@tinyerp.com-20111114122042-korond509at5p5m9
2011-11-14 17:50:42 +05:30
Raphael Collet 9bda9ae861 [FIX] revert change 5542, which makes tests fail
bzr revid: rco@openerp.com-20111109140726-far79s7wwa1w9uty
2011-11-09 15:07:26 +01:00
Raphael Collet d9f254eead [MERGE] lp:887553
bzr revid: rco@openerp.com-20111109125350-8rrbockys62pkid7
2011-11-09 13:53:50 +01:00
Raphael Collet 73bdf34a66 [MERGE] lp:798732
bzr revid: rco@openerp.com-20111109110549-2ctesk7m58kkh14t
2011-11-09 12:05:49 +01:00
Stéphane Bidoul 6eabac46a9 [FIX] hr : hr_timesheet_sheet's can overlap by one day
lp bug: https://launchpad.net/bugs/887553 fixed

bzr revid: bde@tinyerp.com-20111109062543-6s5yi9zn0lfss907
2011-11-09 11:55:43 +05:30
Quentin (OpenERP) 32c21e1ac0 [MERGE] merged the branch of Guewen Baconnier (Camptocamp) that improves the hr_timesheet_sheet by allowing to make 'sign in' ('sign out') when still present (absent). Thanks for the contribution, c2c
bzr revid: qdp-launchpad@openerp.com-20111028115717-inwoqbaej5i4l549
2011-10-28 13:57:17 +02:00
Quentin (OpenERP) 0384b8bfbf [FIX] hr_timesheet_sheet: attendance state of an employee was sometimes not correctly stated on the timesheet.sheet when uid had more than one employee assigned. Removed useless and stupid code that was messing to find on which employee to check the attendance status, as it's given on the sheet. Replaced by a fields.related
bzr revid: qdp-launchpad@openerp.com-20111028103957-nkekeqjuyn44phnv
2011-10-28 12:39:57 +02:00
Fabien Pinckaers ac214af8d0 [IMP] config wizards
bzr revid: fp@tinyerp.com-20111001184625-57er05vgdir4lgwd
2011-10-01 20:46:25 +02:00
Fabien Pinckaers 18804364e5 merge
bzr revid: fp@tinyerp.com-20110924115332-2fongn5bwx39xrv7
2011-09-24 13:53:32 +02:00
Guewen Baconnier d0ddde6ea7 hr_timesheet_sheet: Timesheets big performance issues
lp bug: https://launchpad.net/bugs/798732 fixed

bzr revid: bde@tinyerp.com-20110922110440-0c4jhq2gmh627s63
2011-09-22 16:34:40 +05:30
Fabien Pinckaers c4047f3936 [useability] better error/warning message
bzr revid: fp@tinyerp.com-20110918135310-sx5wzu22opr9cdwo
2011-09-18 15:53:10 +02:00
Fabien Pinckaers 99a72c7792 [Useability] improved error message
bzr revid: fp@tinyerp.com-20110918134116-2vvdelak2268j6pz
2011-09-18 15:41:16 +02:00
Bharat (OpenERP) 27c6273a6a [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20110915124610-7f2dn0u5ns9s4ph0
2011-09-15 18:16:10 +05:30
fp e37394cd58 [IMP] useability of timesheet
bzr revid: fp@fp-laptop-20110910124355-qkkbtgm3wz6l2w1f
2011-09-10 14:43:55 +02:00
95a2d17930 [FIX] of last commit: allow to sign in / sign out on the sheet of an other employee
bzr revid: guewen.baconnier@camptocamp.com-20110707122759-3919twq9v9sznuo4
2011-07-07 14:27:59 +02:00
8bdaefd12e [IMP] hr_timesheet_sheet: sign-in and sign-out buttons on the sheet use the same attendances wizard which asks for the last sign-in/sign-out if it is missing instead of raising an error
bzr revid: guewen.baconnier@camptocamp.com-20110706074731-8v14k99lcgmipm4y
2011-07-06 09:47:31 +02:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
bde a533d96236 [ADD] hr : converted ids in list of ids where _check method is called
lp bug: https://launchpad.net/bugs/798190 fixed

bzr revid: bde@tiny2-desktop-20110701094510-x6ysb65d71blszkd
2011-07-01 15:15:10 +05:30
Ujjvala Collins (OpenERP) 461c89b180 [IMP] hr_timesheet_sheet: Improved onchange_employee_id method.
bzr revid: uco@tinyerp.com-20110617125952-m1xbspu0j2d81g5e
2011-06-17 18:29:52 +05:30
bde 8f34b9bc5f [REM] hr : Removed default method, improved the code in onchange method and renamed the onchange method
bzr revid: bde@tiny2-desktop-20110616130331-akwurvfky183f442
2011-06-16 18:33:31 +05:30
Stéphane Bidoul c83acd9ce4 [ADD] hr : Added default value for departmet and applied onchange method for department according to employee_id
lp bug: https://launchpad.net/bugs/708730 fixed

bzr revid: bde@tiny2-desktop-20110615100411-gs5vkug3kb0i8sg8
2011-06-15 15:34:11 +05:30
Quentin (OpenERP) 8b54c67264 [MERGE] lp: 760493
bzr revid: qdp-launchpad@openerp.com-20110420161656-9gs5obthhvcoicjw
2011-04-20 18:16:56 +02:00
Quentin (OpenERP) 290ef7ed6c [FIX] hr_timesheet_sheet: Improved Exception coming on Sign In and Sign Out buttons
lp bug: https://launchpad.net/bugs/74642 fixed

bzr revid: qdp-launchpad@openerp.com-20110420125521-p2js2tk3z7q5lw5t
2011-04-20 14:55:21 +02:00
skh c2719f0f8c [FIX] Adding working time in a confirmed timesheet
lp bug: https://launchpad.net/bugs/760493 fixed

bzr revid: skh@tinyerp.com-20110415100534-g823ifs3sa7ufz4l
2011-04-15 15:35:34 +05:30
skh 75c16a19cc [FIX] Adding working time in a confirmed timesheet
lp bug: https://launchpad.net/bugs/760493 fixed

bzr revid: skh@tinyerp.com-20110415091428-r9rm44mkdnjiwp9x
2011-04-15 14:44:28 +05:30
skh 6b83b67f60 [FIX] Adding working time in a confirmed timesheet
lp bug: https://launchpad.net/bugs/760493 fixed

bzr revid: skh@tinyerp.com-20110415084906-j70rij3nfvr77cn3
2011-04-15 14:19:06 +05:30
ARA (OpenERP) 96311d7923 [FIX] hr_timesheet_sheet: Cannot use the timesheet program because of a warning message Please Enter A Value
bzr revid: ara@tinyerp.com-20110314093854-sei5y7g03h36cvk3
2011-03-14 15:08:54 +05:30
ARA (OpenERP) 708c8a1cca [FIX] hr_timesheet_sheet: Cannot use the timesheet program because of a warning message Please Enter A Value
lp bug: https://launchpad.net/bugs/724201 fixed

bzr revid: ara@tinyerp.com-20110314091003-v8zxjg9l56wcussd
2011-03-14 14:40:03 +05:30
Quentin (OpenERP) 87ca1eefae [FIX] hr_timesheet_sheet: removed readonly on attendances
bzr revid: qdp-launchpad@openerp.com-20110311172513-7b3cpor9feipqfvf
2011-03-11 18:25:13 +01:00
psi (Open ERP) ec8823d2d3 [FIX] account, account_*, hr_*, point_of_sale, sale: performance issues - account_move_lines and others
lp bug: https://launchpad.net/bugs/693833 fixed

bzr revid: psi@tinyerp.co.in-20110117112056-ryw0wyjltqzeuhzt
2011-01-17 16:50:56 +05:30
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
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