Commit Graph

77 Commits

Author SHA1 Message Date
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +02:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Stephane Wirtel bea411bb98 [IMP] Backport one feature from website: this feature allows to specify a file
path on the field tag fetching the right file instead of using the base64
encoded file in the field.

<field name="image" type="base64" file="base/static/img/main_partner-image.png" />

bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Fabien Pinckaers 43af25742e [IMP] some fixes in HR: #employees -> integer not float, forecasted employees is fixed and 'in recruitment' is computed so that it is still correct after doing a new recruitment
bzr revid: fp@openerp.com-20131111203209-cpoqpwsvepkl1elx
2013-11-11 21:32:09 +01:00
Thibault Delavallée 9f0b4bc8c4 [CLEAN] website_hr_recruitment: cleaned indentation in demo file and manifest
Please check your indentation before committing NEW files... it introduces false commits
only to re-indent the content. This should have been done before merging into this branch.

Also cleaned manifest. No need to add dependecies towards already-dependent modules.

bzr revid: tde@openerp.com-20131003113152-667phpsjfxdj7zod
2013-10-03 13:31:52 +02:00
bth-openerp 4eb30c8485 [IMP]Added demo data for CEO.
bzr revid: bth@tinyerp.com-20130926113726-xj0h1s735zkdmh91
2013-09-26 17:07:26 +05:30
bth-openerp 78101abec8 [IMP]Add demo data.
bzr revid: bth@tinyerp.com-20130924124809-r83vfpz47g2vkmlq
2013-09-24 18:18:09 +05:30
bth-openerp 33d4043db7 [IMP]Improved pager and demo data.
bzr revid: bth@tinyerp.com-20130920133436-chpevvov0ibsufgc
2013-09-20 19:04:36 +05:30
bth-openerp beaf87c631 [IMP]Added pager with 5 records, in apply form set alignment,editable description and requirements, lorem ipsum added in job position records for description and requirements field.
bzr revid: bth@tinyerp.com-20130919121003-su51cmrlwwjtrd9l
2013-09-19 17:40:03 +05:30
Mansi Kariya (OpenERP Trainee) 55024350df [MERGE] Merged with main branch
bzr revid: mansi.mk.179@gmail.com-20130822114606-0wi2fnxc7j4hfdwj
2013-08-22 17:16:06 +05:30
Purnendu Singh (OpenERP) e3d3eab8e3 [IMP] hr: update image and name of employee luigi
bzr revid: psi@tinyerp.com-20130618062059-6jmlwqhhepfcnwb1
2013-06-18 11:50:59 +05:30
Mansi Kariya (OpenERP Trainee) 5fb1b15da7 [IMP]Images changed of employees
bzr revid: mansi.mk.179@gmail.com-20130613120837-joe9jnpc1qqhgzqr
2013-06-13 17:38:37 +05:30
Mansi Kariya (OpenERP Trainee) 6fb16d5b08 [IMP] Improved indentation
bzr revid: mansi.mk.179@gmail.com-20130612131831-bty86emqq6u21pzg
2013-06-12 18:48:31 +05:30
Mansi Kariya (OpenERP Trainee) 5ea4290898 [IMP] Changed the image of employee
bzr revid: mansi.mk.179@gmail.com-20130612125207-lo6bd884jziul05r
2013-06-12 18:22:07 +05:30
Mansi Kariya (OpenERP Trainee) a6b1a44aea [IMP] Changed the images of employees
bzr revid: mansi.mk.179@gmail.com-20130612123914-nqtf6q6l9z5pirjq
2013-06-12 18:09:14 +05:30
Paramjit Singh Sahota 60163ea60f [IMP]Changed email address according to the names.
bzr revid: psa@tinyerp.com-20130527072334-mf6wkd1k43717smj
2013-05-27 12:53:34 +05:30
Paramjit Singh Sahota 13132d98df [IMP]Renamed the employee name which could lead to copyright issues.
bzr revid: psa@tinyerp.com-20130507102904-00cw50s3kfj508fq
2013-05-07 15:59:04 +05:30
Thibault Delavallée 4da68cbc22 [FORWARD] Forward port of addons 7.0 until revision 9008
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Ajay Chauhan (OpenERP) 83d85ae1ec [IMP] added & modified employee demo data in hr
bzr revid: cha@tinyerp.com-20130325064332-g1dvoz8lfkt831w1
2013-03-25 12:13:32 +05:30
Tejas Tank e333fab181 [IMP] project_timesheet and hr, Updated employee name and emails.
bzr revid: tta@openerp.com-20130312103011-6oyvqjykks36u1z4
2013-03-12 16:00:11 +05:30
Tejas Tank f933f27d51 [IMP] hr: Name of employee and user should not match to our employee/user at OpenERP (demo data).
bzr revid: tta@openerp.com-20130307124608-335lxdzq5gs42vaz
2013-03-07 18:16:08 +05:30
Fabien Pinckaers ce2f169c31 [IMP] more pro photos for employees
bzr revid: fp@tinyerp.com-20130301084720-maiofpj07982iwff
2013-03-01 09:47:20 +01:00
Ajay Chauhan (OpenERP) 860dcefd63 made admin & qdp user's image as res_user
bzr revid: cha@tinyerp.com-20130225102540-l4d4q0adz38kmqpp
2013-02-25 15:55:40 +05:30
Ajay Chauhan (OpenERP) 71ebeae6af [IMP] added employee demo data & update photos
bzr revid: cha@tinyerp.com-20130222132807-iu1qsrlbvm7aj9nx
2013-02-22 18:58:07 +05:30
Fabien Meghazi d61507a799 [IMP] adaptation to hr demo data
bzr revid: fme@openerp.com-20121121120141-zxj96k7ch8j2xqk7
2012-11-21 13:01:41 +01:00
niv-openerp 3a77bb03f7 [IMP] adaptation to hr demo data
bzr revid: nicolas.vanhoren@openerp.com-20121001140157-rodaunsr1znoigai
2012-10-01 16:01:57 +02:00
Cecile Tonglet 67da3486c7 [IMP] Remove demo users
bzr revid: cto@openerp.com-20120831163350-gfi23hw34ltw7v5o
2012-08-31 18:33:50 +02:00
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