Sanjay Gohel (Open ERP)
06a9cf6e1c
[IMP]remove unnecessary tooltip
...
bzr revid: sgo@tinyerp.com-20121120113308-i3ibj30m17ginea4
2012-11-20 17:03:08 +05:30
Khushboo Bhatt (Open ERP)
a56728dbc7
[Add]hr_holidays:improved code of subtype
...
bzr revid: kbh@tinyerp.com-20121120071911-z6saaldgglcr1bz2
2012-11-20 12:49:11 +05:30
Khushboo Bhatt (Open ERP)
4f14cb1dae
[Add]hr_holidays:subtype added for leaves
...
bzr revid: kbh@tinyerp.com-20121120063939-nn4bkjdpagt2uhit
2012-11-20 12:09:39 +05:30
Nehal Panchal (OpenERP)
4151a1a438
[FIX]hr_holiday: Fixed the encoding issue of Leave Type which is in different language than English
...
bzr revid: mma@tinyerp.com-20121120061935-e3nrlmoy48cpzcvf
2012-11-20 11:49:35 +05:30
Tejas Tank
797bdcf4c1
Corrected action name 'Allocation Requests'.
...
bzr revid: tta@openerp.com-20121119111035-hjwjb0fwmvf0vxpc
2012-11-19 16:40:35 +05:30
Tejas Tank
1dc1a098d7
Corrected action name 'Leave requests'.
...
bzr revid: tta@openerp.com-20121119103812-d4uejy3xwylssxlr
2012-11-19 16:08:12 +05:30
Vijaykumar Baladaniya
097d4778e1
[IMP] Improve hr leaves.
...
bzr revid: vba@tinyerp.com-20121119092053-u8l4ofl6ndegumsb
2012-11-19 14:50:53 +05:30
Bharat Devnani (OpenERP)
6250b94faf
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20121112115222-chcgfvhm2cljpybn
bzr revid: bde@tinyerp.com-20121119091444-xpdvczqzrmk6nk5b
2012-11-19 14:44:44 +05:30
Vijaykumar Baladaniya
b9e79b21c9
[IMP] Update menu name and remove Human Resources menu.
...
bzr revid: vba@tinyerp.com-20121119054246-16gvypp9hp4e8mhs
2012-11-19 11:12:46 +05:30
Atul Patel (OpenERP)
3f0b7feb21
[FIX]: Add date_From group by
...
bzr revid: atp@tinyerp.com-20121116065005-uecsl54sfbilp4o7
2012-11-16 12:20:05 +05:30
Atul Patel (OpenERP)
8e50c5df5e
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121116061005-68rksxv7uz67hud3
2012-11-16 11:40:05 +05:30
Fabien Pinckaers
0cca84f1f7
[IMP] views
...
bzr revid: fp@tinyerp.com-20121115083400-i18b1yxfkq6j7y70
2012-11-15 09:34:00 +01:00
Thibault Delavallée
64277d04c3
[IMP] Addons: messages when installing key apps is not of comment subtype, meaning they are effectively pushed.
...
bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed
2012-11-14 12:55:04 +01:00
Pinakin Nayi (OpenERP)
d987291a63
[IMP]hr_timesheet_shhet add chatter
...
bzr revid: pna@tinyerp.com-20121112095424-p3z0bwx1f38nbv4n
2012-11-12 15:24:24 +05:30
Fabien Pinckaers
664997207a
[MERGE] fix XML symbol in attendance & timesheet reports
...
bzr revid: fp@tinyerp.com-20121112084455-lmmujwjx79sla0d2
2012-11-12 09:44:55 +01:00
Saurang Suthar
790bbfd9e7
[IMP]hr_holidays:replaced filter Start Date by Description
...
bzr revid: ssu@tinyerp.com-20121112063720-p5964m4smclz9n1d
2012-11-12 12:07:20 +05:30
Fabien Pinckaers
83c89a1c42
[FIX]
...
bzr revid: fp@openerp.com-20121110151229-dqgjr9l9scr4y8zq
2012-11-10 16:12:29 +01:00
Fabien Pinckaers
b5013ea195
[MERGE] misc improvements account, hr, crm, project
...
bzr revid: fp@openerp.com-20121110140519-z8x4ruqed7voa8rd
2012-11-10 15:05:19 +01:00
Atul Patel (OpenERP)
16d71823e4
[MERGE]:Merged wtih lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121109044947-n81qke33jp9p30af
2012-11-09 10:19:47 +05:30
Atul Patel (OpenERP)
428f1285d0
[MERGE]: Merged tpa branch for adding remaining days in leave types dropdown
...
bzr revid: atp@tinyerp.com-20121108033818-qmwoscdse0i6t6oc
2012-11-08 09:08:18 +05:30
Fabien Pinckaers
574405bed8
[MERGE] HR fixes
...
bzr revid: fp@tinyerp.com-20121108092451-2jk31s913mrat1jm
2012-11-08 10:24:51 +01:00
Turkesh Patel (Open ERP)
bc6747de0b
[IMP] hr_holidays: show the number of remaining days in the dropdown of leave types.
...
bzr revid: tpa@tinyerp.com-20121107112807-yb3g23qk0hy13lxy
2012-11-07 16:58:07 +05:30
Atul Patel (OpenERP)
58f5269f11
[FIX]: fix validation problem
...
bzr revid: atp@tinyerp.com-20121107061152-ch2ti57eezbw2xo8
2012-11-07 11:41:52 +05:30
Atul Patel (OpenERP)
cda1256ae8
[FIX]: Fix condition for validate holidays
...
bzr revid: atp@tinyerp.com-20121107055310-2t4j7ftz7ax4ci92
2012-11-07 11:23:10 +05:30
Atul Patel (OpenERP)
c6010c04b8
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121107043932-idazuoqwrhgha1xw
2012-11-07 10:09:32 +05:30
Fabien Pinckaers
3d1f9eacc5
[IMP] typo
...
bzr revid: fp@openerp.com-20121106220508-2fojaq6021v2i2jt
2012-11-06 23:05:08 +01:00
Atul Patel (OpenERP)
ae6287e763
[MERGE]: Merged pja branch
...
bzr revid: atp@tinyerp.com-20121106152644-cl3xcd54dlbteg9n
2012-11-06 20:56:44 +05:30
Atul Patel (OpenERP)
54fb04a368
[FIX]: Add constraints to fix same day overlaps problem
...
bzr revid: atp@tinyerp.com-20121106135515-3pp7rsrtnspvb28g
2012-11-06 19:25:15 +05:30
Jalpesh Patel (OpenERP)
a1fa0d61d6
[IMP]don't modify leave request in validate state
...
bzr revid: pja@tinyerp.com-20121106132025-9wrimitdry3bi7kk
2012-11-06 18:50:25 +05:30
Saurang Suthar
1a21b683ff
[IMP]hr_holidays:renamed breadcrumb Requests Approve into Requests to Approve
...
bzr revid: ssu@tinyerp.com-20121106064146-tar9k5wlbv5i0kdd
2012-11-06 12:11:46 +05:30
Antonin Bourguignon
88f06c467c
[IMP] use tools.DEFAULT_SERVER_DATETIME_FORMAT
...
bzr revid: abo@openerp.com-20121105170318-fmq31jsjf1xriqnh
2012-11-05 18:03:18 +01:00
Antonin Bourguignon
cf4f0a1021
[WIP] better management of start and end dates
...
bzr revid: abo@openerp.com-20121105133229-e3qge2pid9j6u4ck
2012-11-05 14:32:29 +01:00
Antonin Bourguignon
602ed5c7ca
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121105101538-tdgu6bi8vp2lnqru
2012-11-05 11:15:38 +01:00
Ajay Chauhan (OpenERP)
41c43df23a
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121102101051-y8tqa85i5bx7c3r7
2012-11-02 15:40:51 +05:30
Mayur Maheshwari (OpenERP)
aea578ad6a
[FIX]hr : Company name with & throws error when opening report
...
bzr revid: mma@tinyerp.com-20121101092543-w91bmpwbxed5ftkd
2012-11-01 14:55:43 +05:30
Antonin Bourguignon
d74d5d3949
[WIP] better management of start and end dates
...
bzr revid: abo@openerp.com-20121031180053-vjxk5m6i4k66c0up
2012-10-31 19:00:53 +01:00
Antonin Bourguignon
193882a19c
[IMP] remove whitespaces
...
bzr revid: abo@openerp.com-20121031173255-zj5ewj0sqvj6qmca
2012-10-31 18:32:55 +01:00
Antonin Bourguignon
22b33ccdca
[IMP] indentation and whitespaces
...
bzr revid: abo@openerp.com-20121030170310-8qyxz6zquam335zw
2012-10-30 18:03:10 +01:00
Antonin Bourguignon
5be9d20a0b
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121030154647-6acbljvitcmphriz
2012-10-30 16:46:47 +01:00
Turkesh Patel (Open ERP)
18d2b635ad
[IMP] improved sequence of hr modules.
...
bzr revid: tpa@tinyerp.com-20121030060105-9yzvak8mvz9ih4a6
2012-10-30 11:31:05 +05:30
Launchpad Translations on behalf of openerp
87d3caa50f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Ajay Chauhan (OpenERP)
3894874ebb
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121030050323-cpn92n9txy0xw5gj
2012-10-30 10:33:23 +05:30
Turkesh Patel (Open ERP)
4a75f8698f
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-10click-hr
...
bzr revid: tpa@tinyerp.com-20121029095811-22t0bop2o5da96g3
2012-10-29 15:28:11 +05:30
ajay javiya (OpenERP)
69ef2bc46c
[IMP]: Improve onchange for leave request
...
bzr revid: aja@tinyerp.com-20121029090423-at3i0byeamhvgg1z
2012-10-29 14:34:23 +05:30
ajay javiya (OpenERP)
f95608ae89
[ADD]:Add onchange for contact from and leave request
...
bzr revid: aja@tinyerp.com-20121029083414-4bw6i8ii72wctevk
2012-10-29 14:04:14 +05:30
Turkesh Patel (Open ERP)
ffc347d3ae
[IMP] hr_holidays: add onchange on employee_id field to change department also.
...
bzr revid: tpa@tinyerp.com-20121029071409-r8z0q8fko35gnsjy
2012-10-29 12:44:09 +05:30
Ajay Chauhan (OpenERP)
6cfffae349
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121029050259-0vimwnu84f2dvk2g
2012-10-29 10:32:59 +05:30
Fabien Pinckaers
a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Ajay Chauhan (OpenERP)
d48ba6553f
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121023051750-jcddzn3dq1d8u12q
2012-10-23 10:47:50 +05:30
Fabien Pinckaers
101c6096e6
[MERGE] open chatter fix message read/unread
...
bzr revid: fp@tinyerp.com-20121022080251-9plcyik4ag328m0z
2012-10-22 10:02:51 +02:00
Ajay Chauhan (OpenERP)
b7bc79d9c3
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121018060531-wl123qyuvlccjyfc
bzr revid: cha@tinyerp.com-20121022053314-olinyyizlbcmf9y2
2012-10-22 11:03:14 +05:30
Launchpad Translations on behalf of openerp
5bfa3c5a7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Mayur Maheshwari (OpenERP)
1901cda266
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121019052334-zgq8u774xdrns0pd
2012-10-19 10:53:34 +05:30
Mayur Maheshwari (OpenERP)
d1131c4a8d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121018052756-65fv51x0qrmz7zj6
bzr revid: mma@tinyerp.com-20121019050930-mcht3lslqjk38q22
2012-10-19 10:39:30 +05:30
Launchpad Translations on behalf of openerp
df2750f9fd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121018044110-cqlg7hbfgy4m2bba
2012-10-18 04:41:10 +00:00
Launchpad Translations on behalf of openerp
8a38ee944e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121017043613-kd7vkw5ixd4djrpm
2012-10-17 04:36:13 +00:00
Ajay Chauhan (OpenERP)
3e92ab21d0
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121012092019-qdvhqieyi1qrv5lh
bzr revid: cha@tinyerp.com-20121015055409-mx3nok6uhg1t0jk5
2012-10-15 11:24:09 +05:30
Mayur Maheshwari (OpenERP)
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Mayur Maheshwari (OpenERP)
3079bf9ce0
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121012055106-eu39hyg4vt2mxr07
2012-10-12 11:21:06 +05:30
Ajay Chauhan (OpenERP)
da96d4f385
[IMP] hr_holidays: made records with 'Second Approval' state visible in menu 'Leave Requests to Approve'
...
bzr revid: cha@tinyerp.com-20121012053535-qtcu2o3hw60ys2r3
2012-10-12 11:05:35 +05:30
Fabien Pinckaers
5c4348f7fe
[FIX] HR useability improvements
...
bzr revid: fp@openerp.com-20121010192927-6ud5e3zvhp5gabip
2012-10-10 21:29:27 +02:00
Ajay Chauhan (OpenERP)
f147dfe7cc
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121010072653-jy1rxxfdrm6cum7r
2012-10-10 12:56:53 +05:30
Launchpad Translations on behalf of openerp
49b102b54a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121010044451-x88fqu2rrhax9fq4
2012-10-10 04:44:51 +00:00
Ajay Chauhan (OpenERP)
14fdc7497c
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121008045651-kt3esedbe5vy5dhk
2012-10-08 10:26:51 +05:30
Ajay Chauhan (OpenERP)
05fc9d4baf
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121005052059-6pshnhosxtr3xi8r
2012-10-05 10:50:59 +05:30
Quentin (OpenERP)
e3321610ed
[FIX] hr_holidays: fixed view that have an onchange function returning a field which is not in the view
...
bzr revid: qdp-launchpad@openerp.com-20121004161009-w4sv2vjweklqj73o
2012-10-04 18:10:09 +02:00
Fabien Pinckaers
c93d70e919
[MERGE] chm - improved subtype - fixes
...
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00
Ajay Chauhan (OpenERP)
e033f2f1ae
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121001084641-li6apbpimfbyllo3
2012-10-01 14:16:41 +05:30
Ajay Chauhan (OpenERP)
5e5c5b198b
[IMP] hr_holidays: set full name for menu
...
bzr revid: cha@tinyerp.com-20121001084134-pl57w4fmqmxbwydq
2012-10-01 14:11:34 +05:30
Antony Lesuisse
6dd16f2613
[MERGE] trunk
...
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
Antonin Bourguignon
8683ea9c6d
[MERGE] trunk
...
bzr revid: abo@openerp.com-20120928152152-p6s1dzq96g0sy2sf
2012-09-28 17:21:52 +02:00
Ajay Chauhan (OpenERP)
254aacbd01
[MERGE] merge with main addons
...
bzr revid: cha@tinyerp.com-20120928055404-hwwdjkqod93pcbk5
2012-09-28 11:24:04 +05:30
Fabien Pinckaers
0eee48d30a
[MERGE] auto-follow Sales Team, Projet, HR Manager
...
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00
Atul Patel (OpenERP)
1c1978fbb7
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120927041011-e90b4710saidnlcf
2012-09-27 09:40:11 +05:30
Atul Patel (OpenERP)
d050d743ee
[FIX]: override write method into hr module..
...
bzr revid: atp@tinyerp.com-20120926184445-3o03o0n4oxgprern
2012-09-27 00:14:45 +05:30
Fabien Pinckaers
e9f4840c93
[IMP] emoving bad code, no invitation system on events
...
[IMP] no more certifiate, will be managed in apps.openerp.com directly
bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Ajay Chauhan (OpenERP)
a86f08c2a6
[IMP] hr_holidays: add menu to see allocation requests to approve
...
bzr revid: cha@tinyerp.com-20120926102034-cit2yvaaits6nnfy
2012-09-26 15:50:34 +05:30
Atul Patel (OpenERP)
7f08d3d176
[FIX]: Fix employee manager id
...
bzr revid: atp@tinyerp.com-20120925173320-z4vn1ir2bwp9gu5l
2012-09-25 23:03:20 +05:30
Atul Patel (OpenERP)
e8cf471e19
[IMP]: Manager should able to follow his employee requests
...
bzr revid: atp@tinyerp.com-20120924103812-eg1nflvk68cble4m
2012-09-24 16:08:12 +05:30
Christophe Matthieu
f47111449c
[IMP] mail_follower: unique field widget, sub-types on click
...
bzr revid: chm@openerp.com-20120924095616-keuji387bvy6pmcs
2012-09-24 11:56:16 +02:00
Christophe Matthieu
fa63653de9
[MERGE] from trunk-mail-mail-rules-tde
...
bzr revid: chm@openerp.com-20120921095037-czl4s3v0do11yhkq
2012-09-21 11:50:37 +02:00
Mayur Maheshwari (OpenERP)
54801477db
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120921061921-f118dvvphastk4ge
2012-09-21 11:49:21 +05:30
Antonin Bourguignon
c7b1d6cb63
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120920145753-2izkiam4sf8t53of
2012-09-20 16:57:53 +02:00
Thibault Delavallée
cb806332be
[FIX] subtype_xml_id -> subtype in message_post.
...
bzr revid: tde@openerp.com-20120920145405-vwi1kt1ttkd2w8sz
2012-09-20 16:54:05 +02:00
Thibault Delavallée
84fbc3b7da
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
2012-09-20 16:49:00 +02:00
Thibault Delavallée
1206b8f7a0
[IMP] Addons: added message_is_follower and message_subtype_data invisible fields to all views using Chatter and Followers widgets.
...
bzr revid: tde@openerp.com-20120920115900-vvpfhjvw135vhf91
2012-09-20 13:59:00 +02:00
Fabien Pinckaers
f317c0dc16
[MERGE] hr fixes
...
bzr revid: fp@tinyerp.com-20120920090706-usen24pssndoag0g
2012-09-20 11:07:06 +02:00
Fabien Pinckaers
ae7f67d90b
[MERGE] hr_holidays
...
bzr revid: fp@tinyerp.com-20120920090327-gz0t0u2maqh7cdu8
2012-09-20 11:03:27 +02:00
Thibault Delavallée
b9820db8f0
[CLEAN] hr_holidays, hr_recruitment, idea, mrp: cleaned subtypes.
...
bzr revid: tde@openerp.com-20120919131240-7cc61fqg5eoom9zt
2012-09-19 15:12:40 +02:00
Mayur Maheshwari (OpenERP)
e6178297df
[IMP]all : set appropriate method on action for mark read as well as unread for fix the issue of read and unread
...
bzr revid: mma@tinyerp.com-20120918051018-ghdv7tk80g5pqlq6
2012-09-18 10:40:18 +05:30
Thibault Delavallée
abf16c58c6
[IMP] Addons: added invisible field for message_is_follower; note: reidented view; account_voucher: reidented one view.
...
bzr revid: tde@openerp.com-20120917153533-u102ds3eo1xr1mnt
2012-09-17 17:35:33 +02:00
Amit Patel
e6afcac5fd
[MERGE]:employee should not access timesheets from the timesheets menu or also payslip
...
bzr revid: apa@tinyerp.com-20120917122012-rbkf1skp1oeevh5h
2012-09-17 17:50:12 +05:30
Amit Patel
3fa4a257fc
[IMP]:improved view priority
...
bzr revid: apa@tinyerp.com-20120917072712-7sn4h0rf9boiqint
2012-09-17 12:57:12 +05:30
Sanjay Gohel (Open ERP)
e6cdcb6b51
[MERGE]merge with trunk addons
...
bzr revid: sgo@tinyerp.com-20120917065740-w9a3xhe632368t2n
2012-09-17 12:27:40 +05:30
Amit Patel
4a14de9e0b
[IMP]:hr fix
...
bzr revid: apa@tinyerp.com-20120917062703-vi4geb7l1q9n40zc
2012-09-17 11:57:03 +05:30
Amit Patel
d32f3cc510
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120917061638-wsy2a3d6h1ce0mff
2012-09-17 11:46:38 +05:30
Fabien Pinckaers
b9fa71cc59
[MERGE] merge rpa's imprvoements of modules description
...
bzr revid: fp@openerp.com-20120916212615-jfoghzsady0ektp1
2012-09-16 23:26:15 +02:00
Fabien Pinckaers
ab4b7da49f
[IMP] cleaned ir.actions.todo to launch newly installed application
...
bzr revid: fp@openerp.com-20120916114249-5px8shvbm3tzhidh
2012-09-16 13:42:49 +02:00
Gilles Major
59c03591df
[MERGE] improvements on module descriptions
...
bzr revid: gim@openerp.com-20120914140950-drka4c0tnbnkw3fg
2012-09-14 16:09:50 +02:00
Gilles Major
30839863e8
[IMP] improve module descriptions
...
bzr revid: gim@openerp.com-20120914122827-dhao39ur269mmin8
2012-09-14 14:28:27 +02:00
Christophe Matthieu
46a60cdac7
[MERGE] from trunk-mail-concreting-tde, TODO fix bug
...
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
2012-10-29 10:08:47 +01:00
Frédéric van der Essen
7cdf99ade1
[IMP] mail: improved display of openchatter in form views
...
bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
2012-10-26 11:58:21 +02:00
Sanjay Gohel (Open ERP)
66e8595b01
[IMP]changed in all hr module for subtype
...
bzr revid: sgo@tinyerp.com-20120913065854-7y5jkls3q2jebduv
2012-09-13 12:28:54 +05:30
Rucha (Open ERP)
0cc5760e4f
[IMP]: hr_holidays: Improved module description for hr_holidays
...
bzr revid: rpa@tinyerp.com-20120912113809-vqk8gnh02hgokir8
2012-09-12 17:08:09 +05:30
Amit Patel
e9495732ce
[MERGE]:merged hr_holidays
...
bzr revid: apa@tinyerp.com-20120912112413-axq7494z79jco7jg
2012-09-12 16:54:13 +05:30
Saurang Suthar
c669824898
[IMP]:improved code for opening employee form view while clicking on Hire button and employee list view while selecting Categories Structure
...
bzr revid: ssu@tinyerp.com-20120912092857-q7j1qje1p6q0dr2f
2012-09-12 14:58:57 +05:30
Saurang Suthar
f1ac51cb21
[IMP]hr_holidays:made fields holiday_type and employee_id visible only for HR/Officer
...
bzr revid: ssu@tinyerp.com-20120912071031-fopmip7rp06ymqmr
2012-09-12 12:40:31 +05:30
Saurang Suthar
ff94aba9f2
[IMP/MERGE]:merged with parent
...
bzr revid: ssu@tinyerp.com-20120912064032-i2hx1vbreoa19hpu
2012-09-12 12:10:32 +05:30
Amit Patel (OpenERP)
33b3c0e6a0
[MERGE]:tunk
...
bzr revid: apa@tinyerp.com-20120910051334-54gadrzcbjzk37wn
2012-09-10 10:43:34 +05:30
Amit Patel (OpenERP)
59aac0beb4
[IMP]:improved code
...
bzr revid: apa@tinyerp.com-20120907084310-nl68lqrpf7exzjls
2012-09-07 14:13:10 +05:30
Sanjay Gohel (Open ERP)
699b75af2b
[MERGE]merge parent branch
...
bzr revid: sgo@tinyerp.com-20120906115036-th5crpchxdy1c11m
2012-09-06 17:20:36 +05:30
Sanjay Gohel (Open ERP)
cf4209ab9b
[IMP]improve he employee form view as per mockup
...
bzr revid: sgo@tinyerp.com-20120906111721-17ev5r0qufc9u4vd
2012-09-06 16:47:21 +05:30
Amit Patel (OpenERP)
0a5ebb52e1
[MERGE]:trunk-mail-cleaning-fp
...
bzr revid: apa@tinyerp.com-20120904104409-w9zl98qjpem10pan
2012-09-04 16:14:09 +05:30
Randhir Mayatra (OpenERP)
e50afb97b4
[IMP] make changes into hr module for subtype data
...
bzr revid: rma@tinyerp.com-20120904094052-5povh2fua010g3ej
2012-09-04 15:10:52 +05:30
Thibault Delavallée
48c081f271
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Randhir Mayatra (OpenERP)
df3aa41ac4
[IMP] add subtype data in hr module
...
bzr revid: rma@tinyerp.com-20120904071754-d99h6iey5nzrjf08
2012-09-04 12:47:54 +05:30
Launchpad Translations on behalf of openerp
ffc772edfd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120904045249-1039twan4q8v5oip
2012-09-04 04:52:49 +00:00
Vo Minh Thu
d961735db0
[FIX] hr_holidays: remove the `confirm` signal call since that transition was removed in rev. 7335.
...
bzr revid: vmt@openerp.com-20120903122321-y7f4r35b7b11iv5m
2012-09-03 14:23:21 +02:00
Thibault Delavallée
1be5a4d452
[FIX] hr_holidays: fixed wrong condition due to bad merge of trunk.
...
bzr revid: tde@openerp.com-20120903095526-su8jionaltao0x2k
2012-09-03 11:55:26 +02:00
Thibault Delavallée
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Saurang Suthar
23168a11f5
[IMP]hr_holidays:made fields hpliday_type, employee_id visible only for HR/Officers and remove red color of Refuse button
...
bzr revid: ssu@tinyerp.com-20120903053507-ghwwdvd1ag92f9lm
2012-09-03 11:05:07 +05:30
Quentin (OpenERP)
fc8855fa74
[MERGE] merged branch with leave request improvements
...
bzr revid: qdp-launchpad@openerp.com-20120831144244-40apxljf6juyv3nv
2012-08-31 16:42:44 +02:00
Olivier Dony
1dce0b1dc4
[FIX] all mail dependencies: replace message_post call by normal record + review misc wording
...
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
Thibault Delavallée
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
Harry (OpenERP)
8040315844
[FIX] hr_holiday: subscribe manager of employee on leave confirm
...
bzr revid: hmo@tinyerp.com-20120828132820-unts2iems2a58q3o
2012-08-28 18:58:20 +05:30
Harry (OpenERP)
0a4f53e0ad
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120828112531-rl9jcppczk4j5kha
2012-08-28 16:55:31 +05:30
Harry (OpenERP)
3d326bec9b
[FIX] hr_holiday: add manager as a followers in leave request
...
bzr revid: hmo@tinyerp.com-20120828111931-fnrpc07v2upp0y8n
2012-08-28 16:49:31 +05:30
Launchpad Translations on behalf of openerp
4e31d1be93
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Thibault Delavallée
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
Meera Trambadia
afad98e5b5
[MERGE] with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120824084459-h46fbrmp1tvet9k5
2012-08-24 14:14:59 +05:30
Antonin Bourguignon
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Fabien Pinckaers
b531d9cff1
[IMP] needaction after mail.thread
...
bzr revid: fp@tinyerp.com-20120822153145-g7xopqq7oje7y60c
2012-08-22 17:31:45 +02:00
Saurang Suthar(OpenERP)
095843797c
[IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
...
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Olivier Dony
406e58399f
[FIX] mail: unify message_post calls, fix typos, various lint cleanup
...
bzr revid: odo@openerp.com-20120822113439-aoy7v4njs6o34tu5
2012-08-22 13:34:39 +02:00
Bharat Devnani (OpenERP)
530fa8859d
[IMP] modified state field of crm.meeting
...
bzr revid: bde@tinyerp.com-20120822092149-fjxbuh3vv6hfe9b4
2012-08-22 14:51:49 +05:30
pso (OpenERP)
c78a04bc68
[MERGE] Merged HSA's branch to improve __openerp__.py of all modules by replacing init_xml, update_xml with data, demo_xml with demo, Adding noupdate in init_xml files
...
bzr revid: pso@tinyerp.com-20120822071445-yamr1s0zf3fk9jj7
2012-08-22 12:44:45 +05:30
Meera Trambadia
a4ae69e9ee
[IMP] hr_holidays: Now only 'Refuse' button is there on approved state
...
bzr revid: mtr@tinyerp.com-20120821095017-a5f98ihyooe6a344
2012-08-21 15:20:17 +05:30
Hardik
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
help
0d4603f4f9
[IMP]improved modules description from rst2html
...
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
Harry (OpenERP)
a3389fcd17
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120817115338-tk0tnwkz6y54mk6b
2012-08-17 17:23:38 +05:30
Fabien Pinckaers
6ac583c0f7
[IMP] mail cleaning
...
bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
2012-08-17 13:19:36 +02:00
Hardik
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Fabien Pinckaers
66ece041f0
[IMP] append note
...
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
2012-08-17 12:26:50 +02:00
Fabien Pinckaers
b62858e83e
[IMP] Merging different ways of posting a message:
...
message_append_note
message_append_dict
message_append
--> merged all to message_post
bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
2012-08-17 12:03:02 +02:00
Fabien Pinckaers
a2b7f82a81
[IMP] no auto_follow, we will use auto-compose instead on some actions
...
bzr revid: fp@tinyerp.com-20120816090243-nzu6ounygswiceqi
2012-08-16 11:02:43 +02:00
Fabien Pinckaers
e5b76be9b8
[IMP] merge trunk
...
bzr revid: fp@tinyerp.com-20120816072402-7w1avco6ryt12x10
2012-08-16 09:24:02 +02:00
Antony Lesuisse
da8045d784
add message_followers_ids
...
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
2012-08-16 00:30:38 +02:00
Thibault Delavallée
92c70aa6ea
[IMP] Addons: propagated new automatic subscription mechanism.
...
bzr revid: tde@openerp.com-20120815205143-twthjirie2b5kr7n
2012-08-15 22:51:43 +02:00
Thibault Delavallée
61274acd89
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120815195652-839w3fyumomq0ubf
2012-08-15 21:56:52 +02:00
Fabien Pinckaers
eb0669850d
[IMP] removed needaction_pending, some cleaning in messages mail
...
bzr revid: fp@openerp.com-20120815133643-loyzmyp6azs5lr47
2012-08-15 15:36:43 +02:00
Fabien Pinckaers
8b61ed737c
[IMP] need action new implementation
...
bzr revid: fp@openerp.com-20120815102919-w3iuspeoz5fmz97u
2012-08-15 12:29:19 +02:00
Thibault Delavallée
a6482fe07c
[WIP] Followers rewrite: in create/write, the purpose is to add the field in the values to write, and to simplify automatic subscription. WIP, lack of time to finish. Will be continued.
...
bzr revid: tde@openerp.com-20120814170612-ax8xhcmmttrcphnl
2012-08-14 19:06:12 +02:00
Harry (OpenERP)
0c20817c37
[IMP] hr_holidays: clean workflow of hr_holidays
...
bzr revid: hmo@tinyerp.com-20120814122050-8pax7b6e06urcyvv
2012-08-14 17:50:50 +05:30
Vo Minh Thu
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Meera Trambadia
81a44cef8e
[IMP]: provided static string for crm.meeting if desc is not provided on Leave Req
...
bzr revid: mtr@tinyerp.com-20120814054425-eqej763roe0qf60i
2012-08-14 11:14:25 +05:30
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Meera Trambadia
5349f0ec20
[MERGE] with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120813061514-57qe2sg7tmjzg16j
2012-08-13 11:45:14 +05:30
pso (OpenERP)
b08b3c64d1
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120809122358-031mjff70sgr62rb
2012-08-09 17:53:58 +05:30
Pinakin Nayi (OpenERP)
5ed128270f
[IMP]issur4-hr-imp
...
bzr revid: pna@tinyerp.com-20120809071200-nvqphqv9swzqs2pu
2012-08-09 12:42:00 +05:30
Twinkle Christian (OpenERP)
721adad01e
[IMP]Remove type field from the whole hr module
...
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Launchpad Translations on behalf of openerp
e970ecd62c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony
3fd9a77c83
[REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
...
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.
bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Meera Trambadia
99a78007ec
[MERGE] with: lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120808045136-lhp516bmqzqrtiuw
2012-08-08 10:21:36 +05:30
Antonin Bourguignon
a97687a420
[MERGE] latest trunk
...
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'
bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon
59aa37f0e4
[IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
...
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Antonin Bourguignon
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Meera Trambadia
e9992a5a17
[IMP]: reorganised 'Descripton' field in the view,removed from the group
...
bzr revid: mtr@tinyerp.com-20120807112428-othm98knqk73gs2s
2012-08-07 16:54:28 +05:30
Jigar Amin - OpenERP
935e31b328
merge lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
2012-08-07 16:26:28 +05:30
Meera Trambadia
fb61582548
[IMP]: changed ir.rule for HR/Officer to see all Leave/Allocation request
...
bzr revid: mtr@tinyerp.com-20120807102905-bws5jn24hy9ucjnh
2012-08-07 15:59:05 +05:30
Meera Trambadia
1a459a100e
[IMP]: set domain on the menu 'My Leave Request' to filter on user_id
...
bzr revid: mtr@tinyerp.com-20120807102451-1bc8zsdn1bt40tio
2012-08-07 15:54:51 +05:30
Twinkle Christian (OpenERP)
2e689ca4e0
[IMP]improved views
...
bzr revid: tch@tinyerp.com-20120807093734-0u3ozi0hn7rxiy2q
2012-08-07 15:07:34 +05:30
Twinkle Christian (OpenERP)
ae1304d42d
[IMP]improve views
...
bzr revid: tch@tinyerp.com-20120807061855-lbq954eh05i4akpi
2012-08-07 11:48:55 +05:30
Launchpad Translations on behalf of openerp
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP)
389f8d6803
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Meera Trambadia
9ad58e88c1
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120806045242-3k498brfcze6pxua
2012-08-06 10:22:42 +05:30
Fabien Pinckaers
0869066f99
[IMP] improved modules message at installation --> to be reviewed later
...
bzr revid: fp@openerp.com-20120805201322-y8ghspcb69wmb3ut
2012-08-05 22:13:22 +02:00
Fabien Pinckaers
7aae117e84
[IMP] open right menu afte rmod installation
...
bzr revid: fp@openerp.com-20120804215742-x2xhzsm8agiv70w3
2012-08-04 23:57:42 +02:00
Fabien Pinckaers
7904580e60
[IMwP] open the right menu according to the installed application
...
bzr revid: fp@openerp.com-20120804215327-651jy6mn1w15x430
2012-08-04 23:53:27 +02:00
Fabien Pinckaers
ea52cfae17
[IMP] introducing new file type: html
...
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers
b363b1f622
fix
...
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers
4e69bdd6fc
[IMP] improved menu tips - 10 firsts clicks
...
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Meera Trambadia
9d1648aec5
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120803062351-j3t1vv7mt5mqg1hk
2012-08-03 11:53:51 +05:30
Meera Trambadia
0b6e36ef48
[IMP]: set reqd=False on 'name' field and improved view
...
bzr revid: mtr@tinyerp.com-20120801124044-1asum92rkjnipnms
2012-08-01 18:10:44 +05:30
pso (OpenERP)
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Quentin (OpenERP)
e1b50e304d
[MEGUEZ] merged the clean search view branch
...
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Twinkle Christian (OpenERP)
cb1c6c08af
[IMP]Improve search view in all modules
...
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Meera Trambadia
dbcd304455
[IMP]:changed the id,name from 'manager' to 'user'
...
bzr revid: mtr@tinyerp.com-20120731103215-vc0wx0kiy7d8x6ka
2012-07-31 16:02:15 +05:30
Meera Trambadia
e31a2f8634
[IMP]:imported math module(library)
...
bzr revid: mtr@tinyerp.com-20120731090241-mvgydus04zrmnjvl
2012-07-31 14:32:41 +05:30
Meera Trambadia
f16696174f
[MERGE]: branch merged with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120731070125-n8mza516sbpta515
2012-07-31 12:31:25 +05:30
Meera Trambadia
e9cd4b6d82
[IMP]:round down the value of days
...
bzr revid: mtr@tinyerp.com-20120731062540-3iijbtj1d2671fvv
2012-07-31 11:55:40 +05:30
Fabien Pinckaers
d14c62fbe8
[IMP] copywriting summary of modules
...
bzr revid: fp@openerp.com-20120730132840-bchv2hmp40uqkwvb
2012-07-30 15:28:40 +02:00
vta vta@openerp.com
264d2c3365
[MERGE] Trunk.
...
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Meera Trambadia
095a0569f8
[IMP]:can now delete a leave which are in 'draft', 'cancel' and 'confirm' state
...
bzr revid: mtr@tinyerp.com-20120730103139-n1ni944evcny3dic
2012-07-30 16:01:39 +05:30
Meera Trambadia
21df649697
[IMP]:improved access rights and added ir.rule for HR/Officer
...
bzr revid: mtr@tinyerp.com-20120726123517-l9gc3tn9efl8wwep
2012-07-26 18:05:17 +05:30
Meera Trambadia
2c9e0c2459
[IMP]:reverted the changes for 'name' field
...
bzr revid: mtr@tinyerp.com-20120726122702-bbttyqkepqs0fdg6
2012-07-26 17:57:02 +05:30
Stephane Wirtel
e3c2297d43
[FIX] hr_holidays: security fix in the rights
...
bzr revid: stw@openerp.com-20120726114321-xx4j4acudjmgeoe6
2012-07-26 13:43:21 +02:00
Stephane Wirtel
bf7514d6a6
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2-stw
...
bzr revid: stw@openerp.com-20120725165856-x4gncnayenhte2eh
2012-07-25 18:58:56 +02:00
Raphael Collet
df723a0b6c
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120725133932-0cvvngral6nt8ixj
bzr revid: rco@openerp.com-20120725151612-lp3bozy0xb0gjrvp
2012-07-25 17:16:12 +02:00
Stephane Wirtel
6a84f697b1
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-mma
...
bzr revid: stw@openerp.com-20120725143446-2ir9qawtn20iimz2
2012-07-25 16:34:46 +02:00
pso (OpenERP)
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30