pso (OpenERP)
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Meera Trambadia
f1893b88c6
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-leave-req-imp-dbr
...
bzr revid: mtr@tinyerp.com-20120725123345-3vidbhuoww8lk4pf
2012-07-25 18:03:45 +05:30
Saurang Suthar(OpenERP)
25d650e96e
[IMP] Improved warning messages for hr* modules
...
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
Harry (OpenERP)
e9cf08ac44
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120720054606-24wztgdyl2ztq5b3
2012-07-20 11:16:06 +05:30
pso (OpenERP)
fc26f3975d
[IMP] Improved warning messages/exceptions of hr modules
...
bzr revid: pso@tinyerp.com-20120716091918-hua9cjnv21nqa2yl
2012-07-16 14:49:18 +05:30
Purnendu Singh (OpenERP)
e5ae685374
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120713130824-r6p6d28u1h3c7nol
bzr revid: psi@tinyerp.com-20120716052129-2lj20gqc7zuyet1s
2012-07-16 10:51:29 +05:30
Fabien Pinckaers
1d94bd4907
[IMP] partner kanban, holidays, meeting
...
bzr revid: fp@openerp.com-20120714160403-if88yyfrqn07xp3t
2012-07-14 18:04:03 +02:00
Fabien Pinckaers
b2609bd3c7
[IMP] meetings forms and features
...
bzr revid: fp@openerp.com-20120714153350-tr9dkw5f4pxpf5ev
2012-07-14 17:33:50 +02:00
Pinakin Nayi (OpenERP)
881148d4b1
[IMP]hr-warning-message
...
bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe
2012-07-13 17:46:13 +05:30
Rajesh Prajapati (OpenERP)
71122ae47a
[IMP]tooltip : I have changed the tooltip of fields as suggested
...
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
Pinakin Nayi (OpenERP)
bdcea123b7
[IMP]hr-warning-message
...
bzr revid: pna@tinyerp.com-20120713084510-vh2wjwr7w23qoyuv
2012-07-13 14:15:10 +05:30
DBR (OpenERP)
ebfa32cbe8
[IMP]hr_holiday: Improve constraints message
...
bzr revid: dbr@tinyerp.com-20120711095158-fc8j3pibnwqt3asu
2012-07-11 15:21:58 +05:30
DBR (OpenERP)
ce21285d02
[IMP]hr_holiday: Remove extra messages and methods
...
bzr revid: dbr@tinyerp.com-20120711093313-a1bo5nfgxzt9bmr0
2012-07-11 15:03:13 +05:30
DBR (OpenERP)
5c84adc958
[IMP]hr_holiday: set name required for history
...
remove submit to manager button from allocation view
Improve onchange name
bzr revid: dbr@tinyerp.com-20120710124651-m9qrg23ci4gzp8nz
2012-07-10 18:16:51 +05:30
Quentin (OpenERP)
5a7e06c4a4
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20120710124253-eu7h88iss7lbcrw6
2012-07-10 14:42:53 +02:00
DBR (OpenERP)
d31835fbfb
[Merge]with : lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20120709132023-962cwpkvwppdtawa
2012-07-09 18:50:23 +05:30
DBR (OpenERP)
7f33ab9c14
[Merge]with: lp:~openerp-commiter/openobject-addons/trunk-leave-req-imp-dbr-hr-leave-hsa
...
bzr revid: dbr@tinyerp.com-20120709061007-5jfkbl2t8ddx8vlg
2012-07-09 11:40:07 +05:30
Hardik
34869c7348
[IMP]hr_holidays : view are improved and notes field removed
...
bzr revid: hsa@tinyerp.com-20120709054843-2k8p5jkkejl8rgbs
2012-07-09 11:18:43 +05:30
Hardik
bb118fae42
[IMP]hr_holidays : view are improved
...
bzr revid: hsa@tinyerp.com-20120706140616-nylt94v652w9k2eg
2012-07-06 19:36:16 +05:30
Raphael Collet
76500b8a5e
[IMP] hr_holidays: remove dependency on module crm
...
bzr revid: rco@openerp.com-20120705080659-983x3zcr3cdz48ob
2012-07-05 10:06:59 +02:00
Atul Patel (OpenERP)
065e1f1cc5
[MERGE]: Merged with trunk-addons
...
bzr revid: atp@tinyerp.com-20120703111551-e3ldxq7n3giafhfm
2012-07-03 16:45:51 +05:30
Thibault Delavallée
37a0658521
[IMP] needaction: cleaned definitions in addons.
...
bzr revid: tde@openerp.com-20120702145747-3m3s78tfmavjj61k
2012-07-02 16:57:47 +02:00
Atul Patel (OpenERP)
edc26e341a
[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-project-view-improvement-bde
...
bzr revid: atp@tinyerp.com-20120626062015-3ouunhuvfncggyvv
2012-06-26 11:50:15 +05:30
Thibault Delavallée
1675f545c6
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120613153026-wh9mvahd4rzhxd4g
bzr revid: tde@openerp.com-20120614083838-algjw7i1z3mhtkot
bzr revid: tde@openerp.com-20120615081803-6r4vhj80saemj1vg
bzr revid: tde@openerp.com-20120618075732-jzenzam3takxe00o
2012-06-18 09:57:32 +02:00
Raphael Collet
818db0ef6c
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120614143107-rtnb6tzd6a5hlwm8
2012-06-14 16:31:07 +02:00
Raphael Collet
faad7a978a
[IMP] hr_holidays: improve English, and fix a few views
...
bzr revid: rco@openerp.com-20120613142605-vbw88dogd8n83ru7
2012-06-13 16:26:05 +02:00
Kuldeep Joshi (OpenERP)
372477ef72
[IMP]hr_holidays: remove done state and change report
...
bzr revid: kjo@tinyerp.com-20120611053226-dix0kl57bnipw8dq
2012-06-11 11:02:26 +05:30
Kuldeep Joshi (OpenERP)
8a670326ab
[IMP]hr_holidays: link meeting to leave request
...
bzr revid: kjo@tinyerp.com-20120608063755-vviuq755hjl52c8n
2012-06-08 12:07:55 +05:30
Pinakin Nayi (OpenERP)
26077a769b
[IMP] hr_recruitmentimprove tooltips,hr menu
...
bzr revid: pna@tinyerp.com-20120607093153-jw6binjlkqzcils8
2012-06-07 15:01:53 +05:30
Thibault Delavallée
c23ae586ab
[FIX] message_get_subscribers: fixed copy and paste error.
...
bzr revid: tde@openerp.com-20120605124252-msp8r5xvufrkdm5i
2012-06-05 14:42:52 +02:00
Thibault Delavallée
6aa0ca7a7e
[IMP] mail_thread: cleaned message_get_subscribers and related methods; propagated change so that project_issue, mrp, crm_lead, project, project_task, hr_recruitment and hr_holidays now cleanly override message_get_subscribers.
...
bzr revid: tde@openerp.com-20120605122221-nvxfxfcx5o82vkvx
2012-06-05 14:22:21 +02:00
Sbh (Openerp)
e36af38e37
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120530054016-6q4d0dsqssxwjkwr
2012-05-30 11:10:16 +05:30
Mayur Maheshwari (OpenERP)
136e453e1d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120529125227-gdu1kao0kjcxviv8
2012-05-29 18:22:27 +05:30
Mayur Maheshwari (OpenERP)
3be6d4ef09
[IMP]hr: Improve employee view kanban and leaves management
...
bzr revid: mma@tinyerp.com-20120529124748-l4nqh230k9zat6yq
2012-05-29 18:17:48 +05:30
Purnendu Singh (OpenERP)
99110a63e0
[MERGE] merge with main addong
...
bzr revid: psi@tinyerp.com-20120523065342-zqted3y2ke5kq7fo
2012-05-23 12:23:42 +05:30
Sbh (Openerp)
2a6ff8b22e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120523063832-qwevi2f4caymrczo
2012-05-23 12:08:32 +05:30
Fabien Pinckaers
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Fabien Pinckaers
2bce6d97d7
[IMP] removed dashboards, order of menus, count buttons on partner, products
...
bzr revid: fp@tinyerp.com-20120522143759-lnd5eescth6yxdvu
2012-05-22 16:37:59 +02:00
DBR (OpenERP)
289cc2d9d2
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20120522125704-5fh2rvqb56qp9vci
2012-05-22 18:27:04 +05:30
Purnendu Singh (OpenERP)
1631dd2831
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120522110600-xk507cocya0xj13s
2012-05-22 16:36:00 +05:30
Pinakin Nayi (OpenERP)
398bb1ff50
[IMP] hr_holiday:improve leave report color,tooltips
...
bzr revid: pna@tinyerp.com-20120521054607-74ou4uplze3astxg
2012-05-21 11:16:07 +05:30
DBR (OpenERP)
bf406c4af7
[IMP]hr_holidays: remove extra import
...
bzr revid: dbr@tinyerp.com-20120518095544-u0qrrgaaqmc4cbhg
2012-05-18 15:25:44 +05:30
DBR (OpenERP)
1b09de07e8
[FIX]hr_holidays: Iprove the search for get perfect days
...
bzr revid: dbr@tinyerp.com-20120517105902-9wxxvlxd9csy80pb
2012-05-17 16:29:02 +05:30
DBR (OpenERP)
e53ce6d3c6
[IMP]hr_holiday: remove date_to condition from domain for getting correct value
...
bzr revid: dbr@tinyerp.com-20120511102314-3xx8ht0sylll31rw
2012-05-11 15:53:14 +05:30
Saurang Suthar (OpenERP)
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Amit Patel (OpenERP)
d1147c51e9
[IMP]
...
bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
2012-05-01 18:04:46 +05:30
Purnendu Singh (OpenERP)
5de1e8d561
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120430122540-haxtywb5gjy16qle
2012-04-30 17:55:40 +05:30
Amit Patel (OpenERP)
5472a85b28
[MERGE]
...
bzr revid: apa@tinyerp.com-20120427105446-80dp19jsboes2n7c
2012-04-27 16:24:46 +05:30
Raphael Collet
d75f80e0e9
[IMP] hr_holidays: improve English in error message
...
bzr revid: rco@openerp.com-20120427072913-fzjimxmt54poax6v
2012-04-27 09:29:13 +02:00
Amit Patel (OpenERP)
d34a4d05be
[IMP/MERGE]:Improved code for hr_holidays and merged lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa
...
bzr revid: apa@tinyerp.com-20120426102718-3r89yvl22zmeooym
2012-04-26 15:57:18 +05:30
Purnendu Singh (OpenERP)
735c6d5946
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120419063305-w5oj03h687trdik2
2012-04-19 12:03:05 +05:30
Amit Patel (OpenERP)
20a9b3aa09
[MERGE]
...
bzr revid: apa@tinyerp.com-20120411045840-tnkzyyfrm9d36xgj
2012-04-11 10:28:40 +05:30
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
fe6e58a40e
[FIX] Propagated ir.needaction class name change.
...
bzr revid: tde@openerp.com-20120403172108-ccvtnt512yexefe1
2012-04-03 19:21:08 +02:00
Thibault Delavallée
1a83aad25c
[FIX] Propagated change from needaction mechanism (from base to ir)
...
bzr revid: tde@openerp.com-20120330134322-ittm7qtsz4loe3ab
2012-03-30 15:43:22 +02:00
Thibault Delavallée
ed87926828
[FIX] need_action_user_ids: now only on validate1 state.
...
bzr revid: tde@openerp.com-20120322132153-ljid4im9m9uoiyjb
2012-03-22 14:21:53 +01:00
Sanjay Gohel (Open ERP)
0b2d045f91
[IMP]hr_holidays: improve in hr holidays form view and list view as per suggestion and reform warning
...
bzr revid: sgo@tinyerp.com-20120316131111-agud3dotpourl7uy
2012-03-16 18:41:11 +05:30
Thibault Delavallée
904e18d1bf
[IMP] hr.holidays: modified get_needaction_user_id -> get_needaction_user_ids to match the new API. Fixed a removed field still present on view. Fixed small sentences.
...
bzr revid: tde@openerp.com-20120315110042-t3tk2w0524gvn3pw
2012-03-15 12:00:42 +01:00
Thibault Delavallée
e2fe93c646
[FIX] hr_holidays: fixed function name change
...
bzr revid: tde@openerp.com-20120313160139-28cei2grildmbo9y
2012-03-13 17:01:39 +01:00
Thibault Delavallée
cbc9654b83
[FIX] hr_holidays: unnecessary ',' causing crash removed
...
bzr revid: tde@openerp.com-20120312115243-f6tos2qqna3li7z0
2012-03-12 12:52:43 +01:00
Thibault Delavallée
86b72a1f80
[IMP] hr_holidays: improved messages (removed record name, as it appears in the message header)
...
bzr revid: tde@openerp.com-20120312115005-k9p5hhxubpi3vtfh
2012-03-12 12:50:05 +01:00
Thibault Delavallée
c2d045df3d
[IMP] hr_holidays: updated to new need_action_user_id
...
bzr revid: tde@openerp.com-20120228171450-tweynl073wf34z9m
2012-02-28 18:14:50 +01:00
Thibault Delavallée
6149b0d995
[IMP] hr_holidays: deleted automatic subscription creation, now delegated to mail.thread (user that creates is automatically subscribed) and message_get_subscribers (manager is always considered as subscribed)
...
bzr revid: tde@openerp.com-20120228140730-xke7ys2j2vcx3ruo
2012-02-28 15:07:30 +01:00
Mayur Maheshwari (OpenERP)
a57180173f
[IMP]hr_holidays: Set a unconfirmed instead of new.
...
bzr revid: mma@tinyerp.com-20120227085307-yxthcol3lwegltgz
2012-02-27 14:23:07 +05:30
Mayur Maheshwari (OpenERP)
ecbc6996e7
[IMP]hr_holidays: Improved button name and state and redonly in confirm and draft
...
bzr revid: mma@tinyerp.com-20120222130638-buhl4qhdto4gpm3j
2012-02-22 18:36:38 +05:30
Thibault Delavallée
bfc8e5e866
[IMP] hr_holidays: propagated changes in subscription mechanism. Also cleaned messages.
...
bzr revid: tde@openerp.com-20120222095950-wnx9qfta5dh4had5
2012-02-22 10:59:50 +01:00
Thibault Delavallée
413df33104
[IMP] Removed space in a note.
...
bzr revid: tde@openerp.com-20120221153903-px8wbaia3y9h4rvg
2012-02-21 16:39:03 +01:00
Thibault Delavallée
a2ef45aaeb
[IMP] hr_holidays: improved notifications, added notifications when creating or refusing a leave requet/allocation.
...
bzr revid: tde@openerp.com-20120220172323-4kqkhxntcgx6g178
2012-02-20 18:23:23 +01:00
Thibault Delavallée
62a33c175a
[FIX] Fixed crash when assigning need_action_user_id to unexistent manager_id for holidays validation
...
bzr revid: tde@openerp.com-20120210102537-rrvk58ttasnfmoqq
2012-02-10 11:25:37 +01:00
Thibault Delavallée
9efc4714f2
[IMP] Wall: added parameters passing (filtering, message number to display, ..). Added My Wall (all feeds versus my feeds).
...
bzr revid: tde@openerp.com-20120209100447-p8csuqq85jsexrdn
2012-02-09 11:04:47 +01:00
Thibault Delavallée
cff98a3aeb
[IMP] Improved ThreadView widget display; cleaned ThreadView widget js code; added basic access rules; added message_mark_done method to clean a mail.thread of its need_action_user_id; added auto-push of notifications if user requested to perform an action is not following the object; added first draft of messaging mechanism in hr_holidays
...
bzr revid: tde@openerp.com-20120208152521-68i4nekjj8mnuyc8
2012-02-08 16:25:21 +01:00
Quentin (OpenERP)
b3f5fa18ff
[FIX] hr_holidays: impossible to create hr_employee in some situations because the functional field set_remaining_days is written
...
lp bug: https://launchpad.net/bugs/908986 fixed
bzr revid: qdp-launchpad@openerp.com-20120103135224-3838ozzghqkmkekj
2012-01-03 14:52:24 +01:00
Fabien Pinckaers
c113b63b4e
[FIX] holidays, mpr bom open all selected
...
bzr revid: fp@tinyerp.com-20111230122811-kdv25gd2at2ps33r
2011-12-30 13:28:11 +01:00
Raphael Collet
cbdf42d104
[FIX] hr_holidays: fix domain in determination of employee leave status
...
bzr revid: rco@openerp.com-20111223090210-v9rmu26fa3mfklp6
2011-12-23 10:02:10 +01:00
fp
8e66fe7f89
[IMP] employee view
...
bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
2011-12-22 23:10:31 +01:00
Fabien Pinckaers
591b929f5d
[IMP] employee leave status info
...
bzr revid: fp@tinyerp.com-20111222142402-bwxyy2xihu76d4p7
2011-12-22 15:24:02 +01:00
Mayur Maheshwari (OpenERP)
b439bc1606
[FIX]All: create an index for the column on require table
...
lp bug: https://launchpad.net/bugs/901474 fixed
bzr revid: mma@tinyerp.com-20111209060308-muefwlr323ji4kk7
2011-12-09 11:33:08 +05:30
Vo Minh Thu
b28f574799
[FIX] clean some warnings.
...
bzr revid: vmt@openerp.com-20111205155510-many34fn09yr58x0
2011-12-05 16:55:10 +01:00
Fabien Pinckaers
0d8097e282
[IMP] proejct_long_term resource leave sync with hr.holidays
...
bzr revid: fp@tinyerp.com-20111114122244-0s6mk2v5vra6q7ng
2011-11-14 13:22:44 +01:00
Quentin (OpenERP)
9d9762042a
[MERGE] lp798739: no translation of warning message in holidays confirmation. Note that this will only work once the server will propagate the context through the workflow triggers
...
bzr revid: qdp-launchpad@openerp.com-20111007104149-j4m9i68ysi4bf14z
2011-10-07 12:41:49 +02:00
Fabien Pinckaers
c4463eb7c1
fix
...
bzr revid: fp@tinyerp.com-20111001230138-qrfjjkyh3ly1iz17
2011-10-02 01:01:38 +02:00
Fabien Pinckaers
5dc1bc2f44
[FIX] hr_holidays
...
bzr revid: fp@tinyerp.com-20111001225958-0d0wi1los2870utr
2011-10-02 00:59:58 +02:00
Rucha (Open ERP)
0e861ae34a
[MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
...
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
ARA (OpenERP)
8485984019
[IMP] fix hr_holiday second validation
...
bzr revid: ara@tinyerp.com-20110920100107-b9gy9n4is2vz6ce1
2011-09-20 15:31:07 +05:30
ARA (OpenERP)
28471e9deb
[IMP] fix hr_holiday second validation
...
bzr revid: ara@tinyerp.com-20110920092942-dgd5nadpbo0zt2gu
2011-09-20 14:59:42 +05:30
ARA (OpenERP)
a2ee569514
[merge] merge with trunk addons
...
bzr revid: ara@tinyerp.com-20110916060758-u23zante59rblo4m
2011-09-16 11:37:58 +05:30
Meera Trambadia (OpenERP)
03f9522bca
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20110916050550-bpqhvf9zw2x0wqyb
2011-09-16 10:35:50 +05:30
Atik Agewan (OpenERP)
53be1a95ef
[ADD] Hr_expense,Hr_holidays,Hr_Recrutment,,Project_issue:Add widget=statusbar in state field.
...
bzr revid: aag@tinyerp.com-20110915054340-i84rf83h7ctkvvu3
2011-09-15 11:13:40 +05:30
Raphael Collet
adafbc707a
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +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
mtr
9784142fe7
[IMP] hr_holidays: removed condition checked for context and context passed in xml
...
bzr revid: mtr@mtr-20110705091525-hm0772szzv6xa3zc
2011-07-05 14:45:25 +05:30
mtr
d93d0aa0fa
[IMP] hr_holidays: passed context as an argument in all the methods()
...
bzr revid: mtr@mtr-20110705071151-lhg6wqbphg9hoysw
2011-07-05 12:41:51 +05:30
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
Mustufa Rangwala
a7e16487e4
[IMP] Hr_holidays: Improve the code by making generic method for context lang get
...
bzr revid: mra@mra-laptop-20110630092905-4ggbh1i7bnm7ibqb
2011-06-30 14:59:05 +05:30
mtr
c2ba873ab8
[IMP] hr_holidays: improved code for translation using context
...
bzr revid: mtr@mtr-20110630083602-au21nsi3yyw97qnp
2011-06-30 14:06:02 +05:30
mtr
5cc4b243b6
[FIX] hr_holidays:-Exception raised on confirmation of leave request is now translated in user's lang.
...
lp bug: https://launchpad.net/bugs/798739 fixed
bzr revid: mtr@mtr-20110628114633-78h4k4q3d8jectjo
2011-06-28 17:16:33 +05:30
Rucha (Open ERP)
8dc08fabe7
[REM,FIX]: hr_holidays: Removed checking for leave types in the get_remaining days function as it was giving error at the time of module installation, no need to put any exception in the function which compute data, it will return 0 if no leave type found
...
bzr revid: rpa@tinyerp.com-20110622125314-mn4jllnsbjwy2sd8
2011-06-22 18:23:14 +05:30
Mantavya Gajjar
9e8eea64c7
[CHANGE]: better to have self then obj
...
bzr revid: mga@tinyerp.com-20110620060434-xu1ds231oyn339kb
2011-06-20 11:34:34 +05:30
Quentin (OpenERP)
833a99d777
[IMP] hr_holidays: code improvements
...
bzr revid: qdp-launchpad@openerp.com-20110610091728-e49r3pq8tey78dhx
2011-06-10 11:17:28 +02:00
mayur maheshwari (Open ERP)
185a3bf824
[IMP]delivery,hr_timesheet,hr_holidays:Improvement is Done
...
bzr revid: mma@tinyerp.com-20110606055814-xa0t1idnl6zuyxy0
2011-06-06 11:28:14 +05:30
mayur maheshwari (Open ERP)
e1d6ace654
[MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-configuration-rework
...
bzr revid: mma@tinyerp.com-20110601125239-xe32ajnl2fkkwd3c
2011-06-01 18:22:39 +05:30
ARA (OpenERP)
9842299e5a
[FIX] merge to main branch
...
bzr revid: ara@tinyerp.com-20110601054201-urr3hdbthef3xymj
2011-06-01 11:12:01 +05:30
ARA (OpenERP)
7ea9fdaa2c
[FIX] hr_holiday: hr_holidays: Second validation
...
bzr revid: ara@tinyerp.com-20110601051941-qijpncs4kcil7ek9
2011-06-01 10:49:41 +05:30
Quentin (OpenERP)
de91919e21
[MERGE] hr_holidays: set legal leaves to employee. merged the branch from aag + improved error message and allow leave request too
...
bzr revid: qdp-launchpad@openerp.com-20110527130904-kfk41z65ghwv97fq
2011-05-27 15:09:04 +02:00
aag (OpenERP)
8c5726ef5f
[IMP]hr_holidayse: raise an error if there are more than 1 leave type with "allow to override limit" = False, also if there is no such leave type
...
bzr revid: aag@tinyerp.co.in-20110527122656-rouugxlm417tj5fp
2011-05-27 17:56:56 +05:30
mayur maheshwari (Open ERP)
67998c4c64
[IMP]base_setup,hr_holidays,POS:Improvement is Done
...
bzr revid: mma@tinyerp.com-20110516125031-wgqpw1lgrk0wv3ew
2011-05-16 18:20:31 +05:30
Rucha (Open ERP)
33d9a30005
[IMP, REF]: base_setup, hr_holidays: Code improvement and refactoring in assign legal leave wizard
...
bzr revid: rpa@tinyerp.com-20110512123920-m82iqsnw0c2v6gqj
2011-05-12 18:09:20 +05:30
aag (OpenERP)
7483f436cf
[ADD]hr_holidays:aad new config wiz -Assign Legal Leaves to Employees
...
bzr revid: aag@tinyerp.co.in-20110512112629-it13t2lgtupum6gk
2011-05-12 16:56:29 +05:30
Quentin (OpenERP)
f9a1e706a8
[MERGE] lp:767238
...
bzr revid: qdp-launchpad@openerp.com-20110427080332-qdwytwgd97ekj35v
2011-04-27 10:03:32 +02:00
pso (OpenERP)
6812297887
[IMP] hr_holidays: Improved search, tree view of holiday and onchange method
...
bzr revid: pso@tinyerp.com-20110426064116-47pn4y5yuifsbjmg
2011-04-26 12:11:16 +05:30
pso (OpenERP)
bcbccd8eb8
[FIX] hr_holidays: Wrong allocation request created when allocating holidays per category of employee
...
lp bug: https://launchpad.net/bugs/767238 fixed
bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
2011-04-26 11:07:14 +05:30
Husen Daudi
2819a946b7
fixed typo and constraint
...
bzr revid: hda@hda-laptop-20110419065236-ugsbpsnu0myg3qs6
2011-04-19 12:22:36 +05:30
psi (Open ERP)
3e2d509684
[FIX] hr_holidays: Improve _sql_constraint and help
...
bzr revid: psi@tinyerp.co.in-20110419054451-7ien3mqbaqooozj3
2011-04-19 11:14:51 +05:30
Husen Daudi
baf94ebf97
fixed workflow instance problem in hr_holidays
...
bzr revid: hda@hda-laptop-20110418110437-875ee2zci9s09ghk
2011-04-18 16:34:37 +05:30
ARA (OpenERP)
2199cd7f34
[FIX] hr_holiday: The Flow of Hr Holiday is working Wrong, it should Got to end at end but not to Second_validation or refuse.
...
bzr revid: ara@tinyerp.com-20110418092007-nus4n0g7lexwh7j1
2011-04-18 14:50:07 +05:30
Mustufa Rangwala
4429813887
[IMP] Holidays: State field tooltips
...
bzr revid: mra@mra-laptop-20110414101532-jceuzg8bx0el02p7
2011-04-14 15:45:32 +05:30
ARA (OpenERP)
9d1c65eb21
[FIX] hr_holidays: Second validation
...
bzr revid: ara@tinyerp.com-20110329113117-yxldstrlmf4x0mpn
2011-03-29 17:01:17 +05:30
ARA (OpenERP)
a3a1034596
[FIX] hr_holidays: Second validation
...
bzr revid: ara@tinyerp.com-20110324111833-fc0hk683vntzmetl
2011-03-24 16:48:33 +05:30
ARA (OpenERP)
b71aa291ba
[FIX] hr_holidays: Second validation
...
lp bug: https://launchpad.net/bugs/732419 fixed
bzr revid: ara@tinyerp.com-20110322100447-ey5tkdusd3l76at5
2011-03-22 15:34:47 +05:30
ARA (OpenERP)
b62f16753d
[FIX] hr_holidays: Can not refuse leave if its category is by employee category
...
lp bug: https://launchpad.net/bugs/731795 fixed
bzr revid: ara@tinyerp.com-20110310095432-s4q9ijdf21gp77sg
2011-03-10 15:24:32 +05:30
Mustufa Rangwala
19cf9e1054
[IMP] hr_holidays: case_id on holidays object type changed from char to m2o (crm.meeting)
...
bzr revid: mra@mra-laptop-20110201124038-fwehl3uq7qo3tp6v
2011-02-01 18:10:38 +05:30
Mustufa Rangwala
60ac3e49e1
[FIX] hr_holidays: can not refuse an approved holidays => due to case_id was char
...
lp bug: https://launchpad.net/bugs/709130 fixed
bzr revid: mra@mra-laptop-20110131064845-2joefqn4oqh1gob1
2011-01-31 12:18:45 +05:30
Thibault Francois
4de0ca454d
[IMP,FIX] calendar, recurrent meeting now work correctlty, Finally grep -Rn -A 2 -B 2 --include=*.py print .
...
bzr revid: tfr@openerp.com-20110118223502-ws1rruwjrajv1xwz
2011-01-18 23:35:02 +01:00
Sbh (OpenERP)
922f7caae0
[Fix] Fix buildbot warning
...
bzr revid: sbh@tinyerp.com-20101230060952-p0ehq3mgx7cpbfqw
2010-12-30 11:39:52 +05:30
Fabien Pinckaers
65b33b9489
[FIX] Cleaning hr holidays reporting and dashbaords
...
bzr revid: fp@tinyerp.com-20101229165130-jfr2h23jo7mrjqzu
2010-12-29 17:51:30 +01:00
Fabien Pinckaers
0a7c9c6ee2
[FIX] complete rewrite for clean up of hr_holidays
...
bzr revid: fp@tinyerp.com-20101229124123-7tt4ttk3jmkispw7
2010-12-29 13:41:23 +01:00
qdp-launchpad@tinyerp.com
d6451e011d
[FIX] hr_holidays: allocation request by category fixed
...
bzr revid: qdp-launchpad@tinyerp.com-20101220094513-i8glqkv8z0jcjx77
2010-12-20 10:45:13 +01:00
Mustufa Rangwala
b0f61a9546
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
uco (OpenERP)
d827b2f6ea
[REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
...
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
Mustufa Rangwala
8319012fca
[FIX] hr_holidays: bad behaviour of allocation requests by categories
...
lp bug: https://launchpad.net/bugs/680487 fixed
bzr revid: mra@mra-laptop-20101209055040-ydvesuocrt0lvc9a
2010-12-09 11:20:40 +05:30
uco (OpenERP)
097ff85deb
[MERGE]: Merged with trunk-addons.
...
bzr revid: uco@tinyerp.com-20101123071135-712ya21x2v77mn36
2010-11-23 12:41:35 +05:30
uco (OpenERP)
12fcd1be2f
[IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
...
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Olivier Dony
e1d9d1d6c6
[FIX] stock,hr,pos,project,...: cleanup some calls to _( ) - only literal strings should ever been used!
...
bzr revid: odo@openerp.com-20101119122003-4r52xuupedyhgmcx
2010-11-19 13:20:03 +01:00
qdp-launchpad@tinyerp.com
a4a0a99f0c
[FIX] hr_holidays: typo fixed
...
bzr revid: qdp-launchpad@tinyerp.com-20101110112009-lxa40bj0y1x1d32d
2010-11-10 12:20:09 +01:00
Mustufa Rangwala
17a5fd4ee8
[REF]
...
bzr revid: mra@mra-laptop-20101027131019-mx6r2q7fgpnkh0sb
2010-10-27 18:40:19 +05:30
vth
cd8e9de724
[REF] hr_*
...
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
2010-10-27 18:19:59 +05:30
Fabien Pinckaers
130f43b1d9
[FIX] misc fixes from xrg
...
bzr revid: fp@tinyerp.com-20101017222708-71xbvzflx6pe797v
2010-10-18 00:27:08 +02:00
Fabien Pinckaers
b3a6611ee0
[IMP] better useability
...
bzr revid: fp@tinyerp.com-20101012215940-yvnh0sog8voxiz85
2010-10-12 23:59:40 +02:00
Vir (Open ERP)
a141d983d9
[MOD] hr_* : applied changes from usability branch
...
bzr revid: vir@tinyerp.com-20101008132247-3m1ff2ngm3im61pn
2010-10-08 18:52:47 +05:30
Vir (Open ERP)
54982725c8
[Merge]
...
bzr revid: vir@tinyerp.com-20100923044025-scructxgs60rbbdb
2010-09-23 10:10:25 +05:30
olt@tinyerp.com
627afe0258
[IMP] hr_holidays: hr.holidays.status: performance improvement: move sql query outside the loop
...
bzr revid: olt@tinyerp.com-20100922082353-kf95hdpfwzxtfoj6
2010-09-22 10:23:53 +02:00
DBR (OpenERP)
ec32dee73b
[MOD]hr_holidays : usability improvement
...
bzr revid: dbr@tinyerp.com-20100906104748-g8i4tbp6azddo4rt
2010-09-06 16:17:48 +05:30
AMP (OpenERP)
973cac1c4a
[MOD]hr_holidays : usability improvement
...
bzr revid: amp@tinyerp.com-20100906094754-gvn1ww01h0m461b2
2010-09-06 15:17:54 +05:30
psi (Open ERP)
da787061db
[IMP] hr_* Clean the code
...
bzr revid: psi@tinyerp.co.in-20100826045204-lxfawwkq2be62e8s
2010-08-26 10:22:04 +05:30
RHA (Open ERP)
d5ad0b8ff1
[CLEAN]: Removed commented codes, unnecessary spaces.
...
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
vra
279d41f156
[FIX][ADD][IMP] hr_holidays: fixed the used 'category_ids'(M2M) field of employee, Added calendar view of Leave Request Object, Improved the menu string.
...
bzr revid: vra@tinyerp.com-20100812072802-89kthus9a1ewqbop
2010-08-12 12:58:02 +05:30
PSI(Openerp)
0f42beb105
[FIX] hr_holidays: if there is not employee on allocation request
...
bzr revid: mra@mra-laptop-20100802103153-q98sm13e63d5hus3
2010-08-02 16:01:53 +05:30
PSI(Openerp)
b24856fd7a
[IMP] hr related modules changes
...
bzr revid: mra@mra-laptop-20100728123948-5v34vtjrxckvig14
2010-07-28 18:09:48 +05:30
PSI (OpenERP)
4b1348a989
[IMP] hr related modules improvements
...
bzr revid: mra@mra-laptop-20100727071145-4n3z9i1jj1zosp8z
2010-07-27 12:41:45 +05:30
Mustufa Rangwala
c179005fc7
[IMP] Clean hr_* module (Still need to done)
...
bzr revid: mra@mra-laptop-20100703102152-4ulrrzbkorpd7xei
2010-07-03 15:51:52 +05:30
vra
bf8d2a73c0
[IMP][REF] Sql-injection changes, remove print statement, some space improvement.
...
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
mra (Open ERP)
41d68124f2
[IMP] hr_holidays: search view of holidays minir improve
...
bzr revid: mra@tinyerp.com-20100526101925-me6z7t6bt9eq0s6a
2010-05-26 15:49:25 +05:30
mra (Open ERP)
f1d7c9a0a3
[IMP] hr_holidays: improve code: Made separate method for creating and removing resoure leave
...
bzr revid: mra@tinyerp.com-20100526095456-l4vxnyrszenx2e8v
2010-05-26 15:24:56 +05:30
psi (Open ERP)
46c1bd4e24
[IMP] hr_holidays: Improve view and change in demo data
...
bzr revid: psi@tinyerp.co.in-20100524073052-0gumt324nzs34wsr
2010-05-24 13:00:52 +05:30
psi (Open ERP)
174162b344
[IMP] hr_holidays: Bug fix and Improve demo data
...
bzr revid: psi@tinyerp.co.in-20100521134658-wo4egxgfu57qk6c2
2010-05-21 19:16:58 +05:30
psi (Open ERP)
e22621085b
[IMP] hr_holidays: Improve views and misc changes
...
bzr revid: psi@tinyerp.co.in-20100521105815-nksa5emczxbal238
2010-05-21 16:28:15 +05:30
psi (Open ERP)
48e2594272
[IMP] hr_holidays: Improve demo data, hr_timesheet_invoice:Imoprove search view
...
bzr revid: psi@tinyerp.co.in-20100521064654-buj0bu0pwaxfj8eu
2010-05-21 12:16:54 +05:30
psi (Open ERP)
7be3eedde5
[ADD] hr_holidays: Added demo data and improve search view
...
bzr revid: psi@tinyerp.co.in-20100520112131-9knxyo6soclkzt32
2010-05-20 16:51:31 +05:30
mra (Open ERP)
38dd957438
[MERGE] Merge with main branch
...
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
Fabien Pinckaers
a3dd9f05dc
[FIX] 3 security rules, [IMP] object names for logs
...
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
Jay (Open ERP)
206aad724a
[BACKPORT] Stable fixes and refactorings to trunk
...
bzr revid: jvo@tinyerp.com-20100519155731-ihlx53vj31ni7d01
2010-05-19 21:27:31 +05:30
Jay (Open ERP)
50724c0a0f
[MERGE] MErged from main branch
...
bzr revid: jvo@tinyerp.com-20100519145940-s8tk9v6lmxkp6idg
2010-05-19 20:29:40 +05:30
mra (Open ERP)
7f5c8bc140
[IMP] hr_holidays: now it will create entry in resouce.cal.leaves if request is for category wise => it will search all employee in category and create leaves for each
...
bzr revid: mra@tinyerp.com-20100518104030-3widlfi7j4zviqhv
2010-05-18 16:10:30 +05:30
mra (Open ERP)
f065d01dfc
[IMP] hr: Add category field on employee form view
...
[FIX] hr_holidays: fix some errors
bzr revid: mra@tinyerp.com-20100518062616-wgvs7cv6gq14n9ee
2010-05-18 11:56:16 +05:30
mra (Open ERP)
adb80ffeb4
[MERGE] Merge with main branch
...
bzr revid: mra@tinyerp.com-20100517045150-h7n3ob8hv40ep4pj
2010-05-17 10:21:50 +05:30
vra
4df75b6474
[MERGE] merged from trunk main addons branch
...
bzr revid: vra@tinyerp.com-20100517042328-l25ofg3t0kioeuep
2010-05-17 09:53:28 +05:30
Julien Thewys
1b559b75b3
[REF] Removed unused imports.
...
bzr revid: jth@openerp.com-20100514154102-z1vwoyyzeaz2i5t5
2010-05-14 17:41:02 +02:00
Julien Thewys
c39cf90a90
[REF] redefined a dict with a dict literal
...
bzr revid: jth@openerp.com-20100514152516-rd70n272tzp0ue0y
2010-05-14 17:25:16 +02:00
Julien Thewys
27409d9bc2
[REF] factored onchange_date_to
...
bzr revid: jth@openerp.com-20100514152219-v9nmmkt1fy734mfj
2010-05-14 17:22:19 +02:00
Julien Thewys
1cf2760087
[REF] extract difference of datetime string as a method
...
bzr revid: jth@openerp.com-20100514151857-pdyiq7cr9eto486b
2010-05-14 17:18:57 +02:00
Julien Thewys
5709d04ce1
[FIX] fixed variable initialization
...
bzr revid: jth@openerp.com-20100514144647-pal5y6ubndtz0oai
2010-05-14 16:46:47 +02:00
mra (Open ERP)
8cc68f9e66
[IMP] hr_holidays: Workflow with second validator
...
bzr revid: mra@tinyerp.com-20100514091331-iafdwpxf958lrm5j
2010-05-14 14:43:31 +05:30
vra
db8bacf126
[MERGE] merged from trunk main addons branch
...
bzr revid: vra@tinyerp.com-20100513052734-3uw250l2lmnmykr2
2010-05-13 10:57:34 +05:30
mra (Open ERP)
47ad2debc5
[MERGE]
...
bzr revid: mra@tinyerp.com-20100513045245-q9rgkzbbr9b0f1jt
2010-05-13 10:22:45 +05:30
Fabien Pinckaers
a15093819a
merge
...
bzr revid: fp@tinyerp.com-20100512170920-0mgiujrnhkt5t6z7
2010-05-12 19:09:20 +02:00
mra (Open ERP)
ced16487d9
[IMP] hr_holidays: unlink resource leave at the time of cancel/delete
...
[IMP] resource: improve view
bzr revid: mra@tinyerp.com-20100511122851-yz9pb12mfzue6e8c
2010-05-11 17:58:51 +05:30
JMA (OpenERP)
f495432c7f
[FIX] Hr_holidays : Constraint corrected for Holidays request(start date cannot be greater than end date)
...
bzr revid: jma@tinyerp.com-20100511103248-g1s0vdpkh30w1v99
2010-05-11 16:02:48 +05:30
mra (Open ERP)
ee2e1acc78
[FIX] hr_holidays: double validation
...
bzr revid: mra@tinyerp.com-20100511095944-yec60szfohq295t7
2010-05-11 15:29:44 +05:30
mra (Open ERP)
f0c3f1ba59
[IMP] hr_holidays: put a boolean on the holiday type like 'double-validation holiday type', means this leave type will have to be validated by 2 people => the workflow have to be adapted (one more activity, automatic transition if boolean = false), there should be a new state for the object, there should also be a second 'validator' (m2o: user_id) that is saved when the leave/allocation is validated the second time
...
bzr revid: mra@tinyerp.com-20100510105832-pixohghomphs57c4
2010-05-10 16:28:32 +05:30
mra (Open ERP)
b440209425
[IMP] hr_holidays
...
bzr revid: mra@tinyerp.com-20100510050956-o8hs4lqv9id3x5nw
2010-05-10 10:39:56 +05:30
mra (Open ERP)
1eeb22c582
[IMP] hr_holidays: onchange on holiday/allocatio type
...
bzr revid: mra@tinyerp.com-20100510045649-kd0ui26wrde9olqp
2010-05-10 10:26:49 +05:30
mra (Open ERP)
5b48fdc693
[IMP] hr_holidays: View improve
...
bzr revid: mra@tinyerp.com-20100510042853-ksgde7tujosdklfj
2010-05-10 09:58:53 +05:30
mra (Open ERP)
418ac79d94
[FIX] hr_holidays: Small fix
...
bzr revid: mra@tinyerp.com-20100510035307-enrmmdem5e0d795q
2010-05-10 09:23:07 +05:30
mra (Open ERP)
59ae3500aa
[IMP] hr_holidays: currently we can make holiday/allocation request for one employee or for all employees. We also need to be able to select a category of employee (senior developers, sale departement employees, indian workers...) to make an holiday/allocation request
...
bzr revid: mra@tinyerp.com-20100505121858-52hyoatt80hmqtjq
2010-05-05 17:48:58 +05:30
mra (Open ERP)
3dade4254f
[IMP] hr_holidays: Improve code
...
bzr revid: mra@tinyerp.com-20100504111918-h39dbg6hpno86uda
2010-05-04 16:49:18 +05:30
Stephane Wirtel
5142d98b30
[FIX] Remove the executable flag on the python and xml files
...
bzr revid: stephane@openerp.com-20100429080154-kmn18r5kci0uq84u
2010-04-29 10:01:54 +02:00
mra (Open ERP)
8896febf11
[FIX] hr_holidays: if there is employee has no user (computing hours on holiday status)
...
bzr revid: mra@tinyerp.com-20100416130503-eldr1mqv6mt9kpdf
2010-04-16 18:35:03 +05:30
Fabien Pinckaers
c095986949
[IMP] Hr improvements
...
bzr revid: fp@tinyerp.com-20100407104120-2wn2e6sz52ipk3dm
2010-04-07 12:41:20 +02:00
Fabien Pinckaers
185277bdff
[IMP] improvements in hr modules
...
bzr revid: fp@tinyerp.com-20100407095457-ufpmz8rrdu7i39cx
2010-04-07 11:54:57 +02:00
Fabien Pinckaers
d9a506bb4c
merge
...
bzr revid: fp@tinyerp.com-20100406161510-u7t9vi4kxlm30l6y
2010-04-06 18:15:10 +02:00
mra (Open ERP)
d4f105df69
Merge with main branch
...
bzr revid: mra@tinyerp.com-20100322115529-e74miwjdolyba418
2010-03-22 17:25:29 +05:30
mra (Open ERP)
73aeefb0a3
merge with main branch
...
bzr revid: mra@tinyerp.com-20100317143933-n3k55ixfqgc6iwan
bzr revid: mra@tinyerp.com-20100318045146-p9khp3ilkz8ugt34
bzr revid: mra@tinyerp.com-20100318045602-6u5c66thniva7fc1
2010-03-18 10:26:02 +05:30
mra (Open ERP)
1ca89e906d
[IMP] hr_holidays: search view for holiday per user and rename files
...
bzr revid: mra@tinyerp.com-20100317130209-yyy28bbpj0pa0p8x
2010-03-17 18:32:09 +05:30