Commit Graph
832 Commits
Author SHA1 Message Date
Raphael Collet f91bdea514 [IMP] fix tab label 'Employees' in job position form
bzr revid: rco@openerp.com-20110722134458-ejsnvddb2cvjgnbi
2011-07-22 15:44:58 +02:00
Raphael Collet 3cb016f7e5 [IMP] hr: employee form, fix behavior of 'My Timesheet', enable employee to confirm timesheet
bzr revid: rco@openerp.com-20110722100841-rog4jmdbjmhqb29f
2011-07-22 12:08:41 +02:00
Amit Parmar (OpenERP) b2dd6a9f9b [IMP] renaming tab employee to employees
bzr revid: aar@tinyerp.com-20110721065017-rec099aqpndstfrq
2011-07-21 12:20:17 +05:30
Raphael Collet 81a1eb18a1 [MERGE] from trunk
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
Launchpad Translations on behalf of openerp 78491dfe17 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110715045140-vrbatydl7fa97wok
bzr revid: launchpad_translations_on_behalf_of_openerp-20110716045705-9z1giql3prjl7zdd
2011-07-16 04:57:05 +00: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
Hardik Ansodariy (OpenERP) 2296b52568 [IMP]:improved hr module
bzr revid: han@tinyerp.com-20110711112329-72h3rbgs0n06pzs1
2011-07-11 16:53:29 +05:30
Antony Lesuisse d8eba087d2 [FIX] base_setup fix dependencies fixes runbot tests
bzr revid: al@openerp.com-20110711110958-q75h3jpw33z874jo
2011-07-11 13:09:58 +02:00
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Raphael Collet adafbc707a [MERGE] from trunk
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Raphael Collet 8ede63ad9d [IMP] in user form, move field 'department' next to 'sales team' and 'project'
bzr revid: rco@openerp.com-20110707121427-cuewsxuhlxhhe62w
2011-07-07 14:14:27 +02:00
Quentin (OpenERP) 9c9516d21c [MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20110706145644-merwy0setzzb8c9w
2011-07-06 16:56:44 +02:00
Hardik Ansodariy (OpenERP) 1f5aa0643f [IMP]: module is defined by its complexity
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Raphael Collet eed7ef1307 [MERGE] from trunk
bzr revid: rco@openerp.com-20110704135951-x4d5sk98ro3hwqsu
2011-07-04 15:59:51 +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
Quentin (OpenERP) 664ba7bba3 [MERGE] merge with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
Raphael Collet 72ee5358a4 [MERGE] from trunk
bzr revid: rco@openerp.com-20110624141323-iq3pss68lf07lvzl
2011-06-24 16:13:23 +02:00
Raphael Collet 54be2c8609 [FIX] prevent automatic shortcut creation for portal users
bzr revid: rco@openerp.com-20110624085018-e8u6ykih3tdcg16q
2011-06-24 10:50:18 +02:00
Launchpad Translations on behalf of openerp 227d5cd655 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110623045640-fkofiyjqqzf6hj6m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110624050011-am2yj6hmjdkpvdi2
2011-06-24 05:00:11 +00:00
Rucha (Open ERP) fdc3ca74bb [REM]: hr: removed extra spaces for cleaning unwanted changes in merge proposal
bzr revid: rpa@tinyerp.com-20110617054748-c72mcpbhjfjg6ngi
2011-06-17 11:17:48 +05:30
mayur maheshwari (Open ERP) c16609ebd3 [IMP]hr:move a config wizard in hr_installer.xml
bzr revid: mma@tinyerp.com-20110616125815-ehtuxh57zhgqscqh
2011-06-16 18:28:15 +05:30
mma 3dde2f8036 [IMP] hr: create your employees wizard
bzr revid: qdp-launchpad@openerp.com-20110615094515-h35tg9mnktzobnmx
2011-06-15 11:45:15 +02:00
Quentin (OpenERP) 91aa8517c1 [MERGE] main config wizard displays now the sections in the right order
bzr revid: qdp-launchpad@openerp.com-20110610103107-fg10l4l41zwg38dq
2011-06-10 12:31:07 +02:00
Quentin (OpenERP) 837f2a4a69 [MERGE] merged aag branch with hr_holidays usability improvements
bzr revid: qdp-launchpad@openerp.com-20110608144616-k80dn77ii0f3dlj5
2011-06-08 16:46:16 +02:00
aag (OpenERP) 760b5f1e7a [IMP]Allmodule:set sequnce for merging wizards
bzr revid: aag@tinyerp.co.in-20110608142149-6opzcib2in0dxumx
2011-06-08 19:51:49 +05:30
aag (OpenERP) 8c789a2893 [IMP]hr: add cat HR Management-5
bzr revid: aag@tinyerp.co.in-20110603130441-meayn8g3d9bc18mf
2011-06-03 18:34:41 +05:30
Quentin (OpenERP) b5bb00cdd3 [FIX] hr: display the expected number of employees and number of employees when grouping
bzr revid: qdp-launchpad@openerp.com-20110531140258-p30r6fq5wuyl8j7h
2011-05-31 16:02:58 +02:00
Quentin (OpenERP) f1658260e4 [MERGE] bugfix for assert error: Human Resources/Configuration/Human Resources/Employees/Categories of Employee/Categories structure
while open the employee view form above menu and try to filter results, i am getting this assertion error.

bzr revid: qdp-launchpad@openerp.com-20110530165804-h46rxi92qxzljr8w
2011-05-30 18:58:04 +02:00
aag (OpenERP) 9d969a1564 [IMP]hr,hr_holidays: Rename saprator "position" into "job information and inherit remaining legal leaves field to hr.employee form
bzr revid: aag@tinyerp.co.in-20110530121307-ykwl0qfjf9k5ihdj
2011-05-30 17:43:07 +05:30
Launchpad Translations on behalf of openerp d08352c14e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110526043628-iggxpe3dtuzm615i
bzr revid: launchpad_translations_on_behalf_of_openerp-20110527044622-w39rbfftxxgek3f8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110529043625-9tpnzf4lz10ypg5f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110530045915-u5a8nm8u0h54ujyv
2011-05-30 04:59:15 +00:00
Tejas (OpenERP) 4a71ddbb1b [usability] in user form : department, sales team and project should be on the same level.
bzr revid: tta@openerp.com-20110524091358-0dwzrnr8jc7zwjbs
2011-05-24 14:43:58 +05:30
Launchpad Translations on behalf of openerp e7bb8477dc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050137-14v8hzg4qgfwpf2m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110520043441-u9e1vje80f6he7xj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050229-ayodl6xmd20k7wd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20110522044744-l0biw9ydemk013yv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110523043818-uc1feowa93sym0df
2011-05-23 04:38:18 +00:00
aag (OpenERP) 24418f2067 [IMP]HR : Rename Details into Features in Config wiz and move Install Specific Industry applications to the bottom
bzr revid: aag@tinyerp.co.in-20110519045117-zedb5szoc9bdzgsg
2011-05-19 10:21:17 +05:30
psi (Open ERP) 3eb0031cae [IMP] improve searh view of hr.employee add filter on categories
bzr revid: psi@tinyerp.co.in-20110510133227-fzbbptd2tje5suf8
2011-05-10 19:02:27 +05:30
Launchpad Translations on behalf of openerp 826bbaa0a3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110505044018-zo2laq7vbyynd7p7
2011-05-05 04:40:18 +00:00
psi (Open ERP) 7177961073 [FIX] set priority of view of hr.employee list views
bzr revid: psi@tinyerp.co.in-20110504100910-7dgkl0r7d65m6nn4
2011-05-04 15:39:10 +05:30
psi (Open ERP) 7d52cfed37 [FIX] set priority of view of hr.employee list views
bzr revid: psi@tinyerp.co.in-20110504093457-rdb8w8l0p40wks07
2011-05-04 15:04:57 +05:30
aag (OpenERP) 854c74df33 [IMP]HR :Remove attrs from HR Management Details
bzr revid: aag@tinyerp.co.in-20110504065957-o713y9d13mp5po2y
2011-05-04 12:29:57 +05:30
psi (Open ERP) a01a3da44d [FIX] hr: small fix for the search view
bzr revid: psi@tinyerp.co.in-20110503130543-iw281vgnrk0aer4m
2011-05-03 18:35:43 +05:30
Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk.

bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
aag (OpenERP) 37f8268295 [IMP]HR :Remove HR Application Configuration Wiz and inherit it to INstall Appl wiz
bzr revid: aag@tinyerp.co.in-20110502092055-8m1xxpde6x7b5pat
2011-05-02 14:50:55 +05:30
Launchpad Translations on behalf of openerp 4eb213855e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430060855-5u495d7r5747wf64
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501060400-go1qlvkfuyg5tk1c
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502060719-c9oa62lpvkf87sl3
2011-05-02 06:07:19 +00:00
Launchpad Translations on behalf of openerp d553615695 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Launchpad Translations on behalf of openerp 7464803d7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426060409-o8efsi8e0x8qdgpj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110427054644-lhqa0wkovwihv339
bzr revid: launchpad_translations_on_behalf_of_openerp-20110428054929-cx8ppeco060z80wm
2011-04-28 05:49:29 +00:00
Rucha (Open ERP) 1d5fa6ca4c [IMP]: *: Reviewed config wizards of all modules and changed type + state in order to follow the behaviour described below:
* After a fresh installation of a DB if we dont select and application to install nothing will come
* If I select HR module first time, this module will be installed and all special wizards of this module should be appeared
* If I select HR module(its installed) again from application list, all special wizards of this module should be set as todo in order to display when clicking next
* For any other wizards we have to go to list of config wizards and run them manually (for web client these are supposed to be there in config panel)

bzr revid: rpa@tinyerp.com-20110427133518-52mawayc3rgoyx9h
2011-04-27 19:05:18 +05:30
Rucha (Open ERP) b6428f5b9d [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110415092039-94d5dn2qiq388m7b
bzr revid: rpa@tinyerp.com-20110426064148-nqu2870kk5y59fym
bzr revid: rpa@tinyerp.com-20110427044613-zx55jv7o3t209meb
2011-04-27 10:16:13 +05:30
ARA (OpenERP) d866edf0ae [FIX] hr: Removing Administrator employee record causes future updates of hr module to fail
lp bug: https://launchpad.net/bugs/769632 fixed

bzr revid: ara@tinyerp.com-20110426112755-2n13xwebtlx21wun
2011-04-26 16:57:55 +05:30
Quentin (OpenERP) 9a5464529c [MERGE] lp: 746488
bzr revid: qdp-launchpad@openerp.com-20110420123421-icikmbziprf7hzs1
2011-04-20 14:34:21 +02:00
Launchpad Translations on behalf of openerp 45d4391258 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110418062630-eth2g6msxzxkqvjw
2011-04-18 06:26:30 +00:00
Tejas (OpenERP) 2afc6025ad FIX : Unwanted address_ids removed
bzr revid: tta@openerp.com-20110415105141-eq2lt4akpgr3dwi3
2011-04-15 16:21:41 +05:30