Commit Graph
240 Commits
Author SHA1 Message Date
Thibault Delavallée 9e4486ae52 [FIX] mail: fixed missing conflict resolution
bzr revid: tde@openerp.com-20130411104659-ik62af6wubzu5j6q
2013-04-11 12:46:59 +02:00
Thibault Delavallée fe2ea997a2 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
2013-04-11 12:36:45 +02:00
Thibault Delavallée 9cf7f70d15 [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130307102507-4agvd08e07wu5grq
2013-03-07 11:25:07 +01:00
Thibault Delavallée 40244df4c1 [IMP] mail.compose.message: copied attachments in mass mail mode are linked to the composer, because message_post will update their model and res_id.
bzr revid: tde@openerp.com-20130306161151-gczob78pmt683kw7
2013-03-06 17:11:51 +01:00
Thibault Delavallée b1b3ed971a [REM] Removed attachment removal because garbage collecting will do it.
bzr revid: tde@openerp.com-20130306160517-b0rdbait2h6c9c77
2013-03-06 17:05:17 +01:00
Thibault Delavallée aa054ebb74 [REV] mail: reverted commit 8802. Reason: opt-out will be used only for marketing campaigns; notification_email_send for emails.
bzr revid: tde@openerp.com-20130306142741-ghazensh58xw3rvu
2013-03-06 15:27:41 +01:00
Thibault Delavallée d794920d43 [IMP] mail.compose.message: remove attachment_ids from render_message as it should not be there; assume wizard.attachment_ids is always correct.
bzr revid: tde@openerp.com-20130306134437-ywoi1p1nr2e1no97
2013-03-06 14:44:37 +01:00
Thibault Delavallée 7999477d63 [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130304092317-if7mytrydtktosif
bzr revid: tde@openerp.com-20130305080230-r5zreeqwr6sznxt4
bzr revid: tde@openerp.com-20130306112600-57feml4i8f5snad2
2013-03-06 12:26:00 +01:00
Thibault Delavallée 916bde1c3a [IMP] invite: only opt_out is taken into account when sending invite emails; added some comments to clean the code in 8.0
bzr revid: tde@openerp.com-20130306082445-hg2flvidtgso30dq
2013-03-06 09:24:45 +01:00
Thibault Delavallée ade7c33f18 [FIX] invite: do not send invite notification emails to partners having 'none' or opt_out.
bzr revid: tde@openerp.com-20130306080306-86k0pmzqiqilknzw
2013-03-06 09:03:06 +01:00
Thibault Delavallée c7d8842b02 [IMP] mail, email_template: fixed attachment management (template does not override provided attachments anymore; fixed possible unexisting attachment ids key; fixed some duplication.
bzr revid: tde@openerp.com-20130304092248-mqadzmrhgdu58j8y
2013-03-04 10:22:48 +01:00
Thibault Delavallée 46a5b63cad [IMP] email_template: better management of attachments. In mass mail, we want attachments to be duplicated due to the ownership concept of attachments in OpenERP.
bzr revid: tde@openerp.com-20130301144827-762362bgng5m4nye
2013-03-01 15:48:27 +01:00
Thibault Delavallée df6a3997c2 [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130301111146-1s5ckk09wdt88vb4
2013-03-01 12:11:46 +01:00
Thibault Delavallée aa865c8b61 [FIX] Still fixing attachments through templates.
bzr revid: tde@openerp.com-20130228145513-6g30ujr3cm0j8b3u
2013-02-28 15:55:13 +01:00
Thibault Delavallée b0eb876160 [FIX] mail: first try to fix attachment duplication.
bzr revid: tde@openerp.com-20130228132625-8yjggruhrvbvep21
2013-02-28 14:26:25 +01:00
Thibault Delavallée d2e1ff39cc [IMP] Chatter: full wizard composer does not display recipients in 'log' mode.
bzr revid: tde@openerp.com-20130226125038-bgpmfrmt3v44i870
2013-02-26 13:50:38 +01:00
Thibault Delavallée e09eb34a36 [IMP] mail: auto_follow mechanism moved into message_post.
bzr revid: tde@openerp.com-20130221130900-5l9wu6jrqh3l5yar
2013-02-21 14:09:00 +01:00
Thibault Delavallée cd13bb9cf9 [CLEAN] mail: stop doing ugly things with partner_ids values before passing values to mail_message.create().
bzr revid: tde@openerp.com-20130221095906-5rbwnc83mjvpkyhh
2013-02-21 10:59:06 +01:00
Thibault Delavallée cf4c6b442e [CLEAN] Some code cleaning.
bzr revid: tde@openerp.com-20130108161332-e1ekhtneh0mryhno
2013-01-08 17:13:32 +01:00
Thibault Delavallée 459da1fb46 [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130104160227-42e2vjrqf443muy4
2013-01-04 17:02:27 +01:00
Christophe Matthieu ee08ed5a57 [FIX] mail: default_partner_ids
bzr revid: chm@openerp.com-20130104144833-1wf6fc00jl6vrmri
2013-01-04 15:48:33 +01:00
Thibault Delavallée df7eb6120c [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130104105657-s8hif4p63oem8ddz
2013-01-04 11:56:57 +01:00
Thibault Delavallée f881997d60 [IMP] Invite wizard: emails send when invinting someone now contains sur user signature.
bzr revid: tde@openerp.com-20130104091045-74dn4lj9yyxdfdf6
2013-01-04 10:10:45 +01:00
Christophe Matthieu b0c55ff530 [IMP] mail invite: change browse into read for add signature
bzr revid: chm@openerp.com-20130103152610-mvb6b03u6bbfs3i6
2013-01-03 16:26:10 +01:00
Christophe Matthieu 992dbb2fbf [IMP] mail invite: add signature in invite and not in mail_mail
bzr revid: chm@openerp.com-20130103085732-p329g28wrslplfq3
2013-01-03 09:57:32 +01:00
Thibault Delavallée 92b9d12222 [FIX] Invite wizard: model and res_id were overrided with False by default, not necessary.
bzr revid: tde@openerp.com-20121227164336-22ejph1imvl6hl65
2012-12-27 17:43:36 +01:00
Thibault Delavallée 57facf47cd [IMP] Invite wizard: show emails of partners you choose as recipients.
bzr revid: tde@openerp.com-20121227164316-8bfs1m6vs2sonits
2012-12-27 17:43:16 +01:00
Thibault Delavallée 63d993e45d [CLEAN] invite wizard: removed unused method onchange_partner_ids. Cleaned a bit code in invite_view.
bzr revid: tde@openerp.com-20121221133928-lytc76vbs0bdnhuz
2012-12-21 14:39:28 +01:00
Thibault Delavallée 839d61f97f [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121221133349-u2lpl29430abrkyw
2012-12-21 14:33:49 +01:00
Christophe Matthieu d650d3c6ba [MERGE] from trunk
bzr revid: chm@openerp.com-20121221124830-8d6hz0b2h3o9c4pd
2012-12-21 13:48:30 +01:00
Christophe Matthieu d36ef41a46 [IMP] mail follower: don't display invite button if the user don't have write access. Use many2many_tags_email widget on composer
bzr revid: chm@openerp.com-20121221102649-xyecgj5tqd3li3hw
2012-12-21 11:26:49 +01:00
Thibault Delavallée 92597407f8 [CLEAN] Cleaned the cleaning of the fix.
bzr revid: tde@openerp.com-20130327111910-l7a9s5rk05b8jbme
2013-03-27 12:19:10 +01:00
Thibault Delavallée f307221f04 [IMP] Cleaned the fix.
bzr revid: tde@openerp.com-20130327111750-auc217sdkg4gieci
2013-03-27 12:17:50 +01:00
Thibault Delavallée 0004301b23 [IMP] mail: now have a subject in composer.
bzr revid: tde@openerp.com-20130326165015-czid1h8xot4mdhyi
2013-03-26 17:50:15 +01:00
Thibault Delavallée db5f32bb46 [CLEAN] mail: cleaned code of last fixes
bzr revid: tde@openerp.com-20130320141907-rxnstq7k8hrkcnl1
2013-03-20 15:19:07 +01:00
Thibault Delavallée 5d25e9d780 [FIX] mail_compose_message: fixed mass_mail subscribing the author to all documents, not the case anymore; fixed access rule on mail_compose_message not taking into account the wizard creation in mass_mail_mode (model but no res_id -> could lead to crash).
bzr revid: tde@openerp.com-20130320135013-mryxzwssd346t78y
2013-03-20 14:50:13 +01:00
Thibault Delavallée 2c497fab50 [FIX] mail: mass mailing now does not push to followers; only to specific recipients. Improved tests for this update.
bzr revid: tde@openerp.com-20130320084040-pcgzy068z0oph298
2013-03-20 09:40:40 +01:00
Thibault Delavallée f49f43958d [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121221100609-2x59amtxj4sjedcu
2012-12-21 11:06:09 +01:00
Thibault Delavallée b37450ba49 [IMP] sale, purchase, invoice: automatically subscibe recipints of Send by email as document followers.
bzr revid: tde@openerp.com-20121221095902-k2xk928po48cogdm
2012-12-21 10:59:02 +01:00
Olivier Dony 26e93a59b3 [IMP] mail.compose.message: show emails in m2m_tags, to help confirm partner selection
bzr revid: odo@openerp.com-20121220172012-f0j24mzljgqs9l0r
2012-12-20 18:20:12 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Thibault Delavallée cd0aab0789 [FIX] mail.compose.message: fixed creation of message on its own profile (res_users -> res_partner).
bzr revid: tde@openerp.com-20121212160736-wcas9ucgzkcm1o7f
2012-12-12 17:07:36 +01:00
Thibault Delavallée 347d0e5b46 [IMP] portal removed access rights of portal user on res_partner and derived tables. Updated several accesses to bypass the security issues. Updated portal tests to have a more complete test scenario.
bzr revid: tde@openerp.com-20121212125518-k0s07niojr8a1xtu
2012-12-12 13:55:18 +01:00
Thibault Delavallée 0237833240 [FIX] mail.compose.message: fixed rendering when no template is chosen in the selection box; also cleaned display of recipients when using the wizard in mass mailing mode.
bzr revid: tde@openerp.com-20121211155435-l5s9lpghpxw8bi9o
2012-12-11 16:54:35 +01:00
Thibault Delavallée 45e1682327 [FIX] [CLEAN] mail: fixed some access rules issues; removed now unused files.
bzr revid: tde@openerp.com-20121211143301-b52ji02vynvgo3m9
2012-12-11 15:33:01 +01:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +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
Bhumi Thakkar (Open ERP) 1c23e4c671 [FIX] pass the res_model and res_id (user who has hr/employee rights able to invite others.)
bzr revid: bth@tinyerp.com-20121204100651-3xg8q22uszm38gm0
2012-12-04 15:36:51 +05:30
Olivier Dony b770240247 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
2012-11-20 17:34:29 +01:00
Olivier Dony 01df612cd9 [FIX] mail.compose.wizard: attachments should be m2m, body_text and content_subtype obsolete and removed
bzr revid: odo@openerp.com-20121116170503-mvsaa0pv5py2b7ri
2012-11-16 18:05:03 +01:00