Thibault Delavallée
6de3dc2021
[MERGE] Merged with mail-state, recently updated with trunk.
...
bzr revid: tde@openerp.com-20120612080634-dp9ynaswvs95v9h5
2012-06-12 10:06:34 +02:00
Thibault Delavallée
52b4184a98
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120612074734-g5fmmkqlc9ujt5bl
2012-06-12 09:47:34 +02:00
Divyesh Makwana (Open ERP)
0b188a31cc
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120612065329-oys1eh8q3gitdx06
2012-06-12 12:23:29 +05:30
Amit Patel (OpenERP)
deec2bda0d
[MERGE]:resolved conflicts and merged with trunk
...
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
2012-06-12 12:05:39 +05:30
Jigar Amin - OpenERP
c6d029b263
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120612050628-2la1082qfg9sb0g5
2012-06-12 10:36:28 +05:30
Launchpad Translations on behalf of openerp
b871639070
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120612045555-2irdwxgtdcfdho23
2012-06-12 04:55:55 +00:00
Quentin (OpenERP)
204ce4380a
[MERGE] merged with the trunk
...
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
2012-06-11 14:42:11 +02:00
Thibault Delavallée
08813cc9d5
[MERGE] Merged wih main addons.
...
bzr revid: tde@openerp.com-20120611104147-gnqgnt51taq899su
2012-06-11 12:41:47 +02:00
Thibault Delavallée
a3cfa1c6b7
[MERGE] Merged wiht branch holding mail-state update; includes merge of trunk before commit with views update (up to 6882).
...
bzr revid: tde@openerp.com-20120608142440-fgpje1y42ik8wwkx
bzr revid: tde@openerp.com-20120611102254-weudj3vj18m26iej
2012-06-11 12:22:54 +02:00
Fabien Pinckaers
9a7573dd7f
[IMP] removing layout="manual"
...
bzr revid: fp@tinyerp.com-20120611090701-57jr0v6oxnbuocwc
2012-06-11 11:07:01 +02:00
Thibault Delavallée
3b7fffab86
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120611083405-01yuhy0o1fl10rv6
2012-06-11 10:34:05 +02:00
Amit Patel (OpenERP)
782961ad72
[MERGE]
...
bzr revid: apa@tinyerp.com-20120611063253-thu785ewcrcs7ci6
2012-06-11 12:02:53 +05:30
Launchpad Translations on behalf of openerp
c95b6d26ab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120609053947-vtt4bvvka4m7ss08
bzr revid: launchpad_translations_on_behalf_of_openerp-20120610043726-y2hq6n49adbitr1p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120611044647-txtguaozavg1ipp2
2012-06-11 04:46:47 +00:00
Jigar Amin - OpenERP
9e6adf3597
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120611041945-5wo6brp8rs3q2a6k
2012-06-11 09:49:45 +05:30
Fabien Pinckaers
2047df4e4f
[merge] trunk
...
bzr revid: fp@tinyerp.com-20120610083515-itgsn211254zp1b9
2012-06-10 10:35:15 +02:00
Fabien Pinckaers
1508b9c8bd
[IMP] better form views, new guidelines
...
bzr revid: fp@tinyerp.com-20120609155935-ngp2di1h04uan90j
2012-06-09 17:59:35 +02:00
Fabien Pinckaers
b1ea5e4c97
[IMP] replace footer by divs for chatter
...
bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
2012-07-13 11:53:41 +02:00
Amit Patel (OpenERP)
d30d000ae3
[IMP]:added icons on buttons.
...
bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
2012-06-08 12:50:54 +05:30
Thibault Delavallée
06c234a6c1
[REM] project_oissue, crm_meeting, project, hr_recruitment: removed get_needaction_user_ids definition, as the default behavior of mail.thread is sufficient.
...
bzr revid: tde@openerp.com-20120607152536-h9vwg2t4ser8f3v2
2012-06-07 17:25:36 +02:00
Amit Patel (OpenERP)
0f8a428483
[REM]:removed members from project_issue
...
bzr revid: apa@tinyerp.com-20120607085240-niiqtdwf0qcp95e4
2012-06-07 14:22:40 +05:30
Purnendu Singh (OpenERP)
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
Amit Patel (OpenERP)
317a25b34e
[MERGE]
...
bzr revid: apa@tinyerp.com-20120606095311-7px6hn7fcdeblkc9
2012-06-06 15:23:11 +05:30
Turkesh Patel (Open ERP)
b2a3c8e30c
[IMP] project_issue:remove unnecessary code
...
bzr revid: tpa@tinyerp.com-20120606052445-c1cobmsei2bpb03r
2012-06-06 10:54:45 +05:30
Antonin Bourguignon
c837594c4c
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120605171231-hb64kk1garpo51bc
2012-06-05 19:12:31 +02:00
Thibault Delavallée
794783ebca
[MERGE] Merged with feature branch holding mail-state, and some cleaning in mail.thread.
...
bzr revid: tde@openerp.com-20120605135912-8r5w1694mk81n12h
2012-06-05 15:59:12 +02:00
Thibault Delavallée
c82a00e5e5
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120605125516-24q0o6160ihxzexa
2012-06-05 14:55:16 +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
Turkesh Patel (Open ERP)
77ad73e7f0
[IMP] project_issue:remove unnecessary code
...
bzr revid: tpa@tinyerp.com-20120605093750-m3ykr7wjod3r48pi
2012-06-05 15:07:50 +05:30
Turkesh Patel (Open ERP)
9dd9fe31d0
[IMP] project_issue:improved view of dashboard and remove unnecessary code
...
bzr revid: tpa@tinyerp.com-20120605084952-yr2o58zydsodn69v
2012-06-05 14:19:52 +05:30
Thibault Delavallée
b3295905f7
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120605080433-jzhakjx0ko39iokp
2012-06-05 10:04:33 +02:00
Thibault Delavallée
bb5f7d384d
[IMP] crm_lead, crm_claim, crm_fundraising, crm_helpdesk, hr_recruitment, project_issue, project_mailgate: cleaned and updated message_new and message_update to have a cleaner mailgate. Deleted references to state update.
...
bzr revid: tde@openerp.com-20120604141254-4m2tnzwi88w8h2aj
2012-06-04 16:12:54 +02:00
Purnendu Singh (OpenERP)
6c1c93e6d8
[MERGE] merge wiht MMA branch to get all his changes in project branch
...
bzr revid: psi@tinyerp.com-20120604125117-q6xge3w03gzyh99l
2012-06-04 18:21:17 +05:30
Fabien Pinckaers
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
Amit Patel (OpenERP)
f5c7e060b8
[IMP]:improved view code
...
bzr revid: apa@tinyerp.com-20120604105129-zlbaoej3qj4kdpbo
2012-06-04 16:21:29 +05:30
Fabien Pinckaers
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
Sanjay Gohel (Open ERP)
4a864e1ff1
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20120604103823-oncbbg2b2hswp002
2012-06-04 16:08:23 +05:30
Sanjay Gohel (Open ERP)
e7f5c1088b
[IMP]type invible when type is contract and template and project related issues solved
...
bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7
2012-06-04 16:03:42 +05:30
Amit Patel (OpenERP)
6c6326cdab
[MERGE/IMP]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-follower-dbr
...
bzr revid: apa@tinyerp.com-20120604093905-flfm36syrqva9zfc
2012-06-04 15:09:05 +05:30
DBR (OpenERP)
60bffb4717
[IMP]project_issue: set attrs on team tab
...
bzr revid: dbr@tinyerp.com-20120604092452-mrz4lf11sw9q3gs1
2012-06-04 14:54:52 +05:30
Divyesh Makwana (Open ERP)
8459c8af3c
[IMP] project_issue : fix the view error.
...
bzr revid: mdi@tinyerp.com-20120604090437-ynq8w2a7w1y0c9mh
2012-06-04 14:34:37 +05:30
Amit Patel (OpenERP)
a5604d2cfa
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120604085217-ntsulc7zrujp6efc
2012-06-04 14:22:17 +05:30
Thibault Delavallée
6a16fd4a78
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120604080134-t1zg2sv0jpmhbyge
2012-06-04 10:01:34 +02:00
Divyesh Makwana (Open ERP)
dff4b2f2a0
[Merge] Merge with main branch.
...
bzr revid: mdi@tinyerp.com-20120604063834-jbfyvot5fjvc4pz7
2012-06-04 12:08:34 +05:30
Antonin Bourguignon
a704f7bd8d
[IMP] adapt task and issue views for portal users
...
- give read access rights to group_portal_member on projet.task.type and project.task.work models
- hide action buttons and priority fields in form and list views
- a question remains: how to handle states and stages ? state seems more revelant and simple to understand for portal users (and therefore should be shown through the statusbar widget) while stage is more interesing for internal organization
bzr revid: abo@openerp.com-20120601150718-dk49583g1tko118y
2012-06-01 17:07:18 +02:00
Antonin Bourguignon
03dcaabc64
[FIX] typo: the label 'Stage' should remain singular, not plural
...
bzr revid: abo@openerp.com-20120601145134-pd660jzsl5bv409x
2012-06-01 16:51:34 +02:00
Thibault Delavallée
2a2ab5fd4d
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120601135532-dz42z4bfnp83kh6s
2012-06-01 15:55:32 +02:00
Mayur Maheshwari (OpenERP)
03dc0d1eee
[MERGE]:merge with main project branch
...
bzr revid: mma@tinyerp.com-20120601123737-fh6412cdyke7bqdd
bzr revid: mma@tinyerp.com-20120601124150-2grs2hqdkye6ww2n
2012-06-01 18:11:50 +05:30
Divyesh Makwana (Open ERP)
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
Purnendu Singh (OpenERP)
0255049b09
[MERGE] merge with main branch
...
bzr revid: psi@tinyerp.com-20120601113816-mmbmhklr588wj5sl
2012-06-01 17:08:16 +05:30
Thibault Delavallée
cd19f68eb9
[MERGE] Merged with main addons.
...
bzr revid: tde@openerp.com-20120601113625-c9w0kmnw1dzvjswx
2012-06-01 13:36:25 +02:00