Commit Graph

260 Commits

Author SHA1 Message Date
Olivier Dony 0b2118c10d [FIX] project.issue: duplicate method, probably bad merge
bzr revid: odo@openerp.com-20120814102425-50sbp71muozamm61
2012-08-14 12:24:25 +02:00
Olivier Dony ac4e5d746b [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20120814082029-i1b7d4l5cqgs434g
2012-08-14 10:20:29 +02:00
Olivier Dony 1e704867bd [FIX] project_issue: typo in earlier refactoring
bzr revid: odo@openerp.com-20120809171539-pmz33xfr39h1i8jj
2012-08-09 19:15:39 +02:00
Stephane Wirtel 91f8b5439c [FIX] project*: Replace the labels with 'Partner' by Contact
bzr revid: stw@openerp.com-20120809105009-0f7mw99dnavgs01s
2012-08-09 12:50:09 +02:00
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
Fabien Pinckaers de4fb4d740 [IMP] small fix
bzr revid: fp@openerp.com-20120806200710-mkqimou9tdz8h6f2
2012-08-06 22:07:10 +02:00
Olivier Dony 56009ed513 [IMP] mail alias review - work in progress
bzr revid: odo@openerp.com-20120806004417-9uviymtavkxlh92m
2012-08-06 02:44:17 +02:00
Olivier Dony f0873dcb32 [MERGE] Sync with trunk - bunch of conflicts resolved
bzr revid: odo@openerp.com-20120803142450-97z551yam1js822h
2012-08-03 16:24:50 +02:00
Olivier Dony 093f739273 [IMP] mail alias review - work in progress
bzr revid: odo@openerp.com-20120801091439-2m7z9fhn771go35j
2012-08-01 11:14:39 +02:00
Antonin Bourguignon f14850b63d [MERGE] latest trunk
bzr revid: abo@openerp.com-20120727092135-6vsw4et9khbph9io
2012-07-27 11:21:35 +02:00
Divyesh Makwana (Open ERP) c1c88c7494 [IMP] project_issue : Override the 'on_change_template' method.
bzr revid: mdi@tinyerp.com-20120723120907-qgg7b7jzc2zq17t6
2012-07-23 17:39:07 +05:30
Antonin Bourguignon 6ba207f0fe [MERGE] latest trunk
bzr revid: abo@openerp.com-20120723081724-og9w66m6r3bi89wc
2012-07-23 10:17:24 +02:00
Antonin Bourguignon 99e88da06d [FIX] remove dead code
bzr revid: abo@openerp.com-20120712154336-u45rxpicpijvpo87
2012-07-12 17:43:36 +02:00
Antonin Bourguignon 3a649f7025 [FIX] can't handle many2many relation in reports
bzr revid: abo@openerp.com-20120711144304-a6ab47s9nmz6yj2l
2012-07-11 16:43:04 +02:00
Antonin Bourguignon 07b310b364 [WIP] replace previous categ (inherited from crm.case.categ - using m2o relation) by a new one (project.category - using m2m relation and many2many_tags widget for display)
the idea is to give the opportunity to 'tag' a project's tasks and issues instead of classifying them in a single category

- display in the kanban view isn't ready yet
- demo data will have to be updated accordingly
- some code in project_issue/project_issue.py has been commented out: probably dead code, will be reviewed

bzr revid: abo@openerp.com-20120711132130-uwlom1xu8rl4cr3k
2012-07-11 15:21:30 +02:00
Thibault Delavallée 4fad550d69 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120709081834-18pf4bol39s50uno
2012-07-09 10:18:34 +02:00
Olivier Dony 9caafbe777 [MERGE] mail.alias: updated views and simplified models
bzr revid: odo@openerp.com-20120705135626-xxqch4uabq418ekf
2012-07-05 15:56:26 +02:00
Olivier Dony be021419ae [MERGE] Sync with trunk and correct upstream mistakes
bzr revid: odo@openerp.com-20120705102219-p6wy1obp4t0b89z3
2012-07-05 12:22:19 +02:00
Turkesh Patel (Open ERP) 6dbc826535 [IMP] merge with lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-tooltip-tpa
bzr revid: tpa@tinyerp.com-20120704094236-1rku07c8l9igslmv
2012-07-04 15:12:36 +05:30
Turkesh Patel (Open ERP) cb2c902c6b [IMP] project: improved code.
bzr revid: tpa@tinyerp.com-20120704093343-3q7a6flz5qbrsza1
2012-07-04 15:03:43 +05:30
Raphael Collet 6b1606f8de [IMP] move crm.wizard.mail_compose_message to module mail, to reduce module dependencies on crm
bzr revid: rco@openerp.com-20120703131453-dz0gpdq3t9155bfw
2012-07-03 15:14:53 +02:00
Thibault Delavallée 289dad87d4 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120703122020-79rl9b03mygz5s0h
2012-07-03 14:20:20 +02:00
Thibault Delavallée e550fc1995 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120702130824-b2zaa6yb2juu3p9u
2012-07-02 15:08:24 +02:00
Turkesh Patel (Open ERP) 8df078bdba [ADD] added tooltip.
bzr revid: tpa@tinyerp.com-20120702113913-q8dxbswpj8vf2832
2012-07-02 17:09:13 +05:30
Antony Lesuisse 94861472af [MERGE] kanban views: project, project_issue, hr_recruitment
bzr revid: al@openerp.com-20120629154609-l5wktmrbetw8ab01
2012-06-29 17:46:09 +02:00
Jigar Amin - OpenERP b49db1b76e lp:~openerp-dev/openobject-addons/trunk-mail-alias
bzr revid: jam@tinyerp.com-20120629043114-92j7i2x5oegd1nvh
2012-06-29 10:01:14 +05:30
Thibault Delavallée 4b36d6594b [MERGE] Merged with addons trunk.
bzr revid: tde@openerp.com-20120628105252-isuqpdzrtohc9ofy
2012-06-28 12:52:52 +02:00
Antonin Bourguignon d8a570a9d7 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120627150256-rc8c78zwhzf4cfhx
2012-06-27 17:02:56 +02:00
Thibault Delavallée 4081379c91 [MERGE] Merged with trunk addons.
bzr revid: tde@openerp.com-20120627120020-i4lf0cgb2edkugl2
2012-06-27 14:00:20 +02:00
Tejas Tank 788748604f [IMP] kanban : project.task, project.issue, hr.applicant
bzr revid: tta@openerp.com-20120627103610-1uwuz2geen0psq5j
2012-06-27 16:06:10 +05:30
Jigar Amin - OpenERP fa00dc5c4c [MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias
bzr revid: jam@tinyerp.com-20120627045735-ke98oi0vj3m918ig
2012-06-27 10:27:35 +05:30
Tejas Tank 1b7487b0cc kanban project.issue
bzr revid: tta@openerp.com-20120626102945-2yk3zdntgu2nui2l
2012-06-26 15:59:45 +05:30
ajay javiya (OpenERP) 709c0f11c0 [Add]:Implement mail.alias feature for project module
bzr revid: aja@tinyerp.com-20120625111712-q710cd4d4t5cbj7v
2012-06-25 16:47:12 +05:30
Quentin (OpenERP) dc1edf44be [IMP] project: implemented the privacy/visibility record rule in a cleaner way + some cleanup and bug fixing related to contract management
bzr revid: qdp-launchpad@openerp.com-20120614100922-5g29ui88nhqojon2
2012-06-14 12:09:22 +02:00
Quentin (OpenERP) b2a5ab368d [IMP] account_analytic_analysis: code improved for automation of project creation
bzr revid: qdp-launchpad@openerp.com-20120613100731-9so4m41fz7yrtb5w
2012-06-13 12:07:31 +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
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
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 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
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
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
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 cd19f68eb9 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120601113625-c9w0kmnw1dzvjswx
2012-06-01 13:36:25 +02:00
Thibault Delavallée 07c2377a2c [IMP] project_issue: fixed some methods changing the state, now changing the stage; also added chatter generic method override when changing states.
bzr revid: tde@openerp.com-20120601091347-ct576vruqj7drjmf
2012-06-01 11:13:47 +02:00
Thibault Delavallée 8d5aae51f6 [CLEAN] project, project_issue: removed next_type and prev_type, now using stage_previous and stage_next; cleaned views accordingly.
bzr revid: tde@openerp.com-20120531151556-duyy6ryyw6fiup3o
2012-05-31 17:15:56 +02:00
Thibault Delavallée 214ba53104 [FIX] crm_lead, project, project_issue, hr_recruitment: fixed stage_find method.
bzr revid: tde@openerp.com-20120531141930-svw4ax9mfwvnyv07
2012-05-31 16:19:30 +02:00
Thibault Delavallée eb6a0a4ac6 [FIX] crm_lead, hr_recruitment, project_issue: fixed _read_group_stage_ids methods.
bzr revid: tde@openerp.com-20120531131626-o5geqtp9ig5fnj87
2012-05-31 15:16:26 +02:00