Commit Graph

63 Commits

Author SHA1 Message Date
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Denis Ledoux e5e397b01b [FIX] crm_partner_assign: on forward, set section_id if user_id has default section id
bzr revid: dle@openerp.com-20140107105324-xaa21r8fnl0ncg66
2014-01-07 11:53:24 +01:00
Thibault Delavallée e541755ae4 [MOV] portal: moved portal group into base.
Updated security rules. Basic res_partner rules are moved into base. Added rule with website_published.

bzr revid: tde@openerp.com-20131008113545-gpqydx0b199lcqpy
2013-10-08 13:35:45 +02:00
Denis Ledoux 69c314c51d [RENAME]RERENAME crm_channel => crm_partner_assign, for migration and translation issue
bzr revid: dle@openerp.com-20130620175326-0lgpbdxiusa65ss2
2013-06-20 19:53:26 +02:00
Denis Ledoux c536045818 [RENAME]crm_partner_assign => crm_channel
bzr revid: dle@openerp.com-20130620150725-ksoctsc2pnyavx3t
2013-06-20 17:07:25 +02:00
Denis Ledoux 4fc3cc862f [FIX]crm_partner_assign: mass lead forward, now one email per partner, even in several partner mode + code/execution time optimization/improvement
bzr revid: dle@openerp.com-20130613163813-315l55kle96sn5gh
2013-06-13 18:38:13 +02:00
Denis Ledoux 03d32a781f [FIX]crm_partner_assign: flake8 + try catch for get object reference + replace country,city of lead in view by one concatened char field with country and city, same for partner location
bzr revid: dle@openerp.com-20130613143601-dfsytrwij03fdov0
2013-06-13 16:36:01 +02:00
Parth Gajjar (Open ERP) b2684b01b0 [IMP] Improved Template
bzr revid: pga@tinyerp.com-20130612073519-9tva91agjof11ivl
2013-06-12 13:05:19 +05:30
Parth Gajjar (Open ERP) 65f12180c5 [IMP] Added Validation and some code improvement
bzr revid: pga@tinyerp.com-20130611115730-035v1wo2nwy2083m
2013-06-11 17:27:30 +05:30
Parth Gajjar (Open ERP) b9fd2226ba [IMP] improved code
bzr revid: pga@tinyerp.com-20130611064910-50u7hfdq7wkpym34
2013-06-11 12:19:10 +05:30
Parth Gajjar (Open ERP) c0ef010544 [IMP] Improved Wizard
bzr revid: pga@tinyerp.com-20130610125057-3guyl18ktcnmhbch
2013-06-10 18:20:57 +05:30
dle@openerp.com 3d96e3d789 [FIX]crm_partner_assign: add partner in lead followers
bzr revid: dle@openerp.com-20130527093528-vu00ptl0wf4yj184
2013-05-27 11:35:28 +02:00
Thibault Delavallée 661ff82af4 [FIX] crm partner assign: consider all forward message as mass_mailing; this way the message will not have any subtype, therefore not sent to any follower; but partner_ids (aka, assigned partner) will receive it.
bzr revid: tde@openerp.com-20130510141459-976io7ls9hllizvx
2013-05-10 16:14:59 +02:00
Raphael Collet 96ad608854 [IMP] general: use registry[X] instead registry.get(X) when X is dynamic
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
Antony Lesuisse 3aa39206f9 [FIX] crm_partner_assign typos
bzr revid: al@openerp.com-20130312131039-yy28lv24gf2nybfk
2013-03-12 14:10:39 +01:00
Antony Lesuisse 6204bc28f0 [FIX] crm_partner_assign use email_template
bzr revid: al@openerp.com-20130312002934-4j84nb0dhcwayw9f
2013-03-12 01:29:34 +01:00
Thibault Delavallée 28e66609b6 [FIX] crm_partner_assign: fixed crash with now unexisting method onchange_partner_ids; deleted dead code. This wizard is very ugly but seems to work.
bzr revid: tde@openerp.com-20130222121155-ytjog1hq32daamip
2013-02-22 13:11:55 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Olivier Dony e5921325bd [REM] mail.compose.wizard: remove unused body_text and content_subtype fields
These fields were used in pre-7.0 to manage the plaintext variant of the 
mail being composed, but as of 7.0 the composition wizard will always
use the HTML/Rich text mode, so they can be dropped.

bzr revid: odo@openerp.com-20121115135634-fcy6mexnctwg0nxb
2012-11-15 14:56:34 +01:00
Thibault Delavallée 5506e519fe [IMP] crm_forward_to_partner: on_change_partner_ids -> onchange_partner_ids, already defined on mail.compose.message.
bzr revid: tde@openerp.com-20120904120240-hidqb9e3ivys9vpo
2012-09-04 14:02:40 +02:00
Thibault Delavallée c52ab94960 [REVIEW] addons: small cleanups nex to a diff read. Some improvements will follow, this commit is about small cleanups.
bzr revid: tde@openerp.com-20120904092820-56zgwpkqfpd7as5k
2012-09-04 11:28:20 +02:00
Thibault Delavallée d91979671f [REF] crm_partner_assign: refactored code a bit, following cleaning of mail, because it inherit from mail.compose.message. Removed send_to field, as the new composer is based on partners and simplify this wizard; removed a lot of code about setting email_from, email_to, ... because this should be managed by the other layers of the mail module. Cleaned the code in a more general way to remove weird things. Updated releveant form view, especially about context on Forward button, and the form view of the wizard that has been much simplified.
bzr revid: tde@openerp.com-20120824142000-0jbgvgdiip5475yp
2012-08-24 16:20:00 +02:00
Thibault Delavallée fb76f9f037 [IMP] [FIX] crm_partner_assign: as it inherits from mail.compose.message, updated the form view to avoid crashe; updated mail.compose.message composition mode, that is now an updatable selection field. crm_partner_assign will habe to be massively cleaned with the new mail module.
bzr revid: tde@openerp.com-20120824122928-dof1y1uxv3lkiwly
2012-08-24 14:29:28 +02:00
Thibault Delavallée c5cfb049f8 [FIX] Fixed last commit (forgotten a ','), fixed demo data about non-existing fields.
bzr revid: tde@openerp.com-20120824100205-nm4vjw13qx363cb5
2012-08-24 12:02:05 +02:00
Thibault Delavallée 6a386dc762 [FIX] crm_forward_to_partner: to_email is now tools.email_split.
bzr revid: tde@openerp.com-20120824093130-e24hm16pq14x84zb
2012-08-24 11:31:30 +02:00
Fabien Pinckaers 06f60b3517 [FIX] body_text --> body, not ure it's good enough
bzr revid: fp@tinyerp.com-20120817120606-t97l9x2dguuv7kmp
2012-08-17 14:06:06 +02:00
Thibault Delavallée 620b7e9b11 [IMP] Addons: user_email -> email.
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
Thibault Delavallée f98c468905 [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120402085718-vkbvudzpa4e1t9m8
2012-04-02 10:57:18 +02:00
Jigar Amin - OpenERP ca5a69de4f [IMP] crm : crm_partner_assign cleanup address dependancy
bzr revid: jam@tinyerp.com-20120306134846-yp4llvi8kbg14n0w
2012-03-06 19:18:46 +05:30
Thibault Delavallée 526281d470 [FIX] crm_partner_assign, hr_recruitment: fixed 2 write using an int instead of list
bzr revid: tde@openerp.com-20120228151441-kow3r6nn96qn6w4q
2012-02-28 16:14:41 +01:00
ron@tinyerp.com f56cc312e4 [IMP] crm_parner_assign, crm: Corrected history[whole, laetst, case info] for lead forword to its nearest partner email wizard
bzr revid: ron@tinyerp.com-20111130120640-t6l8pec0fb6pehjq
2011-11-30 17:36:40 +05:30
ron@tinyerp.com c64207b0c9 [FIX] crm: Sending lead forword to its partner with attachament its generate Traceback
bzr revid: ron@tinyerp.com-20111125132151-eztonj8m7ac54r60
2011-11-25 18:51:51 +05:30
ron@tinyerp.com f3f4aca797 [FIX] crm: Convert Mass opportunity from wizard where opportunity have no assigned partner
bzr revid: ron@tinyerp.com-20111125050951-36vc64ja6jvbfo1t
2011-11-25 10:39:51 +05:30
ron@tinyerp.com 04ed829ad1 [IMP] crm: Click on forward to opprtunity by user, used allocate_salesman instead of assign_salesman
bzr revid: ron@tinyerp.com-20111124104314-yq5005rol2alnrj9
2011-11-24 16:13:14 +05:30
ron@tinyerp.com 4072cb102e [FIX] crm: click on forword button to forword its partner
bzr revid: ron@tinyerp.com-20111123105353-ctejxeua56nzmu7s
2011-11-23 16:23:53 +05:30
ron@tinyerp.com c565752d00 [FIX] crm: Clicked on forword button for lead forward to its partner, Its gave traceback
bzr revid: ron@tinyerp.com-20111122132715-hiqd32vdckfxdqg1
2011-11-22 18:57:15 +05:30
Harry (OpenERP) 477e4c09b4 [IMP] crm_partner_assign: clean test case and APIs
bzr revid: hmo@tinyerp.com-20111026092133-xdrikqkxs4e5usw3
2011-10-26 14:51:33 +05:30
Olivier Dony 50507512cb [MERGE] latest trunk
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Olivier Dony 3e6b0297d0 [IMP] crm*: update crm modules to new mail module (wip)
bzr revid: odo@openerp.com-20110722182337-5irz3g2qva0cf45e
2011-07-22 20:23:37 +02:00
Bhumika (OpenERP) 4b6fa91c17 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110512050143-5tbc55oop00ksr4u
2011-05-12 10:31:43 +05:30
Harry (OpenERP) 0577796333 [MERGE] merged addons trunk development branch after resolving conflicts
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Rifakat Haradwala (Open ERP) f53ee6053a [IMP] email.message.common: implemented active_id and active_model in default_get() and fix reference of fields subject and body
bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9
2011-04-07 18:20:24 +05:30
Thibault Francois 1a45ff614d [MERGE] crm improvement
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Rifakat Haradwala (Open ERP) afc74ed47f [IMP] email.compose.message: removed method save_to_drafts() and did related changes for this
bzr revid: rha@tinyerp.com-20110407045607-tub41samcup20t5d
2011-04-07 10:26:07 +05:30
Rifakat Haradwala (Open ERP) f3d727379e [FIX] crm_partner_assign: fix name error
bzr revid: rha@tinyerp.com-20110405083248-ndrfn2tye6nkckob
2011-04-05 14:02:48 +05:30
Thibault Francois c2531d6426 [IMP] mass forward lead also + fix email_to empty + fix body not defined
bzr revid: tfr@openerp.com-20110308164002-e28rir542eim9fff
2011-03-08 17:40:02 +01:00
Thibault Francois 6ef20247f0 [ADD] Mass mailing + Mass forward
bzr revid: tfr@openerp.com-20110228171827-32ftmy34psg9c600
2011-02-28 18:18:27 +01:00
Thibault Francois 1f2f2ef7ba [IMP] update hard coded message
bzr revid: tfr@openerp.com-20110228105904-w2398n95mk17spyd
2011-02-28 11:59:04 +01:00
Harry (OpenERP) 85e8c93460 [MERGE] merged with trunk-addons-development
bzr revid: hmo@tinyerp.com-20110225074706-pjzvvfqe1200zwji
2011-02-25 13:17:06 +05:30
Yogesh (OpenERP) 204ecec4f2 [IMP] crm, emails,crm_partner_assign:- change model name crm_send_new_email_attachment with crm_add_note_email_attachment in crm module, and bug fix of web-client wizard not close must return thy type:ir.action.act_window.close' in button click
bzr revid: ysa@tinyerp.com-20110225065403-expnty80rkb9m2jr
2011-02-25 12:24:03 +05:30