Commit Graph

249 Commits

Author SHA1 Message Date
Fabien Pinckaers 574405bed8 [MERGE] HR fixes
bzr revid: fp@tinyerp.com-20121108092451-2jk31s913mrat1jm
2012-11-08 10:24:51 +01:00
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
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
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 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
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
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
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
Antony Lesuisse 6dd16f2613 [MERGE] trunk
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
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
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
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 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
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
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
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
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
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
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) 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
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
Fabien Pinckaers b531d9cff1 [IMP] needaction after mail.thread
bzr revid: fp@tinyerp.com-20120822153145-g7xopqq7oje7y60c
2012-08-22 17:31:45 +02:00
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
Harry (OpenERP) a3389fcd17 [MERGE]
bzr revid: hmo@tinyerp.com-20120817115338-tk0tnwkz6y54mk6b
2012-08-17 17:23:38 +05:30
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
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
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
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
Meera Trambadia 5349f0ec20 [MERGE] with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20120813061514-57qe2sg7tmjzg16j
2012-08-13 11:45:14 +05:30
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