Commit Graph

111 Commits

Author SHA1 Message Date
psi (Open ERP) dc38bb2f62 [IMP] remove hr.contract.wage.type.period.user from security file and comment all appearance of the object from view file
bzr revid: psi@tinyerp.co.in-20110322130811-ps38kxglfwqqkx59
2011-03-22 18:38:11 +05:30
Xavier Morel 4e6a9ea55c [REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
mtr 5c0680f7f8 [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110311101220-9yehi8n5lz7ui2hx
2011-03-11 15:42:20 +05:30
mtr d4a5c96afa [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110310053747-79fbrkud3ycqfhz6
2011-03-10 11:07:47 +05:30
psi (Open ERP) 3ce6dbde44 [MERGE] merge with main trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110310053224-zlmqbi3u1ht3ocop
2011-03-10 11:02:24 +05:30
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
2011-03-08 12:06:37 +05:30
mtr 6e6b21a875 [IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
2011-03-07 16:58:17 +05:30
mtr 11c72fb988 [IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract
bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
2011-03-07 14:15:15 +05:30
psi (Open ERP) 016fbccf00 [IMP] changes as per hr_payroll_new file given by QDP sir: move hr_passport obj to hr module, move some fields of hr.contract from hr_paroll to hr_contract, remove working_days_per_week field for contart and get it from resource calender
bzr revid: psi@tinyerp.co.in-20110303124903-nopz0swoebyqtsqq
2011-03-03 18:19:03 +05:30
psi (Open ERP) 3f1aeeef70 [IMP] hr_payroll: Add new tab Holiday on hr.payslip object and comment unwanted calculation for gross and net, remove wage_type_id
bzr revid: psi@tinyerp.co.in-20110225134314-zopq8bwlwmh61glr
2011-02-25 19:13:14 +05:30
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
Francois Degrave e494a992dd [IMP ]added shortcuts to demo user, modified visibility of elements in employee views
bzr revid: fde@openerp.com-20101230170800-drbr5ie19trv0nxj
2010-12-30 18:08:00 +01:00
François Degrave c19999edf8 [IMP+FIX] HR access rights, product margin
bzr revid: fde@openerp.com-20101229081804-ci2v2t9fhtmc1d3d
2010-12-29 09:18:04 +01:00
François Degrave 6fd9d3bb9c [IMP+FIX] HR access rights, menus
bzr revid: fde@openerp.com-20101229073956-oze90c0gwlkk4s9t
2010-12-29 08:39:56 +01:00
François Degrave e678fd472a [IMP] access rights, menus for HR
bzr revid: fde@openerp.com-20101228153417-ps9ql3h4lij87jx8
2010-12-28 16:34:17 +01:00
AMP (OpenERP) 743501fe11 [MOD/IMP] hr_* Usebility Improvement in Icon
bzr revid: amp@tinyerp.com-20101028072340-6oyqm4yx1n3yoe44
2010-10-28 12:53:40 +05:30
Vir (Open ERP) 5b2361fbbd [IMP] hr_contract : Improvemetns in view
bzr revid: vir@tinyerp.com-20101013113154-daqk3yy39k9xpgjw
2010-10-13 17:01:54 +05:30
Fabien Pinckaers e246728695 imp
bzr revid: fp@tinyerp.com-20101012223143-huzvwfo7jtea7hk3
2010-10-13 00:31:43 +02:00
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
aag (OpenERP) 3833852f93 <act_window domain converted to context is done
bzr revid: aag@tinyerp.co.in-20100928131710-vlmxr9qq040kj7bu
2010-09-28 18:47:10 +05:30
Vir (Open ERP) ed78df1178 [MOD] hr_contract : added fields of trial period. hr_timesheet_invoice : added tooltip and fix problem of currency id in view
bzr revid: vir@tinyerp.com-20100914105942-1fiqolelalp08tvs
2010-09-14 16:29:42 +05:30
AMP (OpenERP) 3362c2ea82 [MOD]hr_*: usability improvement in access rights
bzr revid: amp@tinyerp.com-20100911131911-7k4g0r1b4kta30cc
2010-09-11 18:49:11 +05:30
Vir (Open ERP) e24686760b [MOD] hr : employee form view, fields are reset in view
bzr revid: vir@tinyerp.com-20100911063500-5re6klocsa3a1wsg
2010-09-11 12:05:00 +05:30
Vir (Open ERP) bdc41e5fc5 [MOD] hr_contract : small change
bzr revid: vir@tinyerp.com-20100909105028-npz9ibf5zj1g6iei
2010-09-09 16:20:28 +05:30
AMP (OpenERP) 0dbc10bf6c [MOD]hr_* : usability improvement in menuitem
bzr revid: amp@tinyerp.com-20100908090229-v4qvmjkfp00ymn0f
2010-09-08 14:32:29 +05:30
DBR (OpenERP) ce7cecff63 [MOD]hr_contract : usability improvement
bzr revid: dbr@tinyerp.com-20100906101522-tspip11hnazby4ll
2010-09-06 15:45:22 +05:30
DBR (OpenERP) 5ca781f537 [MOD/IMP] hr_contract: Usability Improvement
bzr revid: dbr@tinyerp.com-20100831132859-qcauhvszvui87udx
2010-08-31 18:58:59 +05:30
PSI(OpenERP) 04e5144b2d [IMP] HR modules: Usebility, on employee add contract field (latest)
bzr revid: mra@mra-laptop-20100819093802-9z5a0t6rn4f17i5j
2010-08-19 15:08:02 +05:30
AMP (OpenERP) 6eb86abda3 [MOD] usability improvement in access rights
bzr revid: amp@tinyerp.com-20100723072243-kpex4cdgckhga46d
2010-07-23 12:52:43 +05:30
Mustufa Rangwala c179005fc7 [IMP] Clean hr_* module (Still need to done)
bzr revid: mra@mra-laptop-20100703102152-4ulrrzbkorpd7xei
2010-07-03 15:51:52 +05:30
psi (Open ERP) 18e0728ccb [IMP] hr_*: changes accourding to the Piratepad
bzr revid: psi@tinyerp.co.in-20100630124520-hr4ktw5yocnt9ijy
2010-06-30 18:15:20 +05:30
uco (OpenERP) 2bfffa9e1a [IMP] mrp, purchase, stock, hr, project: Re-organized menus.
bzr revid: uco@tinyerp.com-20100616114359-5l1fa5ht1k59wvlr
2010-06-16 17:13:59 +05:30
Fabien Pinckaers 5eb7a02e07 [FIX] removed action by mistake
bzr revid: fp@tinyerp.com-20100612223323-2gtw8kn6w0gfpz30
2010-06-13 00:33:23 +02:00
Fabien Pinckaers 767f630157 improve
bzr revid: fp@tinyerp.com-20100612184952-xw4b0q40205vte3m
2010-06-12 20:49:52 +02:00
Fabien Pinckaers 85ba0d3d1d [IMP] improve views, reviewed widget=selection
bzr revid: fp@tinyerp.com-20100612174933-pr33o0l3ho2z4dai
2010-06-12 19:49:33 +02:00
Vir (Open ERP) 4ab90ab79f [IMP] hr,hr_attendance,hr_contract,hr_evaluation,idea,marketing_campaign,membership icon are modified to new icons, membership search view improved
bzr revid: vir@tinyerp.com-20100603134400-1zua9zqi6y6ty8ys
2010-06-03 19:14:00 +05:30
mra (Open ERP) e36fb2209f [MERGE] Merge psi branch account: fix company_id error
hr_contract: Added Group By... Contract type in place of Department
hr_timesheet: clean and improve search view(added default user_id)
hr_timesheet_sheet: clean and improve search view(added default user_id)
hr_timesheet_invoice: improve search view(added default user_id)
project: improve search view(added default user_id)

bzr revid: mra@tinyerp.com-20100519133737-j1ycwgzizbv4f4j5
2010-05-19 19:07:37 +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
Rvo (Open ERP) 220d5b2f37 [IMP]: usability of HR
bzr revid: rvo@tinyerp.co.in-20100510125915-dqiyo6eeuygftuhc
2010-05-10 18:29:15 +05:30
mra (Open ERP) 464c80d9d3 [IMP] hr_*: Put related button on employee form => timesheets,contracts,interviews
[REM] hr_*: Remove Sign In / Out by Project, Sign In / Out
wizards from employee form view

bzr revid: mra@tinyerp.com-20100409112244-jg1226mpwbh59n12
2010-04-09 16:52:44 +05:30
Fabien Pinckaers 185277bdff [IMP] improvements in hr modules
bzr revid: fp@tinyerp.com-20100407095457-ufpmz8rrdu7i39cx
2010-04-07 11:54:57 +02:00
mra (Open ERP) c219db4404 [IMP] hr_contract: change the field name working hours per day to working hours because it can be expressed in hours/week on contract object
bzr revid: mra@tinyerp.com-20100308051412-horl6e8viy2haqyo
2010-03-08 10:44:12 +05:30
Fabien Pinckaers 5616417163 merge
bzr revid: fp@tinyerp.com-20100305173956-8yz4wmpyopeny1kt
2010-03-05 18:39:56 +01:00
Fabien Pinckaers 757618c604 [IMP] hr module improvement, better views
bzr revid: fp@tinyerp.com-20100305173619-bil2o952ca21ifk8
2010-03-05 18:36:19 +01:00
Mantavya Gajjar c72753bfa1 [FIX]:fix a bug related to the twise Marital status
complete move to hr module instead of hr_contract

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

bzr revid: mga@tinyerp.com-20100216070246-jq8d9zf6aogz1lt8
2010-02-16 12:32:46 +05:30
Harry (Open ERP) 9e2b2cf239 [MERGE] new menu structure
bzr revid: hmo@tinyerp.com-20100117055734-gyzsham0dpza2dck
2010-01-17 11:27:34 +05:30
RCH(Open ERP) 86644fee8b New Menu Structure for HR and Knowledge Management
bzr revid: vir@tinyerp.com-20100111114835-f05x3w6wl9bb47pa
2010-01-11 17:18:35 +05:30
Fabien Pinckaers 344dd181f3 [IMP] new menus
bzr revid: fp@tinyerp.com-20100109143002-32gkcy67d18v2gd7
2010-01-09 15:30:02 +01:00
HDA (OpenERP) 7d3a5b51ba [Merged] stable and trunk addons
bzr revid: hda@tinyerp.com-20090924104621-7p53erkfs9xa0bev
2009-09-24 16:16:21 +05:30
husen daudi 1b55876e7e removed duplicate field from hr and hr_contract
bzr revid: hda@hda-20090304133236-autbc8j3jlg9vb4g
2009-03-04 19:02:36 +05:30
Stephane Wirtel 606165c849 rename the tag <terp/> by <openerp/>
bzr revid: stephane@tinyerp.com-20080910175600-tutctqg606c9eil4
2008-09-10 19:56:00 +02:00
Fabien Pinckaers 4bb0246a56 New Menus Definitions
bzr revid: fp@tinyerp.com-9fddab2e4b601123b2e476f27bb0bbbd5b470b0d
2008-07-01 15:58:58 +00:00
stw c60cae0a8c reindent all xml files
bzr revid: stw-c7b064849fe1f51bf264dd2de76920ded909d158
2008-06-29 08:26:07 +00:00
stw 1dd5941549 add a name for each action
bzr revid: stw-7bbe07a45306a53ca768b0750c380d1bbe133372
2008-06-18 12:37:28 +00:00
ced fc6378cc05 Remove undefined field
bzr revid: ced-798928bcfeeff6e1a4782c7b008600149ace8b16
2007-09-26 05:17:45 +00:00
Fabien Pinckaers c12fb4f3cb Uppercases in all menus
... long life to VIM ...

bzr revid: fp@tinyerp.com-cc36a1698925a5a2df8a01cc82402cc536b3e109
2007-08-09 07:47:53 +00:00
Fabien Pinckaers 46477e8ebc Base:
Assert record for automated tests (blackbox)
Human Ressources contract management
	Cost of a employee based on his contract if available

bzr revid: fp@tinyerp.com-64ea2b85124217bc54711c8db0b86a6c634f7375
2007-07-06 10:39:36 +00:00
ced ff73e4b834 CLIENT, ALL: use the action name for the tabs name in the client
bzr revid: ced-89a4bc567c0840f20ee9c2a21c3a2136eb40aa7b
2007-05-15 07:42:18 +00:00
ced 34363fa5a7 ALL: fix colspan 3->4 to improve behavior of the client interface
command to run:
	find . -name "*.xml" -exec sed -i -e 's/colspan="3"/colspan="4"/' {} \;

bzr revid: ced-c1ce001eb7b29c33f3cb47576d0884eb3020809f
2007-04-25 06:26:44 +00:00
pinky e0cebcd65b Contracts availabilities
bzr revid: pinky-6503b9a510b0659f7192e7b4d9ae30a2a4b3785e
2007-03-07 18:38:59 +00:00
pinky 337cfa511c New module
bzr revid: pinky-18bde0a42a7ccf5befdb18a4fe02ea8a99cbe4d7
2007-03-07 18:10:55 +00:00