Commit Graph

49 Commits

Author SHA1 Message Date
Rucha (Open ERP) 5fd7ad04c1 [REM]: hr: Removed duplicate employee and department from demo
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
Rucha (Open ERP) 2347f44ab2 [FIX,IMP]: hr: Fixes and improvements for employee-user relation
bzr revid: rpa@tinyerp.com-20120808101305-dsqn337ngmcysm4z
2012-08-08 15:43:05 +05:30
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Thibault Delavallée e542c37418 [REF] hr.employee: from photo to image. Updated demo data.
bzr revid: tde@openerp.com-20120627144750-5vxezzvvo185nwyk
2012-06-27 16:47:50 +02:00
Thibault Delavallée a44f9ea340 [IMP] res.users demo data: avatar_big -> image.
bzr revid: tde@openerp.com-20120627134929-mgiep4ds6t37mqoc
2012-06-27 15:49:29 +02:00
Pinakin Nayi (OpenERP) fe55d53961 [IMP] hr_server_log
bzr revid: pna@tinyerp.com-20120612092717-pqyaxxyvib1c0zqh
2012-06-12 14:57:17 +05:30
Fabien Pinckaers 1514122cac [IMP] avatars
bzr revid: fp@tinyerp.com-20120523171635-opejgr38l0b95nge
2012-05-23 19:16:35 +02:00
Fabien Pinckaers 6c2240c4c1 [IMP] avatar for edmo users
bzr revid: fp@tinyerp.com-20120523154339-ow7355e5k0p1wzk1
2012-05-23 17:43:39 +02:00
Thibault Delavallée 67613957e4 [MERGE] Merged OpenChatter part 1/2. OpenChatter, part 1/2.
This revision adds a social messaging system inside OpenERP, that will be used by addons to display notifications (such as status changes), user comments, and emails. All message types are managed in a unified system. Social aspects are also enforced, by an easy invite system based on share, and a subscription mechanism allowing to follow messages post on records users want to follow. res.logs are removed from OpenERP and replaced by OpenChatter.

This revision adds theaddons-side of OpenChatter part 1/22. Main addons are updated in order to use the new feature: notifications on state/stage change, management of subscriptions. It also includes addons-side update related to the need_action mechanism, by defining the states in which user_ids are sent to the need_action engine. Server- and web-sides of need_action have already been merged in previous revisions.

bzr revid: tde@openerp.com-20120406123732-6fl2uzxzqr864jc4
2012-04-06 14:37:32 +02:00
Thibault Delavallée 46e744c553 [MERGE] Merged with branch holding user image
bzr revid: tde@openerp.com-20120327073412-ok0di6zv12w7wgyy
2012-03-27 09:34:12 +02:00
Thibault Delavallée 0bcf800119 [IMP] Renamed photo_stored->photo_big, which makes more sens. Updated demo data.
bzr revid: tde@openerp.com-20120323121438-upcgpsvy809hm2n5
2012-03-23 13:14:38 +01:00
Thibault Delavallée 8e14b6a706 [FIX] hr: updated demo data for employee_fp referencing itself as manager
bzr revid: tde@openerp.com-20120216134319-8r8ty5h3wbnrkd35
2012-02-16 14:43:19 +01:00
Thibault Delavallée fcbd3d26dc [IMP] hr: added parent_id in demo data for employees, allowing to test the need_action_user_id feature with hr.holidays with demo data
bzr revid: tde@openerp.com-20120216133444-byv4m8vkh8g68uoe
2012-02-16 14:34:44 +01:00
Raphael Collet c1585141ea [FIX] hr: add employee categories
bzr revid: rco@openerp.com-20111222161622-gija5yzvi9xio9dc
2011-12-22 17:16:22 +01:00
Raphael Collet 2c4265133b [IMP] hr: use better xml ids in demo data
bzr revid: rco@openerp.com-20111222131638-wj5qmddust70ghu3
2011-12-22 14:16:38 +01:00
Minh Tran bb88d4cf52 Added demo data with pictures
bzr revid: mit@openerp.com-20111215144536-cdqwdng68st3mmlp
2011-12-15 15:45:36 +01:00
Hardik Ansodariy (OpenERP) 108b74d8a3 [imp] Assigned manager to employee in demo data and added department hierarchy
bzr revid: han@tinyerp.com-20111109065243-oaxxvibndde5ihj5
2011-11-09 12:22:43 +05:30
Hardik Ansodariy (OpenERP) 3153e32474 [imp] improved demo data of hr department
bzr revid: han@tinyerp.com-20111108132750-ah8u6b9th2gx5wb7
2011-11-08 18:57:50 +05:30
Antony Lesuisse 17e2f04cb7 [MERGE] trunk-usability rco
bzr revid: al@openerp.com-20110806002104-xpc258vhv54j5w53
2011-08-06 02:21:04 +02:00
Hardik Ansodariy (OpenERP) 35f247bc7a [IMP]: inserted demo data in several objects
bzr revid: han@tinyerp.com-20110722113147-6mg9cjmkasdpn8ma
2011-07-22 17:01:47 +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
Harry (OpenERP) 764b9f251e [FIX] correct regression on intalling module without demo data
bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
2010-11-14 19:18:21 +05:30
uco (Open ERP) a5172a0599 [ADD] hr,resource: Added User ID to match the required criteria in Resources.
bzr revid: uco@tinyerp.com-20100914043754-g476zf1zib5xkvaz
2010-09-14 10:07:54 +05:30
qdp-launchpad@tinyerp.com def6d45e44 [IMP] hr: improved demo data and replaced parent_id field on hr.employee with a fields.related
bzr revid: qdp-launchpad@tinyerp.com-20100809162645-dxq60m4ldlc8g75v
2010-08-09 18:26:45 +02:00
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
Rvo (Open ERP) 80fc9c09d2 [IMP]:removed hr dependency from project,mrp and included resource dependency in mrp and project_long_term
bzr revid: rvo@tinyerp.co.in-20100303065252-smg21yms5d9qzx7f
2010-03-03 12:22:52 +05:30
Rvo (Open ERP) 09c358d92d [IMP]:changes in interval_get and minimum_interval_get,added required fields in resource.resource
bzr revid: rvo@tinyerp.co.in-20100219102624-22psr47e8xk9beo5
2010-02-19 15:56:24 +05:30
Rvo (Open ERP) de52c987b1 Project Improvement
bzr revid: rvo@tinyerp.co.in-20100112053248-fkxz9h06ljzgt65q
2010-01-12 11:02:48 +05:30
Fabien Pinckaers 900b647f21 improvement
bzr revid: fp@tinyerp.com-20081027214417-smiqxiuq0z7boolt
2008-10-27 22:44:17 +01:00
Fabien Pinckaers d54616572e uppercase_typo
bzr revid: fp@tinyerp.com-20081027174828-vw7o6kdlw3hx8xw9
2008-10-27 18:48:28 +01:00
Priyesh 54f43dd46e modified files
bzr revid: solanki.priyesh@gmail.com-20080916142547-sejpe7rcv3wg19gi
2008-09-16 19:55:47 +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 dc12017714 Merged C2C Security
bzr revid: fp@tinyerp.com-20080902214721-vxglyhvtplocaxv3
2008-09-02 23:47:21 +02:00
Jean-Baptiste Aubort 21037c3be3 Big MESS (UNCOMMIT PLEASE)
bzr revid: jean-baptiste.aubort@camptocamp.com-20080829135327-ni4y8r8j2kjiqsiw
2008-08-29 15:53:27 +02:00
Jean-Baptiste Aubort 5fc89eae6b merge with #1527 trunk
bzr revid: jean-baptiste.aubort@camptocamp.com-20080829085204-0fi6v6wfnescqy3a
2008-08-29 10:52:04 +02:00
Jean-Baptiste Aubort 43122ed708 * Security files to CSV
* Some bugfixes

bzr revid: jean-baptiste.aubort@camptocamp.com-20080829080727-z8x95pg4ai5byru4
2008-08-29 10:07:27 +02:00
Fabien Pinckaers ca24f48de3 Modifs
bzr revid: fp@tinyerp.com-20080828230810-nt2h294l3w6ox3iy
2008-08-29 01:08:10 +02:00
Fabien Pinckaers 70c2df4cfa modifs
bzr revid: fp@tinyerp.com-20080827205310-io05rfavmpyxk6uc
2008-08-27 22:53:10 +02:00
Fabien Pinckaers 55fef6617c Modifs
bzr revid: fp@tinyerp.com-8a1a0ff662a0ea707e0e833504c00cece8518ebb
2008-07-02 05:07:30 +00:00
Fabien Pinckaers fb51586de8 Bugfix
bzr revid: fp@tinyerp.com-5e8a25684a9fa8c06f84e80f07e6109a9aeef62f
2008-07-01 20:57:47 +00: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
Mantavya Gajjar cdcf248dfa remove HR group as already HR Manager comes from the security.xml
bzr revid: mga@tinyerp.com-d0e857b61ca2e2ec8fcb01a847ef00c9323ea2b5
2008-06-10 04:00:14 +00:00
qdp d564572886 Added an id on the HR group for being referenced.
bzr revid: qdp-862e81af49c817dd06258226a3cbe11fd77c3cd5
2008-02-20 15:48:00 +00:00
ced 9e05601a65 Add some missing xml ids
bzr revid: ced-31734f214a18b60571355c9ebb4d18ba444d54c9
2007-10-24 06:14:12 +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 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
pinky a83dce15e0 New trunk
bzr revid: pinky-dedd7f8a42bd4557112a0513082691b8590ad6cc
2006-12-07 13:41:40 +00:00