c6d029b263
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120612050628-2la1082qfg9sb0g5
2012-06-12 10:36:28 +05:30
a1cdf8f67c
[MERGE] merge with main addons
...
bzr revid: mma@tinyerp.com-20120611124531-k0nkhqn0513ndmej
2012-06-11 18:15:31 +05:30
204ce4380a
[MERGE] merged with the trunk
...
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
2012-06-11 14:42:11 +02:00
9a7573dd7f
[IMP] removing layout="manual"
...
bzr revid: fp@tinyerp.com-20120611090701-57jr0v6oxnbuocwc
2012-06-11 11:07:01 +02:00
c79a905cdc
[MERGE] Merge report changes
...
bzr revid: sbh@tinyerp.com-20120611064212-s0gi68zw9q1yyuup
2012-06-11 12:12:12 +05:30
1d5f3debbb
[IMP] hr_recruitmentimprove
...
bzr revid: pna@tinyerp.com-20120611054603-5gph89jeahglcu08
2012-06-11 11:16:03 +05:30
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
3c8643ce4c
[IMP] better form views, new guidelines
...
bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
2012-06-09 16:39:04 +02:00
b1ea5e4c97
[IMP] replace footer by divs for chatter
...
bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
2012-07-13 11:53:41 +02:00
18765c5880
[IMP]hr_holidays: change yml
...
bzr revid: kjo@tinyerp.com-20120608084911-6lk2p6a2rayj1ty1
2012-06-08 14:19:11 +05:30
ba02676837
[MERGE]
...
bzr revid: sbh@tinyerp.com-20120608081300-yg4stmqa2af7275h
2012-06-08 13:43:00 +05:30
8a670326ab
[IMP]hr_holidays: link meeting to leave request
...
bzr revid: kjo@tinyerp.com-20120608063755-vviuq755hjl52c8n
2012-06-08 12:07:55 +05:30
8bae4426c6
[IMP]set string leaves to report
...
bzr revid: kjo@tinyerp.com-20120608053432-aev1g1td5qxcn1hp
2012-06-08 11:04:32 +05:30
001d2e84c9
[IMP] form views
...
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
6fc261d231
[IMP]hr:change report name and Leave instead of Holiday
...
bzr revid: kjo@tinyerp.com-20120607132146-gs9m2famzymlsq1f
2012-06-07 18:51:46 +05:30
26077a769b
[IMP] hr_recruitmentimprove tooltips,hr menu
...
bzr revid: pna@tinyerp.com-20120607093153-jw6binjlkqzcils8
2012-06-07 15:01:53 +05:30
cfce82898b
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120605122830-r3o25y55lzo0o73n
bzr revid: psi@tinyerp.com-20120606103845-w2jftpw5jw706pgo
2012-06-06 16:08:45 +05:30
0cd492bb67
[IMP] improved code in .pot files in hr reated modules
...
bzr revid: tpa@tinyerp.com-20120606101438-qk5mctjef85ltffh
2012-06-06 15:44:38 +05:30
a28952a6b2
[IMP] hr:improved view of dashboard
...
bzr revid: tpa@tinyerp.com-20120606100017-6h4gzyug5o74yxjq
2012-06-06 15:30:17 +05:30
694ac5345f
[IMP] improved code
...
bzr revid: tpa@tinyerp.com-20120606093954-jz37e8dn3strmtra
2012-06-06 15:09:54 +05:30
05337fa8e7
[IMP] hr_holidays:remove unnecessary code
...
bzr revid: tpa@tinyerp.com-20120606085825-mam2fm5lxbzm4lba
2012-06-06 14:28:25 +05:30
892ed6691a
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120606061239-gmgiybdoja72rb4j
2012-06-06 11:42:39 +05:30
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
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
b71c7c244d
[MERGE] merge with parent brnach
...
bzr revid: ara@tinyerp.com-20120605072734-eqg19sd93rj5yftg
2012-06-05 12:57:34 +05:30
48f8823bad
[IMP] replaced all oe_form_topbar with the new <header> style
...
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
623fd428bd
[IMP] xml of topbars, removed oe_right, oe_clear
...
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
dff4b2f2a0
[Merge] Merge with main branch.
...
bzr revid: mdi@tinyerp.com-20120604063834-jbfyvot5fjvc4pz7
2012-06-04 12:08:34 +05:30
2a2ab5fd4d
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120601135532-dz42z4bfnp83kh6s
2012-06-01 15:55:32 +02:00
e98eb11510
[Merge] Merge with main branch.
...
bzr revid: mdi@tinyerp.com-20120601094937-575f84vxwljlgkpv
bzr revid: mdi@tinyerp.com-20120601123900-0ozu8nlq02upa8xb
bzr revid: mdi@tinyerp.com-20120601124121-oz0cr3gv4acejs7b
2012-06-01 18:11:21 +05:30
cd19f68eb9
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120601113625-c9w0kmnw1dzvjswx
2012-06-01 13:36:25 +02:00
bdeb623399
[IMP]: resolved all conflicts
...
bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
2012-05-30 19:00:24 +05:30
b68e86b89c
[IMP] hr_holidays: small improvemnt in kanban or employee
...
bzr revid: psi@tinyerp.com-20120530122912-vqzv3q39yvdxj7qm
2012-05-30 17:59:12 +05:30
668f7d850e
[Fix] : hr_holidays: fix report
...
bzr revid: sbh@tinyerp.com-20120530114607-utfx979m1hb85nff
2012-05-30 17:16:07 +05:30
89866886dd
[MERGE] report imporverment
...
bzr revid: sbh@tinyerp.com-20120530060345-lwj8t5ax6wv1df2d
2012-05-30 11:33:45 +05:30
e36af38e37
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120530054016-6q4d0dsqssxwjkwr
2012-05-30 11:10:16 +05:30
7a7661fa79
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120530052856-dk8mfa6h6i5shs95
2012-05-30 10:58:56 +05:30
136e453e1d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120529125227-gdu1kao0kjcxviv8
2012-05-29 18:22:27 +05:30
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
437dc742c8
[MERGE] merged with the trunk
...
bzr revid: qdp-launchpad@openerp.com-20120529083927-cjg1og3hx7l6xdc7
2012-05-29 10:39:27 +02:00
49c26f020d
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120529043934-wmk13xue3g92h914
2012-05-29 10:09:34 +05:30
d18cb96c97
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120528062205-ukjcxs41f917dsk2
2012-05-28 11:52:05 +05:30
1227741b5a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120526050749-nakl3x59zsy0e3ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120527044006-4kmo9posveuumgsz
2012-05-27 04:40:06 +00:00
f79e8740b3
[IMP] hr_holiday: improve holiday report
...
bzr revid: ara@tinyerp.com-20120524123536-12qllmpfblgzi5c3
2012-05-24 18:05:36 +05:30
ce24cc113d
[MERGE] Merge menu changes
...
bzr revid: sbh@tinyerp.com-20120524105938-iqkd2k13ht6w8381
2012-05-24 16:29:38 +05:30
9a99ce2577
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120524100259-5hyz4r5jkmnbao2t
2012-05-24 15:32:59 +05:30
7090589834
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120524092830-gim1851y6ie58ge4
2012-05-24 14:58:30 +05:30
848dcabcae
[MERGE] Mere with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120524052633-nsq0nfj5mh7xa9s6
2012-05-24 10:56:33 +05:30
47cc03c954
[MERGE] merge with main addons
...
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
7418558d1d
[IMP] : removed button from tree
...
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
a61bdccb23
[IMP] hr_holidays : Rename 'Approved' into 'Validate'.
...
bzr revid: mdi@tinyerp.com-20120523092828-vmigxxqv71zqhx4l
2012-05-23 14:58:28 +05:30
bd9a28164e
[IMP] hr_holidays : Rename 'Approved' into 'Validate'.
...
bzr revid: mdi@tinyerp.com-20120523092601-9zvf1ly3ndjh9n8f
2012-05-23 14:56:01 +05:30
99110a63e0
[MERGE] merge with main addong
...
bzr revid: psi@tinyerp.com-20120523065342-zqted3y2ke5kq7fo
2012-05-23 12:23:42 +05:30
5a78049c7a
[merge] removed complexity and update applications
...
bzr revid: fp@tinyerp.com-20120523063913-kn324m7u80o5dgol
2012-05-23 08:39:13 +02:00
2a6ff8b22e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120523063832-qwevi2f4caymrczo
2012-05-23 12:08:32 +05:30
135790bb6f
[MERGE] Merge hr_holidays improverment
...
bzr revid: sbh@tinyerp.com-20120523061806-g36ezzvr02py6ewr
2012-05-23 11:48:06 +05:30
1bc1b8817e
[MERGE] Merge with lp:openobject-adddons
...
bzr revid: sbh@tinyerp.com-20120523045707-rxt3uirdycmb3bxj
2012-05-23 10:27:07 +05:30
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
84d7f79b97
[IMP] view hr
...
bzr revid: fp@tinyerp.com-20120522145654-su2hud7tjoglo0bl
2012-05-22 16:56:54 +02:00
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
289cc2d9d2
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20120522125704-5fh2rvqb56qp9vci
2012-05-22 18:27:04 +05:30
1631dd2831
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120522110600-xk507cocya0xj13s
2012-05-22 16:36:00 +05:30
f4ef4460c2
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120522103754-qvz1rqmzfpywc6yq
2012-05-22 16:07:54 +05:30
b3fa4ccf5c
[IMP] removed icons from topbar
...
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
bfd9bb3227
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120522090313-fjfefxm84qq682aj
2012-05-22 14:33:13 +05:30
ee566d388c
[IMP] merged topbar status widgets
...
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
a6309fd120
[IMP] hr_holidays : Removed all filters related to a date field and added the related date field in the search view.
...
bzr revid: mdi@tinyerp.com-20120522070824-rzi5go9rxcoq0u73
2012-05-22 12:38:24 +05:30
b2e3ee066c
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120522055605-57264cmquj0ojcwi
2012-05-22 11:26:05 +05:30
c31a54334c
[FIX] fixing default_context
...
bzr revid: fp@tinyerp.com-20120521160745-4bir71koyn0vqgww
2012-05-21 18:07:45 +02:00
3d3810ce52
[IMP] hr_holidays : added missing filter string in search view.
...
bzr revid: mdi@tinyerp.com-20120521110723-60b2zyu784pwxdp0
2012-05-21 16:37:23 +05:30
398bb1ff50
[IMP] hr_holiday:improve leave report color,tooltips
...
bzr revid: pna@tinyerp.com-20120521054607-74ou4uplze3astxg
2012-05-21 11:16:07 +05:30
38d3044665
[IMP]hr_holidays:Improve leave tooltip for date
...
bzr revid: dbr@tinyerp.com-20120518114550-bo8dh6hbsh53wxii
2012-05-18 17:15:50 +05:30
bf406c4af7
[IMP]hr_holidays: remove extra import
...
bzr revid: dbr@tinyerp.com-20120518095544-u0qrrgaaqmc4cbhg
2012-05-18 15:25:44 +05:30
17c776c2eb
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20120518084522-enysb9wuzo22g1bs
2012-05-18 14:15:22 +05:30
ea859f54c8
[IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
...
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
f33d8657dc
[FIX]hr_holidays: yml error
...
bzr revid: dbr@tinyerp.com-20120517131156-3mnula9bxi79zj3s
2012-05-17 18:41:56 +05:30
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
7af37ce79a
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120517105752-w0t9w57tifokahy4
2012-05-17 16:27:52 +05:30
1aefff9733
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
1110db0e15
[IMP] crm,project_issue,hr_holiday: set chatter widget out of sheet.
...
bzr revid: tpa@tinyerp.com-20120516051329-w1o4es2e8v02impw
2012-05-16 10:43:29 +05:30
e51ed975f3
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120516043048-pkd9klih8jdszhni
2012-05-16 10:00:48 +05:30
9c6f104d86
[MERGE] trunk-v62_config (improve and complete new config wizards)
...
bzr revid: rco@openerp.com-20120515144630-j6qltq8e2t7grxj2
2012-05-15 16:46:30 +02:00
11edf8df8a
[IMP] change HR Menu
...
bzr revid: kjo@tinyerp.com-20120515114538-cja1xnu64scpm0um
2012-05-15 17:15:38 +05:30
bcb9291df3
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120514150926-osvdmdyopi6ynn6o
2012-05-14 17:09:26 +02:00
3a5b1451b7
[MERGE] Merge lp:~openerp-dev/openobject-addons/trunk-social-mail-tpa
...
bzr revid: sbh@tinyerp.com-20120514112710-1xnsgtcqmdwhtqxv
2012-05-14 16:57:10 +05:30
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
f08d7c254b
[IMP]hr_holidays:remove record rules
...
bzr revid: dbr@tinyerp.com-20120509101248-yu48ybdqsuu8fgiz
2012-05-09 15:42:48 +05:30
76ce881d6f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120504044840-505sxjoihfqr4x0l
bzr revid: launchpad_translations_on_behalf_of_openerp-20120505045936-rx0p190197d1bq0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20120506044017-qupu24vf9bszplh5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120507043800-grn7tzljb87p5bjz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120508045005-8931hacxfzh20c6v
bzr revid: launchpad_translations_on_behalf_of_openerp-20120509044729-cbfq7nw8do0h3va4
2012-05-09 04:47:29 +00:00
341e8845d5
[IMP]crm,hr: Fix the crm opt_out field problem and set Employee group for leave_id field in kanban view
...
bzr revid: dbr@tinyerp.com-20120507092027-gnqcqpzaa6ese1x8
2012-05-07 14:50:27 +05:30
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
0084eaf11a
[MERGE]
...
bzr revid: apa@tinyerp.com-20120504052231-20w8wuc54mvbo4yw
2012-05-04 10:52:31 +05:30
600cd72161
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-setting-configuration-improvements
...
bzr revid: jap@tinyerp.com-20120503093442-uhsinec2sh8oo54w
2012-05-03 15:04:42 +05:30
d1147c51e9
[IMP]
...
bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
2012-05-01 18:04:46 +05:30
5de1e8d561
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120430122540-haxtywb5gjy16qle
2012-04-30 17:55:40 +05:30
5472a85b28
[MERGE]
...
bzr revid: apa@tinyerp.com-20120427105446-80dp19jsboes2n7c
2012-04-27 16:24:46 +05:30
7dbf665c5d
[IMP] HR: Rename field in configuration wizard of hr application, add new field and change the position of field
...
bzr revid: jap@tinyerp.com-20120427104359-4r9cwx0637y57f0g
2012-04-27 16:13:59 +05:30
f80cbc8dd9
[IMP] hr_holidays: remove invisible tag on approval button
...
bzr revid: rco@openerp.com-20120427093122-6uq0g5x80ss2740p
2012-04-27 11:31:22 +02:00
d75f80e0e9
[IMP] hr_holidays: improve English in error message
...
bzr revid: rco@openerp.com-20120427072913-fzjimxmt54poax6v
2012-04-27 09:29:13 +02:00
41057fed10
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120426143728-5n5b9wo6unnbeb5x
2012-04-26 16:37:28 +02:00
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
603085bc7e
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa
...
bzr revid: tpa@tinyerp.com-20120426063457-bthoapv1xt1ll7yp
2012-04-26 12:04:57 +05:30
01a55597b3
[IMP] Improved view of allocation request
...
bzr revid: tpa@tinyerp.com-20120426050223-1e22zbue2es6qfka
2012-04-26 10:32:23 +05:30
f2801c6071
[IMP] Improved view of leave request
...
bzr revid: tpa@tinyerp.com-20120426044951-5qfdb1itenm2afux
2012-04-26 10:19:51 +05:30
e4efcb808d
[IMP] hr*: remove group_extended
...
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
4e1ee61eec
[IMP] rename field message_ids_social to message_ids.
...
bzr revid: tpa@tinyerp.com-20120420112605-cctm0yw34vedqco8
2012-04-20 16:56:05 +05:30
f0b5466bca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120420044325-kyb2a8gptkwbales
2012-04-20 04:43:25 +00:00
b657cdb967
[IMP]hr_recruitment, hr_holidays: add treeview fonts bold
...
bzr revid: kjo@tinyerp.com-20120419100855-7tomt33drutwkpvy
2012-04-19 15:38:55 +05:30
2a6a022d03
[IMP] remove conflicts
...
bzr revid: psi@tinyerp.com-20120419090708-ezvbeb00093ojkrt
2012-04-19 14:37:08 +05:30
735c6d5946
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120419063305-w5oj03h687trdik2
2012-04-19 12:03:05 +05:30
75daaf4123
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043835-l1vrldcmgh9o6s0c
2012-04-19 04:38:35 +00:00
79c1e97479
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044206-a2vk0nr789l7d42j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418045743-hzbql3f1knlrc5yh
2012-04-18 04:57:43 +00:00
20a9b3aa09
[MERGE]
...
bzr revid: apa@tinyerp.com-20120411045840-tnkzyyfrm9d36xgj
2012-04-11 10:28:40 +05:30
0d2ba40cf8
[IMP] hr.config.settings: simplify form, remove all buttons
...
bzr revid: rco@openerp.com-20120410140955-a8m0oxigpy7rb1bu
2012-04-10 16:09:55 +02:00
98b91589cf
[IMP] hr.config.settings: improve form layout
...
bzr revid: rco@openerp.com-20120410122234-m5n9it4hy07knte2
2012-04-10 14:22:34 +02:00
3feee280ec
[IMP] hr*: remove deprecated ir.actions.todo
...
bzr revid: rco@openerp.com-20120410121239-0p6z87d34yqqkdk3
2012-04-10 14:12:39 +02:00
068619bf8f
[IMP] hr.config.settings: improve code and form layout
...
bzr revid: rco@openerp.com-20120410115219-78ydkfe521am7g5n
2012-04-10 13:52:19 +02:00
63673df964
[IMP] hr*: rename model of config wizard to hr.config.settings
...
bzr revid: rco@openerp.com-20120410105632-n0bvdklu1ttlxcsa
2012-04-10 12:56:32 +02:00
b91d41bce7
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120410104839-pv9kmiizwv0w8e8f
2012-04-10 12:48:39 +02:00
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
8eb0e42abe
[MERGE] branch merge with lp:~openerp-dev/openobject-addons/trunk-v62_config
...
bzr revid: jap@tinyerp.com-20120405050839-97ifqjla5bz48duc
2012-04-05 10:38:39 +05:30
d99ff2ceef
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120404124507-yaslk5omv61vm761
2012-04-04 14:45:07 +02:00
fe6e58a40e
[FIX] Propagated ir.needaction class name change.
...
bzr revid: tde@openerp.com-20120403172108-ccvtnt512yexefe1
2012-04-03 19:21:08 +02:00
10085b7c9a
[MERGE] merged a branch with usability improvements in hr_holidays
...
bzr revid: qdp-launchpad@openerp.com-20120403115519-emon7p70bfsjv81w
2012-04-03 13:55:19 +02:00
37465c6ea5
[IMP] HR: add the configuration wizard(new added file >> hr/res_config.py, hr/res_config_view.xml,hr_recruitment/res_config.py, hr_recruitment/res_config_view.xml, hr_timesheet_sheet/res_config.py, hr_timesheet_sheet/res_config_view.xml)
...
bzr revid: jap@tinyerp.com-20120402054418-596gzjhyne7o6148
2012-04-02 11:14:18 +05:30
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
5828ad66cf
[IMP] hr_holidays : Improved the field definationfrom date to datetime and its related changes.
...
bzr revid: mdi@tinyerp.com-20120329102124-ktotpg7cthlci1oy
2012-03-29 15:51:24 +05:30
8b65da991a
[MERGE]
...
bzr revid: apa@tinyerp.com-20120329082210-0z0qer1589wp8ez0
2012-03-29 13:52:10 +05:30
6291473b71
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120328071919-bfi6x05lvg9bt8py
2012-03-28 12:49:19 +05:30
5da8966b21
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120327092417-jrydzrz9biecyn06
2012-03-27 14:54:17 +05:30
42ae5ba9fb
[MERGE] Merged fix from trunk about hr_holidays
...
bzr revid: tde@openerp.com-20120327091539-lo75wcj3pt5obwib
2012-03-27 11:15:39 +02:00
7d9c9efef5
[FIX] hr_holidays: added a missing ']' in the domain of 'year' filter.
...
bzr revid: tde@openerp.com-20120327084535-igmpl852p0k8wq0t
2012-03-27 10:45:35 +02:00
a1c17bb77c
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120327073509-emcfvmse26kks999
2012-03-27 09:35:09 +02:00
87f4fdbcb3
[IMP] hr_holidays: small change in xml
...
bzr revid: psi@tinyerp.com-20120327051804-71hopmvwyx41q6ym
2012-03-27 10:48:04 +05:30
397cdef40f
[IMP] hr_holidays: improved 'this year' button on search view of holidays.
...
bzr revid: qdp-launchpad@openerp.com-20120326132557-nuyevng79oe5oham
2012-03-26 15:25:57 +02:00
93e117b500
[IMP] hr_holidays : Improved the test cases.
...
bzr revid: mdi@tinyerp.com-20120326125143-7m3rd2y6pviwsv45
2012-03-26 18:21:43 +05:30
0e8ccd774d
[MERGE] branch merged with openobject-addons
...
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
0097bfef95
[IMP] hr_holidays : Improved the field defination, button is properly aligned with state, improve the calendar view and remove the filter.
...
bzr revid: mdi@tinyerp.com-20120326114629-o5yrzqqa93qzuszt
2012-03-26 17:16:29 +05:30
ac24b11e82
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120326092417-9cpagvskhf8u30yq
2012-03-26 11:24:17 +02:00
99fc46c5e5
[MERGE] Merged hr_holidays
...
bzr revid: tde@openerp.com-20120322163549-re9k1lkaoiayszvs
2012-03-22 17:35:49 +01:00
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
0e5598c24f
[FIX] Added widget on allocation request.
...
bzr revid: tde@openerp.com-20120322132135-3yyip0lh7gzf0isc
2012-03-22 14:21:35 +01:00
8dc623fb21
[IMP] HR: change sequence of menus and apply group_no_one
...
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
fbe22f74f8
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120322055844-axelwfh9rqrbft7w
2012-03-22 11:28:44 +05:30
744feff959
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120321085121-52hkn31qqk2tqx52
2012-03-21 09:51:21 +01:00
a4a2696fb3
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: jap@tinyerp.com-20120321065621-rr4ehnehog9aq4d2
2012-03-21 12:26:21 +05:30
5615911303
[MERGE] Latest bugfixes from 6.1
...
bzr revid: odo@openerp.com-20120320182912-g2ylze2qsqv93y4i
2012-03-20 19:29:12 +01:00
5188e3c163
[MERGE]
...
bzr revid: apa@tinyerp.com-20120320093417-ffu9qiy0zt2606gr
2012-03-20 15:04:17 +05:30
62c49d4013
[IMP]:Move fields First Approval, Second Approval to Usability / Technical Features group
...
bzr revid: sgo@tinyerp.com-20120320092120-7mcbqv73xp1r3gqz
2012-03-20 14:51:20 +05:30
a2178b69e7
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo
...
bzr revid: apa@tinyerp.com-20120319052052-1i543wpq7hulle2u
2012-03-19 10:50:52 +05:30
14399475b5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120317053244-0uj5epbyw7sb511o
bzr revid: launchpad_translations_on_behalf_of_openerp-20120318050753-4sqrakfazltjt0l9
bzr revid: launchpad_translations_on_behalf_of_openerp-20120319050833-o186lk5tmza7qtqv
2012-03-19 05:08:33 +00:00
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
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
e2fe93c646
[FIX] hr_holidays: fixed function name change
...
bzr revid: tde@openerp.com-20120313160139-28cei2grildmbo9y
2012-03-13 17:01:39 +01:00
cbc9654b83
[FIX] hr_holidays: unnecessary ',' causing crash removed
...
bzr revid: tde@openerp.com-20120312115243-f6tos2qqna3li7z0
2012-03-12 12:52:43 +01:00
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
98a6a99173
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120313053503-xvlvyuystb8tvif8
2012-03-13 05:35:03 +00:00
49459c7219
[FIX] hr_holidays: Leaves calendar view should be filtered by users, not description
...
bzr revid: odo@openerp.com-20120312090809-rloqoz5lb3rr7a9a
2012-03-12 10:08:09 +01:00
5ebc07237a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052625-78n2341gtv2zrgwg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050634-9ftgr94cy2tvp9y5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051214-q1f14seqal4j8rn5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052733-s24jj1qyoxy2j8lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050659-0ky4089nbil85weg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051227-90mlbjgzqjyj8a8a
2012-03-12 05:12:27 +00:00
db55865050
[REM] Removed mail/base_need_action, moved to server. Fixed now deleted need_action boolean field from view.
...
bzr revid: tde@openerp.com-20120307091018-tcpvsa5shplc23vu
2012-03-07 10:10:18 +01:00
70c7af2e7d
[IMP] hr: add new menu Leaves and Leaves by Department in Reporting
...
bzr revid: jap@tinyerp.com-20120306063418-x7gfvebgtupf24yi
2012-03-06 12:04:18 +05:30
0e20074121
[IMP] hr_*:-changed sequence for menus
...
bzr revid: mtr@tinyerp.com-20120305124245-xh77bpp62l4wfalm
2012-03-05 18:12:45 +05:30
da74d3cde0
[MERGE] merge with mma branch(Hide department id in all other states rather than draft and confirm)
...
bzr revid: psi@tinyerp.com-20120301055849-4c20k8j37w5w8n7t
2012-03-01 11:28:49 +05:30
120a4a9fd7
[IMP]hr_holidays: Set department readonly via xml and revert in py file
...
bzr revid: mma@tinyerp.com-20120301052738-oaj8phgg1h4p4jq7
2012-03-01 10:57:38 +05:30
c420db4bbf
[IMP]hr_holidays: Set department readonly till approved.
...
bzr revid: mma@tinyerp.com-20120229131819-x8rmt9ew3a8uysmd
2012-02-29 18:48:19 +05:30
d60dafea45
[MERGE] hr_holidays: merge with mma branch related to hr_holidays changes
...
bzr revid: psi@tinyerp.com-20120229100810-9e0h8om7rnzcgzv8
2012-02-29 15:38:10 +05:30
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
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
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
31cf2a35a7
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120224080318-5xo9nan72e3891ke
2012-02-24 09:03:18 +01:00
c57c5c13cf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120224044759-kb2nc1gspyneo64h
2012-02-24 04:47:59 +00:00
82c41467ad
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120223043932-3b9cw1e2jkpbcemz
2012-02-23 04:39:32 +00:00
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
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
413df33104
[IMP] Removed space in a note.
...
bzr revid: tde@openerp.com-20120221153903-px8wbaia3y9h4rvg
2012-02-21 16:39:03 +01:00
a3ac698fe8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218071328-fl3yjw2gawigfooh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219063344-7w5y8nkweukg0f88
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220061321-0z254064e8vsx286
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063558-wc526qfv4ko5s6q0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063603-medp0cjt2z5vy70x
2012-02-21 06:36:03 +00:00
88c25488a5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
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
bd12fc958a
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120220090924-lpm4fdsru4jf5v3k
2012-02-20 10:09:24 +01:00
9f65e1565e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
e48990cab5
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120216132337-tc53v9i5yerd7db1
2012-02-16 14:23:37 +01:00
2094148de5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050419-fgzhvlogc71u42qe
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050718-lf9hgvr1p33jpm2h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216052148-ta5bwtqg3bzmvp3i
2012-02-16 05:21:48 +00:00
74b3b0bc69
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
2aa2378015
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120211050953-f8t9zos3qjzmnj3t
bzr revid: launchpad_translations_on_behalf_of_openerp-20120212044319-nxuw0h7g5aqrqy4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120213045042-jyku2inv3wkcae91
2012-02-13 04:50:42 +00:00
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
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
b42db33ae1
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120209081711-7vdbxzikqslx4g2u
2012-02-09 09:17:11 +01:00
0e2e9ddd78
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
a80f887e5b
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120208152644-129yfcri5g38xcn3
2012-02-08 16:26:44 +01:00
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
320b2d2e2e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
0a63ecb0cf
[I18N] all: updated translation template
...
This should be the last major template sync
before the final release of 6.1.
bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +01:00
3afecc7604
[ADD] es_CR.po: added po to all modules, copy from es.po or from pot
...
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
ad4b6fcc21
[IMP] manifest: renamed active to auto_install.
...
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
ffbff476df
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050312-sep3uryazw4j1xz6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052156-67wqllfafijp6h1m
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044112-h04p0g5ne16y1nav
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050513-ncpdbsqyyk18pc67
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052226-dfcf7sm2r00y1s3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044131-sdsyvt62gvyzo0e3
2012-01-30 04:41:31 +00:00
5b10b7022d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115052053-qy9rgrxe745vw4zw
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116051929-9hq3xgbkj3t90wvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114054042-idria8u0iiizg9xu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115053522-rki2r1zjt8544t0c
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116052722-mb4w266h2j8som8q
2012-01-16 05:27:22 +00:00
6b0736e398
[MERGE] hr_holidays: fixed bug 908798: added filter and group_by on leaves analysis
...
bzr revid: tde@openerp.com-20120109153846-xue897nvu7jgapxe
2012-01-09 16:38:46 +01:00
fdd1d95fc2
[IMP] moved module sequences from module to each module's manifest
...
bzr revid: odo@openerp.com-20120107041212-boocriorprywgni1
2012-01-07 05:12:12 +01:00
405ee6a6ed
[MERGE] hr: fixed bug 909724: removed default search on user_id for expenses, allocation requests, leaves requests and leaves summary, to enable members of hr manager group to see all data
...
bzr revid: tde@openerp.com-20120104102541-og3jatmkega363n9
2012-01-04 11:25:41 +01:00
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
c7c2322d52
[FIX] in all hr features remove the default search on user_id
...
lp bug: https://launchpad.net/bugs/909724 fixed
bzr revid: jap@tinyerp.com-20120103121938-83er0zgqvgkxs11x
2012-01-03 17:49:38 +05:30
Jigar Amin - OpenERP
Mayur Maheshwari (OpenERP)
Quentin (OpenERP)
Fabien Pinckaers
Sbh (Openerp)
Pinakin Nayi (OpenERP)
Kuldeep Joshi (OpenERP)
Purnendu Singh (OpenERP)
Turkesh Patel (Open ERP)
Thibault Delavallée
ara@tinyerp.com
Divyesh Makwana (Open ERP)
Ajay Chauhan (OpenERP)
Ashvin Rathod (OpenERP)
DBR (OpenERP)
Amit Patel (OpenERP)
Raphael Collet
Saurang Suthar (OpenERP)
Jagdish Panchal (Open ERP)
Meera Trambadia (OpenERP)
Olivier Dony
Sanjay Gohel (Open ERP)
Carlos Vásquez
Vo Minh Thu