Commit Graph

85 Commits

Author SHA1 Message Date
Quentin (OpenERP) c9ef276770 [REF] search views: removed filter_domain if only one element was inside + made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
2012-06-22 12:29:59 +02:00
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
Stephane Wirtel 9ed4ca5dca [MERGE] lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp
bzr revid: stw@openerp.com-20120618085532-coxsmpot2dz0er1m
2012-06-18 10:55:32 +02:00
Purnendu Singh (OpenERP) 4395463c57 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120618070239-h6zjmw4hvn3oq543
2012-06-18 12:32:39 +05:30
Purnendu Singh (OpenERP) 2663cbca6e [MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
2012-06-15 18:27:50 +05:30
Ajay Chauhan (OpenERP) 6db119b7d8 [IMP]hr_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
2012-06-13 18:11:57 +05:30
Jalpesh Patel (OpenERP) 478946c86d [IMP]hr:improve page sheet
bzr revid: pja@tinyerp.com-20120613123644-0na4ddmkjvwpz26m
2012-06-13 18:06:44 +05:30
Sbh (Openerp) 234084df87 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120612105345-d10lp54bywb7y7oz
2012-06-12 16:23:45 +05:30
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Kuldeep Joshi (OpenERP) 7496ae5bf0 [IMP] set no one group
bzr revid: kjo@tinyerp.com-20120530101238-atvcsna2vc5jwad9
2012-05-30 15:42:38 +05:30
Jagdish Panchal (Open ERP) 8dc623fb21 [IMP] HR: change sequence of menus and apply group_no_one
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
Jagdish Panchal (Open ERP) 9ab663db09 [IMP] HR: apply group_no_one on menus Categories structure,Job Positions, Contract Types,Attendance Reasons,Stages, Degrees, Sources of Applicants,Salary Structures Hierarchy, Salary Rule Categories, Salary Rule Categories Hierarchy, Salary Rules
bzr revid: jap@tinyerp.com-20120316104313-f3f7234wi8yg98zb
2012-03-16 16:13:13 +05:30
Stephane Wirtel 59aaea47dc [FIX] hr_contract: fix the layout of the hr_contract
bzr revid: stw@openerp.com-20111103145350-6tvy5lvxvx2uee6a
2011-11-03 15:53:50 +01:00
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Quentin (OpenERP) 9ab8acb858 [IMP] hr_contract: added names on page and group of contract view, for xpath
bzr revid: qdp-launchpad@openerp.com-20110914142343-3y2fkxlz1de6iwqj
2011-09-14 16:23:43 +02:00
Quentin (OpenERP) 69b13f877c [IMP] hr_contract: completly removed passport field as it was already present in hr.employee
bzr revid: qdp-launchpad@openerp.com-20110711215710-iqfhdjer7g1tmyml
2011-07-11 23:57:10 +02:00
Quentin (OpenERP) e641b54dac [FIX] hr_contract: passport into char instead of m2o
bzr revid: qdp-launchpad@openerp.com-20110711214754-qafeimh8ksmcp2e4
2011-07-11 23:47:54 +02:00
Quentin (OpenERP) 8d29e89f44 [IMP] hr_contract: changed passport into char field and removed useless object
bzr revid: qdp-launchpad@openerp.com-20110711170401-q71lycboq23izgnv
2011-07-11 19:04:01 +02:00
Quentin (OpenERP) 5ec533eb67 [MERGE] merged main trunk addons branch
bzr revid: qdp-launchpad@openerp.com-20110711163839-v1bdt337kds3072n
2011-07-11 18:38:39 +02:00
Quentin (OpenERP) cc5639bbac [IMP] usaiblity improvements
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
2011-07-11 18:05:49 +02:00
ARA (OpenERP) 8b3506a91b [FIX] hr_contract: improve string
bzr revid: ara@tinyerp.com-20110523132951-drsa3l09vqftqp4r
2011-05-23 18:59:51 +05:30
ARA (OpenERP) 78a881cd07 [FIX] hr_contract: Not possible to define the working schedule defined on a contract from the HR menu
lp bug: https://launchpad.net/bugs/782163 fixed

bzr revid: ara@tinyerp.com-20110517090228-hmqjdrp9q03ru652
2011-05-17 14:32:28 +05:30
Anup (OpenERP) 9f84f223db [FIX] hr_contract : Notes Separator added which describes the use of the ntoes field in the Advantages Section
bzr revid: ach@tinyerp.com-20110419102703-zjsp7i24hbjjwi35
2011-04-19 15:57:03 +05:30
Quentin (OpenERP) 546fb69c7c [REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
bzr revid: qdp-launchpad@openerp.com-20110406131149-i1135jaom7vhny8z
2011-04-06 15:11:49 +02:00
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