Commit Graph

38 Commits

Author SHA1 Message Date
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
Yogesh (OpenERP) df503eaf0d [IMP] crm,crm_partner_assing:- inherit email.compose.message instead of crm.send.mail and fix some problem.
bzr revid: ysa@tinyerp.com-20110225062346-tt0xn3mv6a90dozx
2011-02-25 11:53:46 +05:30
Bhumika (OpenERP) c4b9f8f781 [Fix] fix buildbot warning
bzr revid: sbh@tinyerp.com-20110225052042-7ejedxroblhl38j7
2011-02-25 10:50:42 +05:30
Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
2011-02-24 16:03:09 +01:00
Thibault Francois 8392b4d3d0 [FIX] hard code template
bzr revid: tfr@openerp.com-20110224142216-x61sd77ad269cquk
2011-02-24 15:22:16 +01:00
Harry (OpenERP) 63c8d44d88 [MERGE] merged from trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110215102211-n15lmjf1vgq5bcyo
2011-02-15 15:52:11 +05:30
Thibault Francois adff989502 [FIX] avoid to have lead emails in cc when forward to partner with geo assign
bzr revid: tfr@openerp.com-20110207123153-qig4thicpe3y855a
2011-02-07 13:31:53 +01:00
Yogesh (OpenERP) 0c7876ac29 [IMP] replace mailgate.message to email.message in addons module.
bzr revid: ysa@tinyerp.com-20110207055157-yr9co24w84kv0yvy
2011-02-07 11:21:57 +05:30
Thibault Francois b578de61c0 [IMP] assign salesman to opportunity and put is email in cc whil geoassignement
bzr revid: tfr@openerp.com-20110204103435-nzy8zhbp2yeyh935
2011-02-04 11:34:35 +01:00
uco (OpenERP) c3098f4f43 [FIX] account..l10n_ch: Pass return {'type': 'ir.actions.act_window_close'} instead of return {} in osv_memory/normal wizards.(lp:691544)
bzr revid: uco@tinyerp.com-20101228104445-h5q9jg8mq7dmdc51
2010-12-28 16:14:45 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
uco (OpenERP) eccc1d33b2 [REF] copyrights: Replaced 'GNU General Public License' with 'GNU Affero General Public License'
bzr revid: uco@tinyerp.com-20101028065418-ahi6poaxn1aa5dmp
2010-10-28 12:24:18 +05:30
Fabien Pinckaers 7b315f70c3 moved
bzr revid: fp@tinyerp.com-20100921083731-vxl42pk01j9maz79
2010-09-21 10:37:31 +02:00