Commit Graph
769 Commits
Author SHA1 Message Date
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
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
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
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
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
Quentin (OpenERP) 9a5464529c [MERGE] lp: 746488
bzr revid: qdp-launchpad@openerp.com-20110420123421-icikmbziprf7hzs1
2011-04-20 14:34:21 +02:00
ksa (Open ERP) e3b787689f [IMP]: Improve ir.actions.todo replace restart=type
bzr revid: ksa@tinyerp.co.in-20110411131719-b5x6i11xvq8gdqjc
2011-04-11 18:47:19 +05:30
ksa (Open ERP) 32ce4e3fae [MERGE]:Merge with trunk-configuration-rework
bzr revid: ksa@tinyerp.co.in-20110411131208-q930q31zpxg9y7fn
2011-04-11 18:42:08 +05:30
Rucha (Open ERP) a899e684ae [MERGE]: Merge work of aag for new proposed changes for field restart (WORK IN PROGRESS)
bzr revid: rpa@tinyerp.com-20110411122500-1vzefrgg6x561uk7
2011-04-11 17:55:00 +05:30
aag (OpenERP) 767f6571dc [IMP]ADDONS:Change Field Restart To Type
bzr revid: aag@tinyerp.co.in-20110408122811-dm029nwtkmjzcgdj
2011-04-08 17:58:11 +05:30
ksa (Open ERP) 2cb987625c [MERGE]:trunk-configuration-rework
bzr revid: ksa@tinyerp.co.in-20110408100907-ch1or4lktbdrnssv
2011-04-08 15:39:07 +05:30
ksa (Open ERP) f00fb439fc [IMP]: Improvement
bzr revid: ksa@tinyerp.co.in-20110407132956-1o67jgwlmahvvi3m
2011-04-07 18:59:56 +05:30
Thibault Francois 1a45ff614d [MERGE] crm improvement
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Rucha (Open ERP) 87a2330abc [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110407061151-x8gzgfqs170drg44
2011-04-07 11:41:51 +05:30
ksa (Open ERP) 5ea5e93f4a [ADD]: config wizard for hr
bzr revid: ksa@tinyerp.co.in-20110407050512-ou6xehe7l1s4eej9
2011-04-07 10:35:12 +05:30
Launchpad Translations on behalf of openerp ffee41cbed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406043928-xqladzrd05q5t19g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407043758-7t6u87d24s7yq2lf
2011-04-07 04:37:58 +00:00
pso (OpenERP) 468f05c209 [FIX] hr: Put groups on HR menu
lp bug: https://launchpad.net/bugs/746488 fixed

bzr revid: pso@tinyerp.com-20110401055351-uor3osh5vz761612
2011-04-01 11:23:51 +05:30
Rucha (Open ERP) 92e0ac7a3a [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110329105649-i4xaexeutqlgm05g
2011-03-29 16:26:49 +05:30
Launchpad Translations on behalf of openerp d8ca559b5d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
aag (OpenERP) 4bab65ad54 [MERGE]: Merge with lp:trunk-configuration-rework
bzr revid: aag@tinyerp.co.in-20110328115414-effjwin4lmjtvtoq
2011-03-28 17:24:14 +05:30
niv-openerp cf07e58016 [MERGE] Other improvements of descriptions in module manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp a898038b47 [MERGE] Merged module screenshots and improvements to module descriptions.
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
Quentin (OpenERP) c7fdae6fc8 [MERGE] merged with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110316125712-w1sqjs1cyqel5ebx
2011-03-16 13:57:12 +01:00
rch-openerp 721d40f606 [ADD]: Images of hr, hr_attendance and hr_contract modules.
bzr revid: rch@tinyerp.com-20110314112013-zwazl3oanlsh7fz5
2011-03-14 16:50:13 +05:30
Quentin (OpenERP) 1548e4af21 [MERGE] cherry picking of revision 4434-4443 of lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements
bzr revid: qdp-launchpad@openerp.com-20110314105835-39g2ajzfhs8cco6q
2011-03-14 11:58:35 +01:00
Quentin (OpenERP) 670141cbf5 [MERGE] cherry picking of revision 4425-4432 of lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements
bzr revid: qdp-launchpad@openerp.com-20110314104431-xxyxcv7mercqqhzt
2011-03-14 11:44:31 +01:00
Quentin (OpenERP) 51fda3b52f [MERGE] cherry picking of revision 4422-4423 of lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements
bzr revid: qdp-launchpad@openerp.com-20110314104327-3n3xfjibl4x0yy2y
2011-03-14 11:43:27 +01:00
Quentin (OpenERP) bc12c091d8 [MERGE] merged the dev branch containing the HR improvements
bzr revid: qdp-launchpad@openerp.com-20110311172952-jqlv6z6kf9x64fr8
2011-03-11 18:29:52 +01:00
Quentin (OpenERP) 4cacb67193 [MERGE] lp:731332
bzr revid: qdp-launchpad@openerp.com-20110311154909-jzqf7l3f4qsezsja
2011-03-11 16:49:09 +01:00
Quentin (OpenERP) 03c8e8b36a [IMP] hr: improved recruitement
bzr revid: qdp-launchpad@openerp.com-20110311134136-jal186xbwpjf4hba
2011-03-11 14:41:36 +01:00
aag (OpenERP) 7cb99c6031 [IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analytic account
bzr revid: aag@tinyerp.co.in-20110311122345-g1ufdl0i4ogzwbe2
2011-03-11 17:53:45 +05:30
Quentin (OpenERP) 73b00ed701 [IMP] hr,hr_holidays: remove extended view on employee category (was conflicting with hr/manager group)
bzr revid: qdp-launchpad@openerp.com-20110311113204-kxmskgilat5vlk3f
2011-03-11 12:32:04 +01:00
Rucha (Open ERP) 9bc35e9192 [IMP]: hr: Added on change department in employee form to set manager
bzr revid: rpa@tinyerp.com-20110311105449-0h02fpefhrk6kqhu
2011-03-11 16:24:49 +05:30
Rucha (Open ERP) d64d4b0d83 [MERGE]: Merge with trunk addons
bzr revid: rpa@tinyerp.com-20110311084452-hlkwjehf0tzkbdoh
2011-03-11 14:14:52 +05:30
Rucha (Open ERP) 4b4671f5e0 [IMP]: hr: All users must have "Employees" in their shortcuts
bzr revid: rpa@tinyerp.com-20110310131827-xbm0r2edcivfhr61
2011-03-10 18:48:27 +05:30
Rucha (Open ERP) 526210fc8d [IMP]: hr: Manager should not be a related to department anymore. Converted to many2one field
bzr revid: rpa@tinyerp.com-20110310131057-jrh5wegf3mclyk18
2011-03-10 18:40:57 +05:30
Rucha (Open ERP) 9777a599c6 [IMP]: hr: "Employee Hierarchy" > "Subordonate Hierarchy"
bzr revid: rpa@tinyerp.com-20110310130704-i1tb4qzjyinngq1t
2011-03-10 18:37:04 +05:30
Rucha (Open ERP) d6f5541202 [IMP]: hr, hr_holidays: Minor improvements
bzr revid: rpa@tinyerp.com-20110310130454-495pmz0tnkp6w0tr
2011-03-10 18:34:54 +05:30
Quentin (OpenERP) 506b968b02 [MERGE] lp:718741
bzr revid: qdp-launchpad@openerp.com-20110310124914-ueig5xmxmwkq4r8m
2011-03-10 13:49:14 +01:00
ARA (OpenERP) abe22805a9 [FIX] hr: [6.0.1] HR-category: many2many link defined incorrectly
lp bug: https://launchpad.net/bugs/731332 fixed

bzr revid: ara@tinyerp.com-20110310060726-ol6ie4jrouzviinj
2011-03-10 11:37:26 +05:30
Els Van Vossel a69c473f52 [IMP] Changed all module categories, limited number of categories
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
Rucha (Open ERP) 54c9ecdeab [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-rework-addons-commited-aag
bzr revid: rpa@tinyerp.com-20110308133722-9k8bksvumo7yoasn
2011-03-08 19:07:22 +05:30
Quentin (OpenERP) 5a2123a9a0 [MERGE] merged the dev3 branch for the last time :-). Contains few bugfixes and refactoring of account
bzr revid: qdp-launchpad@openerp.com-20110303155944-kzs2fjuxewwmnr7q
2011-03-03 16:59:44 +01:00
Mustufa Rangwala 43309dab99 [MERGE] merge from trunk
bzr revid: mra@mra-laptop-20110228105505-tz775fwdj8b0p94m
bzr revid: mra@mra-laptop-20110301044544-qc33bp07p9l8io4k
bzr revid: mra@mra-laptop-20110302102551-y5i60g2giyjare0c
bzr revid: mra@mra-laptop-20110303052230-nkaffu9gio1qqz90
2011-03-03 10:52:30 +05:30
Launchpad Translations on behalf of openerp d1683be192 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110303043944-epd83p1wfzk0zt2b
2011-03-03 04:39:44 +00:00
ARA (OpenERP) 36710d30c8 [FIX] hr_payroll_account: Payslip approval crashes without notification if Property accounts are not configured
bzr revid: ara@tinyerp.com-20110302104441-ka6xesr5qiyjmzpd
2011-03-02 16:14:41 +05:30