Commit Graph

543 Commits

Author SHA1 Message Date
Olivier Dony d22c3043aa [FIX] marketing_campaign: typos and cleanup
bzr revid: odo@openerp.com-20110912180025-scdjvcnquo07zcha
2011-09-12 20:00:25 +02:00
Olivier Dony 9d93a382a3 [IMP] email_template: use raw template for msg composition in mass_mail mode
bzr revid: odo@openerp.com-20110909201037-qz9m9mte6qh8flxd
2011-09-09 22:10:37 +02:00
Olivier Dony 57ce728cf5 [IMP] email_template: more robust model/record context passing
bzr revid: odo@openerp.com-20110909155427-7zy4x96jvg3lu09v
2011-09-09 17:54:27 +02:00
Olivier Dony d5d2099658 [IMP] mail*: rename mail.compose.wizard extension, for consistency
bzr revid: odo@openerp.com-20110909131045-mzuspzazkv34ns3q
2011-09-09 15:10:45 +02:00
Olivier Dony 0a751bcae5 [IMP] email.template: typos and usability review
bzr revid: odo@openerp.com-20110908175541-h2qdchdwf60srksy
2011-09-08 19:55:41 +02:00
Olivier Dony 4281cbd0de [IMP] email.template: typos and usability review
bzr revid: odo@openerp.com-20110908173752-j6z5kd1in80jk8re
2011-09-08 19:37:52 +02:00
Olivier Dony 321b513f04 [FIX] email.template: view typo
bzr revid: odo@openerp.com-20110907211759-ypex6nziuyz1icuz
2011-09-07 23:17:59 +02:00
Olivier Dony c908a2f4d3 [FIX] email_template: unused import
bzr revid: odo@openerp.com-20110907172551-sgk2k2i7oh8hi5zh
2011-09-07 19:25:51 +02:00
Olivier Dony 1db8e54425 [IMP] all: unified context params for mail composition wizard
A single common `mail.compose.message.mode` key is now
used in the context, avoiding name collisions and being
more consistent.

bzr revid: odo@openerp.com-20110906093228-itbilwzpv4wl07j9
2011-09-06 11:32:28 +02:00
Olivier Dony f42126df0e [MERGE] latest trunk
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
Launchpad Translations on behalf of openerp 752df5acbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Antony Lesuisse 71443ad49f [MERGE] trunk
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
Olivier Dony 0b0aa95cfe [IMP] email_template: another pass of cleanup (wip)
bzr revid: odo@openerp.com-20110825122725-mc1zx2f3ck9xr6g9
2011-08-25 14:27:25 +02:00
Launchpad Translations on behalf of openerp ae7b1699cb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
Olivier Dony 4fcb67bef1 [MERGE] latest trunk
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
Launchpad Translations on behalf of openerp 063e28a83d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
Launchpad Translations on behalf of openerp ac9c0e55b0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
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
Launchpad Translations on behalf of openerp 4c6e88ba46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110809045042-2gdi00rnxmh7s0ki
2011-08-09 04:50:42 +00:00
Launchpad Translations on behalf of openerp be1a659658 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110803043726-ofn4l3px2ooldl00
bzr revid: launchpad_translations_on_behalf_of_openerp-20110804043456-fnef8uwgur5od0en
2011-08-04 04:34:56 +00:00
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP) 1f5aa0643f [IMP]: module is defined by its complexity
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Launchpad Translations on behalf of openerp eedefe1ebc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110628044031-fyrldmppur3u2vso
2011-06-28 04:40:31 +00:00
Launchpad Translations on behalf of openerp 552afb10c5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603044017-yoke5zwvpebyo93o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604045342-rkt8o6e65uyj8kjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605043539-vvllkcbozllrdlg7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606043718-0i2770ro7c0oho9t
2011-06-06 04:37:18 +00:00
Launchpad Translations on behalf of openerp e7bb8477dc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050137-14v8hzg4qgfwpf2m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110520043441-u9e1vje80f6he7xj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110521050229-ayodl6xmd20k7wd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20110522044744-l0biw9ydemk013yv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110523043818-uc1feowa93sym0df
2011-05-23 04:38:18 +00:00
Vo Minh Thu a37a4404fb [REF] consistent, grepable ir.values object naming.
bzr revid: vmt@openerp.com-20110516153331-vusrrgr3hvlcyei0
2011-05-16 17:33:31 +02:00
Rifakat Haradwala (Open ERP) 89ee28b7d1 email_template: code optimization, removed unused imports and useability fix
bzr revid: rha@tinyerp.com-20110511110423-ojb059dpf1m39ib5
2011-05-11 16:34:23 +05:30
Rifakat Haradwala (Open ERP) 5c0308f078 [FIX]
bzr revid: rha@tinyerp.com-20110510135048-f044stg7gaij0867
2011-05-10 19:20:48 +05:30
Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk.

bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
Launchpad Translations on behalf of openerp 4eb213855e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430060855-5u495d7r5747wf64
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501060400-go1qlvkfuyg5tk1c
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502060719-c9oa62lpvkf87sl3
2011-05-02 06:07:19 +00:00
Launchpad Translations on behalf of openerp d553615695 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Rifakat Haradwala (Open ERP) 8ac91b8336 [FIX] email_template: fix model in save_as_template()
bzr revid: rha@tinyerp.com-20110428085107-vv2l6ue1vzf2pdfk
2011-04-28 14:21:07 +05:30
Rifakat Haradwala (Open ERP) d8c8c20a62 [MERGE] : merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: rha@tinyerp.com-20110428072503-nrset8wqcsgewwev
2011-04-28 12:55:03 +05:30
Launchpad Translations on behalf of openerp 7464803d7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426060409-o8efsi8e0x8qdgpj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110427054644-lhqa0wkovwihv339
bzr revid: launchpad_translations_on_behalf_of_openerp-20110428054929-cx8ppeco060z80wm
2011-04-28 05:49:29 +00:00
Rifakat Haradwala (Open ERP) d0db365ac5 [FIX] email_template: closing wizard on creating new template
bzr revid: rha@tinyerp.com-20110427103536-ppnufnu1ae8dbgt4
2011-04-27 16:05:36 +05:30
Harry (OpenERP) 73209aee95 [MERGE] email_template: new button save as template in compose wizard
bzr revid: hmo@tinyerp.com-20110426125727-9l5ig560u2kyzrud
2011-04-26 18:27:27 +05:30
Rifakat Haradwala (Open ERP) 855b512e74 [FIX]
bzr revid: rha@tinyerp.com-20110426123824-l49480b3bkm0mr2k
2011-04-26 18:08:24 +05:30
Rifakat Haradwala (Open ERP) f7883303b4 [FIX] email_template: added icon for button 'Save As Template' and change string and changes in search method domain for save_as_template()
bzr revid: rha@tinyerp.com-20110426122054-p4jcrk9zzt97dp8i
2011-04-26 17:50:54 +05:30
Rifakat Haradwala (Open ERP) d63731b65f [IMP]: email_template:
*able to save email as new template to reuse it
*evaluating expression type for mail same as email_template

bzr revid: rha@tinyerp.com-20110426115445-qpx91w218tyg4jde
2011-04-26 17:24:45 +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
Harry (OpenERP) da7aad526d [REVIEW+FIX]
bzr revid: hmo@tinyerp.com-20110420134033-m1euj9hws0i6v0tx
2011-04-20 19:10:33 +05:30
Rifakat Haradwala (Open ERP) 0ce94ac23a [FIX]: email_template: indentation
bzr revid: rha@tinyerp.com-20110420124610-jpp6yc4b6qoxu8tf
2011-04-20 18:16:10 +05:30
Rifakat Haradwala (Open ERP) 71794fb91a [IMP] email_template: changes in on_change_template where called generate_email() of template and clean the code
bzr revid: rha@tinyerp.com-20110420115430-wdghz5qd6nzw8pnf
2011-04-20 17:24:30 +05:30
Launchpad Translations on behalf of openerp fb32f55849 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110416065239-g3irbzfx16z2npex
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417061331-ca79vijfetbbvsf4
2011-04-17 06:13:31 +00:00
Launchpad Translations on behalf of openerp 25da1b63a3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110416045916-5ck4ifulww06owks
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417043634-x8jqcrbbylxdj06l
2011-04-17 04:36:34 +00:00
Rifakat Haradwala (Open ERP) 99bac0b9be [REM] email_template: remove email_template_send wizard and IMP
bzr revid: rha@tinyerp.com-20110414131938-5y133uyx5j7hl5v0
2011-04-14 18:49:38 +05:30
Rifakat Haradwala (Open ERP) c61bf2dcf4 [FIX] email_template, mail: added constraint and fix return type for mako template in email_template
bzr revid: rha@tinyerp.com-20110414113401-dwhhu7srusqh4yfj
2011-04-14 17:04:01 +05:30
Rifakat Haradwala (Open ERP) 482ca7ddd3 [IMP] email.compose.message: improvements for mass mailing and email_teplate
bzr revid: rha@tinyerp.com-20110414083543-0aq55ib9j2dn0ouw
2011-04-14 14:05:43 +05:30
Rifakat Haradwala (Open ERP) db89a49fa0 [FIX] email_template: fix on_change_template
bzr revid: rha@tinyerp.com-20110414045503-t1l81wx5n72ixa85
2011-04-14 10:25:03 +05:30
Harry (OpenERP) 2f2a489e0a [REVIEW] clean compose wizard with template
bzr revid: hmo@tinyerp.com-20110413133727-b2ghap9v5zjmnk9k
2011-04-13 19:07:27 +05:30
Harry (OpenERP) 51ce311aac [MERGE+REVIEW]
bzr revid: hmo@tinyerp.com-20110413130425-yaljvh5kexeqdf6f
2011-04-13 18:34:25 +05:30
Rifakat Haradwala (Open ERP) e2c7bfc88c [FIX] email.compose.message: set signature and auto_delete on change of template
bzr revid: rha@tinyerp.com-20110413113633-un3xkrbhlfaof585
2011-04-13 17:06:33 +05:30
Rifakat Haradwala (Open ERP) a353b5e927 [IMP] email.message.common:
*removed context email_model and email_res_id from related modules as there is no need
*improvements for email.message.common 
*removed fields track_campaign_item and message_id and imp for email_template

bzr revid: rha@tinyerp.com-20110413104145-htrse705w3aak2f3
2011-04-13 16:11:45 +05:30
Harry (OpenERP) bc708c8b96 [REVIEW] remove passing email_model and email_res_id into context
bzr revid: hmo@tinyerp.com-20110412091820-t9wjrzetr814soeg
2011-04-12 14:48:20 +05:30
P. Christeas 9e44cd5bfe all: Fix execute permission and shebang at files
Non-standalone python scripts shall not have a shebang. Others will need
to be executable.
(cherry picked from commit 6ec513d17cafcdd235b4805363d3cd6daa494f2f)

bzr revid: p_christ@hol.gr-20110408112324-nc781po7efhjye21
2011-04-08 14:23:24 +03:00
Launchpad Translations on behalf of openerp a0507fe0db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408061309-vdc4fos4jns3upnx
2011-04-08 06:13:09 +00:00
Rifakat Haradwala (Open ERP) fa0aa7f2ad [IMP] email.compose.message: removed method _get_records() and on_change_referred_doc()
bzr revid: rha@tinyerp.com-20110407134220-w54lyxvcy7dzvemg
2011-04-07 19:12:20 +05:30
Rifakat Haradwala (Open ERP) 05f807aff0 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: rha@tinyerp.com-20110407125222-47bh391vfilpc2ou
2011-04-07 18:22:22 +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 b11a71fd87 [MERGE] improvement project-issue
bzr revid: tfr@openerp.com-20110407114145-xvr27pjquxwk9ff0
2011-04-07 13:41:45 +02:00
Launchpad Translations on behalf of openerp ce937912ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406060228-pyb9f2qgl1betbp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407055457-2bu9my2e5ltros01
2011-04-07 05:54:57 +00: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
Launchpad Translations on behalf of openerp ffee41cbed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406043928-xqladzrd05q5t19g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407043758-7t6u87d24s7yq2lf
2011-04-07 04:37:58 +00:00
Rifakat Haradwala (Open ERP) abdd303854 [FIX] email_template: fix reference for generate_tracking_message_id()
bzr revid: rha@tinyerp.com-20110406123000-ow2j0mjfhplp1lb5
2011-04-06 18:00:00 +05:30
Rifakat Haradwala (Open ERP) ed51109341 [FIX] email_template: fix module reference to mail from email in email_template.py
bzr revid: rha@tinyerp.com-20110406112454-gswjtw5v8hl7s3gb
2011-04-06 16:54:54 +05:30
Harry (OpenERP) 37a916b539 [MERGE] cleanup email module and rename it with mail module
bzr revid: hmo@tinyerp.com-20110406054513-bn5e5sys9ugm1vq5
2011-04-06 11:15:13 +05:30
Launchpad Translations on behalf of openerp 838512af0b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
Dhruti(OpenERP) 1b7131e595 [FIX] email_template_account : Fixed the Unicode errors(Case 4594)
bzr revid: jvo@tinyerp.com-20110401093855-ldak595l1pq8vl5b
2011-04-01 15:08:55 +05:30
Rifakat Haradwala (Open ERP) 9a9c100595 [Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: rha@tinyerp.com-20110330092614-sgnniorxit17zvxn
2011-03-30 14:56:14 +05:30
Harry (OpenERP) cf7c73310d [MERGE] merged with trunk addods development branch
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
Launchpad Translations on behalf of openerp d8ca559b5d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
Rifakat Haradwala (Open ERP) 974e45de8a [IMP] email_message.py: improvements in send_email and change references
bzr revid: rha@tinyerp.com-20110328135224-nshd4lbsmdgm4xr5
2011-03-28 19:22:24 +05:30
Launchpad Translations on behalf of openerp ed4c641982 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110324061752-u9lxt6wjq0g5g07q
bzr revid: launchpad_translations_on_behalf_of_openerp-20110325061430-fjv19l7id8dq8g80
bzr revid: launchpad_translations_on_behalf_of_openerp-20110326150652-3m5g39xj5wvr4ygj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110327062900-m7iwe7fiuezytgm2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110328052519-xcxvtq0i05gaab8i
2011-03-28 05:25:19 +00:00
Launchpad Translations on behalf of openerp c5ca5a565f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110326050046-dq45skrem9w4mvec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110327045332-0qk3wj2yahi6f7ty
bzr revid: launchpad_translations_on_behalf_of_openerp-20110328043636-fm3ded2ur36t8x6q
2011-03-28 04:36:36 +00:00
niv-openerp 55a226ef3a [MERGE] Resynchronized with trunk.
bzr revid: nicolas.vanhoren@openerp.com-20110325102413-7xjgusazsow7nwaf
2011-03-25 11:24:13 +01:00
Rifakat Haradwala (Open ERP) 24883b8c57 [IMP] crm,project_issue: did related changes
bzr revid: rha@tinyerp.com-20110325041227-ljpbuaf8gu03ak89
2011-03-25 09:42:27 +05:30
Rifakat Haradwala (Open ERP) 5bca2b6f1c [IMP] email: improvment in email_send method
bzr revid: rha@tinyerp.com-20110322133725-3dfx8pvx3dy41mgk
2011-03-22 19:07:25 +05:30
vro 28bb0168f2 [IMP]: Detailed descriptions added.
bzr revid: vro@tinyerp.com-20110322132141-nlms978ymg4mom1g
2011-03-22 18:51:41 +05:30
Launchpad Translations on behalf of openerp 82de026e8f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110316054257-o0k1zy1zk9o5tb9k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110317061249-jfr5yx3lj00vn20k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110318061727-rl00oqonw601p5uh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110319070951-7hc0io27922zyb89
bzr revid: launchpad_translations_on_behalf_of_openerp-20110320063141-rae2iw1pdee0o57e
bzr revid: launchpad_translations_on_behalf_of_openerp-20110321062259-umxel4cvlvocrdsd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110322062342-4gpy4ewvfc3ef4gc
2011-03-22 06:23:42 +00:00
Rifakat Haradwala (Open ERP) 2fe7c51e36 [REM] email.smtp_server: removed email.smtp_server and did changes in email module
bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
2011-03-21 19:01:56 +05:30
niv-openerp cf07e58016 [MERGE] Other improvements of descriptions in module manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
Rifakat Haradwala (Open ERP) 455fb2d6b3 [IMP] email: email cleanup
bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz
2011-03-18 19:14:19 +05:30
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp a898038b47 [MERGE] Merged module screenshots and improvements to module descriptions.
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
Launchpad Translations on behalf of openerp c18e506cf5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110318050000-clr4x2jge8ptg7q6
2011-03-18 05:00:00 +00:00
Quentin (OpenERP) 8295f3125f [MERGE] lp:684741
bzr revid: qdp-launchpad@openerp.com-20110317173316-1nwca68kko2dlu1c
2011-03-17 18:33:16 +01:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
Rucha (Open ERP) 117d3f75a0 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
Xavier Morel 4e6a9ea55c [REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
Xavier Morel 8141573dee [REM] attribute 'select' on field elements in search views, this attributes makes no sense
bzr revid: xmo@openerp.com-20110315124111-c79fxotsc0tk011q
2011-03-15 13:41:11 +01:00
vro f872742018 [ADD]: Images: document_ftp, document_ics, email_template, event
bzr revid: vro@tinyerp.com-20110315113252-vwkvqm06wb28zgjv
2011-03-15 17:02:52 +05:30
Launchpad Translations on behalf of openerp f507ed1523 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110315061146-ab54ll4nrr5194ef
2011-03-15 06:11:46 +00:00
Launchpad Translations on behalf of openerp 68cea1f17c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110315045524-g1gk5txaht0rafmz
2011-03-15 04:55:24 +00:00
Yogesh (OpenERP) bb18651fdc [FIX] model field value overwrite problem fix in email.compose.message wizard.
bzr revid: ysa@tinyerp.com-20110310091520-0u1mjgzfrkukwklf
2011-03-10 14:45:20 +05:30
Yogesh (OpenERP) e1afe5828a [IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
Els Van Vossel a69c473f52 [IMP] Changed all module categories, limited number of categories
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
Rifakat Haradwala (Open ERP) 3aea08000a [Merge] : Merge with lp:openobject-addons
bzr revid: rha@tinyerp.com-20110309062148-2lu0jdzg16m9gsus
2011-03-09 11:51:48 +05:30
Launchpad Translations on behalf of openerp 1e681a15bc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045627-sks4s3i42qo2oj3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306045008-pcson59t3bl9r6ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307044936-g60qlnsbhllrba7h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308044752-1i8vh7qa5baootby
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309044026-i5o7lki6yoc0wwol
2011-03-09 04:40:26 +00:00
Rifakat Haradwala (Open ERP) 64f9d7e94f [IMP] : base_module_quality, crm, email_template, mail_gateway, sale_crm, share: string formatting
bzr revid: rha@tinyerp.com-20110308112208-40jbv5er9w21xiw0
2011-03-08 16:52:08 +05:30
Yogesh (OpenERP) 92864126a9 [IMP] email_template :- create get_template_data method and remove code in on_change and default_get method. make generic method in email.compose.messageg wizard.
bzr revid: ysa@tinyerp.com-20110301102852-c35165ydv2xuufb0
2011-03-01 15:58:52 +05:30
Yogesh (OpenERP) 230b03e26f [IMP] improce email.compose wizard code. and change active_id to email_res_id.
bzr revid: ysa@tinyerp.com-20110301095057-sb8tsgovwpt852yj
2011-03-01 15:20:57 +05:30
Launchpad Translations on behalf of openerp 5179d14dc6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301060134-h4v5yqqy6j4a3nup
2011-03-01 06:01:34 +00:00
Yogesh (OpenERP) 3f3bcfdca2 [IMP] default attachment_ids change based on onchange of template_id field.
bzr revid: ysa@tinyerp.com-20110228120440-tpacaidf6371b898
2011-02-28 17:34:40 +05:30
Yogesh (OpenERP) d5494f5ea4 [IMP] emails,crm,project,project_scrum :- improve email.compose.wizard and add blank value add in selection box of template_id field in wizard. if template_id blank then default value set based on current record.
bzr revid: ysa@tinyerp.com-20110228113919-d7quaz8uqmjnkuzh
2011-02-28 17:09:19 +05:30
RME (OpenERP) 39de9b8f34 [FIX] email_template : there is no further use of 'base.res_groups_email_template_admin' that creating problem
lp bug: https://launchpad.net/bugs/724788 fixed

bzr revid: rme@tinyerp.com-20110225102330-w5anc6ldb27wbr8n
2011-02-25 15:53:30 +05:30
Harry (OpenERP) 9006764368 [REM] email_template: remove email_template_security.xml
bzr revid: hmo@tinyerp.com-20110225081418-91ynfdq1klcbv7zi
2011-02-25 13:44:18 +05:30
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
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
Yogesh (OpenERP) 122e28da04 [IMP] email_template :- Change the action of old email.send wizard to new email.compose.message in create_action method in email_template and inherit default_get method and set default value of template.
bzr revid: ysa@tinyerp.com-20110224104801-xcua49za83sm12mn
2011-02-24 16:18:01 +05:30
Yogesh (OpenERP) ece864e532 [IMP] email.compose.message :- add the email_model=model name pass in context in xml file and change the active_model to email_model in default_get method. Global list define of email_model in crm and module are install then add the model name in this list.
bzr revid: ysa@tinyerp.com-20110224101305-iagvga1j6o6h4k0k
2011-02-24 15:43:05 +05:30
Yogesh (OpenERP) bf37d84341 [IMP] email_template, emails:- improve default set value. context pass on onchange method and check in method if mail is reply then donot change the value in send mail wizard.
bzr revid: ysa@tinyerp.com-20110223162249-ruiaknvx0i9o4xec
2011-02-23 21:52:49 +05:30
Yogesh (OpenERP) 174534ff5e [IMP] email_template, emails:- message id and reference write in message add reference argument in email_send method.
bzr revid: ysa@tinyerp.com-20110223122228-iyzw7mdfvw0zrzw8
2011-02-23 17:52:28 +05:30
Yogesh (OpenERP) 30bde91c88 [ADD] email_template :- inherit email.compose.message wizard and add template_id field. on template_id field get template and change the value of wizard.
bzr revid: ysa@tinyerp.com-20110223092708-aibiuj5ojw41y6ky
2011-02-23 14:57:08 +05:30
Yogesh (OpenERP) 99c4933b50 [ADD] emails :- add email.message send wizard.
bzr revid: ysa@tinyerp.com-20110217105844-sj5o5y1qmszp6mtw
2011-02-17 16:28:44 +05:30
Yogesh (OpenERP) a084e73585 [IMP] email_template :- openobject_id pass as a int in generate_email method.
bzr revid: ysa@tinyerp.com-20110216073312-6m133fmnzgf61v71
2011-02-16 13:03:12 +05:30
Yogesh (OpenERP) 79f7a3e7fd [IMP]email_template:- also check template has no smtp_server_id then it take default smtp_server.
bzr revid: ysa@tinyerp.com-20110216055600-z8avrlljeatr3kp7
2011-02-16 11:26:00 +05:30
Yogesh (OpenERP) db7a8f267c [IMP] remove unused statement.
bzr revid: ysa@tinyerp.com-20110215131422-beljdfbgsexjyxl3
2011-02-15 18:44:22 +05:30
Yogesh (OpenERP) 0a7798282d [IMP] remove unused import statement.
bzr revid: ysa@tinyerp.com-20110215131301-5u0gqzban0ir5g2i
2011-02-15 18:43:01 +05:30
Yogesh (OpenERP) 35c054d352 [IMP] email_template :- change string in user_id field and get action id using get_id method.
bzr revid: ysa@tinyerp.com-20110215125114-7100vv8hf8q61wan
2011-02-15 18:21:14 +05:30
Yogesh (OpenERP) 8a7e0e4670 [FIX] email_template :- expression work in email body.
bzr revid: ysa@tinyerp.com-20110215112814-mcnwe33w7mnfxi7v
2011-02-15 16:58:14 +05:30
Yogesh (OpenERP) ab40ea51b5 [IMP] email_template :- improve search view and remove duplicate fields.
bzr revid: ysa@tinyerp.com-20110215110924-bvp0gwwjskq3iolh
2011-02-15 16:39:24 +05:30
Yogesh (OpenERP) d570961967 [FIX] email_template :- default set report_template field.
bzr revid: ysa@tinyerp.com-20110215103442-82zrtbppe61xsq1p
2011-02-15 16:04:42 +05:30
Yogesh (OpenERP) 7074f23e1e [FIX] email_template :- fix some problem.
bzr revid: ysa@tinyerp.com-20110215095833-29l8h24iiqh9c29h
2011-02-15 15:28:33 +05:30
Harry (OpenERP) 85d30e07a2 [IMP] emails: made email.message.template osv_memory object to contain all fields of email messages
bzr revid: hmo@tinyerp.com-20110215092344-zjbcqek2iphdg88g
2011-02-15 14:53:44 +05:30
Harry (OpenERP) 1b8a753896 [FIX] email_template: fix
bzr revid: hmo@tinyerp.com-20110215091147-axdlz8hum7zmpzkr
2011-02-15 14:41:47 +05:30
Harry (OpenERP) 933100051d [FIX] email_template: system error
bzr revid: hmo@tinyerp.com-20110215070800-0dbt0mn9hljgiidt
2011-02-15 12:38:00 +05:30
Harry (OpenERP) b3731151c3 [IMP] email_template: on sending email: if model has own template, emails will be sent base on that template
bzr revid: hmo@tinyerp.com-20110215070515-opxsfg2a0p05mxlm
2011-02-15 12:35:15 +05:30
Harry (OpenERP) 5121b552f8 [REVIEW+IMP] email_template: set message_id on email.message when generate email from email.template
bzr revid: hmo@tinyerp.com-20110215063955-xtwwsncn4fofjhga
2011-02-15 12:09:55 +05:30
Harry (OpenERP) 328024b462 [REVIEW+FIX] emails: fix
bzr revid: hmo@tinyerp.com-20110215062011-efn6o3vbj052jja4
2011-02-15 11:50:11 +05:30
Harry (OpenERP) b7baed1bca [REVIEW+IMP] - emails: added new state in email.message: Sent, Exception
if email sent successfully, set as a Sent otherwise Exception.
- email_template: now email_template.send_wizard inherit from email.template

bzr revid: hmo@tinyerp.com-20110215054805-9llgl3bltx5dzz0y
2011-02-15 11:18:05 +05:30
Harry (OpenERP) f517e94750 [ADD] email_template: mako template for email
bzr revid: hmo@tinyerp.com-20110215045335-hpfuarocyihgbqco
2011-02-15 10:23:35 +05:30
Harry (OpenERP) 72220cb09b [REVIEW+IMP] email_template: inherit related improvement
bzr revid: hmo@tinyerp.com-20110214194936-92himmpn80ytmjim
2011-02-15 01:19:36 +05:30
Thibault Francois a001b29366 [MERGE] my-addons
bzr revid: tfr@openerp.com-20110214163231-41oa4q6mrczj0015
2011-02-14 17:32:31 +01:00
Olivier Dony 07f520a856 [MERGE] merged bugfixes from 6.0 up to revision 4401
bzr revid: odo@openerp.com-20110214114507-8uwohpcblsfhgjae
2011-02-14 12:45:07 +01:00
Harry (OpenERP) 2c491e1774 [REVIEW+IMP] email_template: rename field name:from_account with smtp_server_id
bzr revid: hmo@tinyerp.com-20110214064444-30snselruzgxb1rs
2011-02-14 12:14:44 +05:30
Harry (OpenERP) 2806252ce6 [REVIEW] emails: change name of menues
bzr revid: hmo@tinyerp.com-20110214063435-oz1atoiwvtklytc6
2011-02-14 12:04:35 +05:30
Yogesh (OpenERP) 0cf7326744 [FIX] Fix email attachment problem.
bzr revid: ysa@tinyerp.com-20110209071536-tr58f9b661y84fn9
2011-02-09 12:45:36 +05:30
Yogesh (OpenERP) ed0ed68dbf Improve send mail wizard.
bzr revid: ysa@tinyerp.com-20110209070009-qnh3n7l5szmlgtb2
2011-02-09 12:30:09 +05:30
Yogesh (OpenERP) 17f3af8652 [IMP] improve code of send mail wizard in email_template module.
bzr revid: ysa@tinyerp.com-20110209055944-7gu1o2nhj4gll5w1
2011-02-09 11:29:44 +05:30
Yogesh (OpenERP) 64b194a950 Improve send mail wizard in email_template module.
bzr revid: ysa@tinyerp.com-20110208123417-c0jso0wz364xmpow
2011-02-08 18:04:17 +05:30
Yogesh (OpenERP) 20b34865ea Fix problem in email.template.preview wizard.
bzr revid: ysa@tinyerp.com-20110208121855-zxqrmgyk0rkhlms9
2011-02-08 17:48:55 +05:30
Yogesh (OpenERP) 26447d3f50 [MOV] change module name email to emails
bzr revid: ysa@tinyerp.com-20110208085311-yepv15l0pskvrmc2
2011-02-08 14:23:11 +05:30
Yogesh (OpenERP) defc1aaf96 [IMP] Improve view in email_template and email module.
bzr revid: ysa@tinyerp.com-20110208054339-7os49d348uerib9q
2011-02-08 11:13:39 +05:30
Yogesh (OpenERP) ab3aeb31a8 [IMP] Improve view in email_template.
bzr revid: ysa@tinyerp.com-20110208051334-bc6k96r4cyc7hx1k
2011-02-08 10:43:34 +05:30
Yogesh (OpenERP) 3cf67ee9de [IMP] improve code in email_template.
bzr revid: ysa@tinyerp.com-20110208050535-4s0rbpd3zzs4g70a
2011-02-08 10:35:35 +05:30
Jay Vora (OpenERP) c57658c9b1 [FIX] Email_template : Corrected context of action
lp bug: https://launchpad.net/bugs/688069 fixed

bzr revid: jvo@tinyerp.com-20110207113252-o1n57152p85lqj0v
2011-02-07 17:02:52 +05:30
Yogesh (OpenERP) 14ad9975d0 fix in email_template module.
bzr revid: ysa@tinyerp.com-20110207091529-r9vm0ed0flsdbi5w
2011-02-07 14:45:29 +05:30
Yogesh (OpenERP) 43f0699237 [IMP] improve view in email and fetchmail module.
bzr revid: ysa@tinyerp.com-20110207085538-4os2e6toajhjey36
2011-02-07 14:25:38 +05:30
Yogesh (OpenERP) 64d9fddcb0 Improve code.
bzr revid: ysa@tinyerp.com-20110204130409-7kcs95olx5nzjd6h
2011-02-04 18:34:09 +05:30
Yogesh (OpenERP) ef5907f8be [IMP] improve onchange method. merge 3 method in 1 method. old method keep in comment.
bzr revid: ysa@tinyerp.com-20110204112851-q10tg2fgxpghbuof
2011-02-04 16:58:51 +05:30
Yogesh (OpenERP) dd448a6fd3 Fix in eamil_template module.
bzr revid: ysa@tinyerp.com-20110204101925-aawudln986xnmss5
2011-02-04 15:49:25 +05:30
Yogesh (OpenERP) 6bdf56a973 [MERGE] Merge with lp:openobject-addons
bzr revid: ysa@tinyerp.com-20110204092456-t9lequsjqs7pk1vz
2011-02-04 14:54:56 +05:30
Yogesh (OpenERP) da82b82b97 Keep unused code in comment. Improve email_template_send wizard in email_template module.
bzr revid: ysa@tinyerp.com-20110204085048-zdkvb2y83lnnz83t
2011-02-04 14:20:48 +05:30
YSA (Openerp) e9e229568b [IMP] email_template :- generate template to message then donot send the mail bug set state waiting and put in outbox folder.
bzr revid: ysa@tinyerp.com-20110203132617-sx55sje74w765qsx
2011-02-03 18:56:17 +05:30
YSA (Openerp) 7efe625e33 [ADD] add template_id field in email_message and process_email_queue method override.
bzr revid: ysa@tinyerp.com-20110203131357-4tdrujcq3lh120v0
2011-02-03 18:43:57 +05:30
YSA (Openerp) c1d0c83373 [REM] remove account_id field in email.messae objects.
bzr revid: ysa@tinyerp.com-20110203125113-021wxjoxdyvbp9cn
2011-02-03 18:21:13 +05:30
YSA (Openerp) 4b2611c37b [IMP] create a spearate file of email_message and email_smtp_server objects in email module.
bzr revid: ysa@tinyerp.com-20110203124437-6lzousfrq6pr2m1v
2011-02-03 18:14:37 +05:30
YSA (Openerp) 43878cbedb [IMP] improve view and menu in email and email_template module.
bzr revid: ysa@tinyerp.com-20110203112831-u3yq2pkv2fdxflgu
2011-02-03 16:58:31 +05:30
YSA (Openerp) d5395059b6 [REM] remove marketing dependancy in email_template module.
bzr revid: ysa@tinyerp.com-20110203104456-gibuqz9ppe7v0ikv
2011-02-03 16:14:56 +05:30
YSA (Openerp) f4516dd2ac [ADD] add process_queue button in email.message.
bzr revid: ysa@tinyerp.com-20110203102459-u1jencznkp1a60c9
2011-02-03 15:54:59 +05:30
YSA (Openerp) 5e912c68d6 [IMP] remove template_languange in email_template module.
bzr revid: ysa@tinyerp.com-20110203101428-pwxk02no9tbxfzkz
2011-02-03 15:44:28 +05:30
YSA (Openerp) 492bd0eea5 [IMP] improve email_send method and pass the smtp related all argument in email module. add column in email.message object and related improvement.
bzr revid: ysa@tinyerp.com-20110203065913-q33pek0p4puxvbyy
2011-02-03 12:29:13 +05:30
Launchpad Translations on behalf of openerp bbfa775055 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044526-s8t9nmtqd7do7yy4
2011-02-03 04:45:26 +00:00
YSA (Openerp) 67112d28cd [IMP] email_template :- improve send email wizard.
bzr revid: ysa@tinyerp.com-20110202084833-eefs04xx66bxx7g1
2011-02-02 14:18:33 +05:30
YSA (Openerp) 052a059029 [IMP] improve email, email_gateway and email_template module.
bzr revid: ysa@tinyerp.com-20110202084029-do4g3euykt5k79gd
2011-02-02 14:10:29 +05:30
YSA (Openerp) 06b5ce2287 [IMP] Improve email, email_template and email_gateway module.
bzr revid: ysa@tinyerp.com-20110201120349-30hvqiiwbvvbam98
2011-02-01 17:33:49 +05:30
YSA (Openerp) 1513a9ae77 [IMP] clean email_template module, merge email_template and mail_gateway module, developed email_gateway module. task ID-2007.
bzr revid: ysa@tinyerp.com-20110201114308-nwb7qzj8ko99eerw
2011-02-01 17:13:08 +05:30
Launchpad Translations on behalf of openerp 91ce37a2ef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110201044208-pe8pzdkn35l4m5v1
2011-02-01 04:42:08 +00:00
Launchpad Translations on behalf of openerp 7a59b73896 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060829-cw2n1p0rxt186agi
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129054416-mqjy6dbh74m5srtu
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130055001-gehu37plrrjaogxb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060928-xs2u6nr3y2x0h9db
2011-01-31 06:09:28 +00:00
Launchpad Translations on behalf of openerp 61a62b1dfe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045401-1zezcgk719d3dm0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130044958-yshcathln43o1wdz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045457-rzhwci5po7ea72bd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045641-xfn2nij4y67wyq3h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130045141-vh5ecttx8tj5vdg4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045711-41727n3c4e3wi0t9
2011-01-31 04:57:11 +00:00
Launchpad Translations on behalf of openerp ecb6b6f527 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128053653-049dtejg2tclii63
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126055017-ulxyki7050s7grep
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127054451-b5yoejbvso0zunmz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128053714-zb3yb4h7fkbmlqk9
2011-01-28 05:37:14 +00:00
Launchpad Translations on behalf of openerp f25fb5f4d4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128044458-rmemxsynuxmrp9pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128044655-31s27yl2cpkov2g5
2011-01-28 04:46:55 +00:00
Launchpad Translations on behalf of openerp f432535386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125070908-zuisvtekjxpi6dny
2011-01-25 07:09:08 +00:00
Launchpad Translations on behalf of openerp 916b46ec41 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110122045333-i2yk2vz51qj6mb5k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110123045910-1fm8jx3vrbju1gg6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110124045514-ho879xhno0nup1n3
2011-01-24 04:55:14 +00:00
Olivier Dony 8551300ae1 [MERGE] backport of email_template fix from trunk
bzr revid: odo@openerp.com-20110120140304-rlj30oe4v8n2agfl
2011-01-20 15:03:04 +01:00
Olivier Dony b30e1f04ad [REVERT] email_template: reverted to use the actual email template accounts
Revert of commit 3164.153.139 tfr@openerp.com-20101224115150-zs6zym9knapgc3e2

bzr revid: odo@openerp.com-20110120132655-ifvvxj7qycywz3ks
2011-01-20 14:26:55 +01:00
Launchpad Translations on behalf of openerp 2e4efe2677 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110120045440-i7atfpeu9pwzvw29
2011-01-20 04:54:40 +00:00
Antony Lesuisse c5f3f35cae [FIX] email_template merge fix for sender, by Olivier Ligot openerp-groupes/openobject-addons/fix_email_template
bzr revid: al@openerp.com-20110117204840-6gurujg428q8k4e1
2011-01-17 21:48:40 +01:00
Stephane Wirtel 34f1d34f77 [IMP] Add the missing certificates
bzr revid: stephane@openerp.com-20110117102616-xhdg1e24reijv88k
2011-01-17 11:26:16 +01:00
Thibault Francois 385768ebe6 [FIX] Email Template : Send email correct field bcc, email_to
bzr revid: tfr@openerp.com-20110115220846-2swiafidl7a9bbu4
2011-01-15 23:08:46 +01:00
Launchpad Translations on behalf of openerp 0c96f19b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110115055903-i9kqtkstdk8j0hnz
2011-01-15 05:59:03 +00:00
Launchpad Translations on behalf of openerp 62f28364e5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110114045237-gdlm32e67rdh70kr
bzr revid: launchpad_translations_on_behalf_of_openerp-20110114055119-e9fpaxlistgondmp
2011-01-14 05:51:19 +00:00
Olivier Ligot f76cb13bed [FIX] email template mailbox from field
- Use variable name (email_id) instead of string ('email_id')
- Remove comma at end of line so that email_from local variable type is unicode, and not tuple of unicode

bzr revid: olivier.ligot@groupes.be-20110113130217-ibc8pc7vy11ekntm
2011-01-13 14:02:17 +01:00
Olivier Dony 4ec1151937 [REM] all: removed no-op en_US.po files, ignored by Rosetta anyway
bzr revid: odo@openerp.com-20110112131415-49r7ucjk6bgg9xza
2011-01-12 14:14:15 +01:00
jam-openerp 7b8f6f2a37 [BUG-FIX] email_template - to , bcc, cc sending mail usinf mail template
bzr revid: jam@tinyerp.com-20110112090014-x44gitspq2fo6jr5
2011-01-12 14:30:14 +05:30
jam-openerp 0e00221731 [BUG-FIX] email_template - lp:701542
lp bug: https://launchpad.net/bugs/701542 fixed

bzr revid: jam@tinyerp.com-20110112064650-2o9okbwlciani022
2011-01-12 12:16:50 +05:30
Launchpad Translations on behalf of openerp 6098beab56 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110112045846-8uu2xx0dqvamh2rf
2011-01-12 04:58:46 +00:00
Olivier Dony 9e4d49c5ca [I18N] all: updated translation templates after latest changes
bzr revid: odo@openerp.com-20110111112150-nlr78yxgufuqd6yl
2011-01-11 12:21:50 +01:00
Launchpad Translations on behalf of openerp cda7d17dc3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110111050313-70y56tghmjexq3p5
2011-01-11 05:03:13 +00:00
Launchpad Translations on behalf of openerp f8c860f789 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110109045048-tv4cf28i2wv0d0na
bzr revid: launchpad_translations_on_behalf_of_openerp-20110110051507-c4s836t09vgn60zu
bzr revid: launchpad_translations_on_behalf_of_openerp-20110109045451-cvr6hytqd4l4a0ns
bzr revid: launchpad_translations_on_behalf_of_openerp-20110110051937-hc1vn7052zwl4vxu
2011-01-10 05:19:37 +00:00
Launchpad Translations on behalf of openerp dfea81ed46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110108045521-xphks9lahnstjqn2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110108050208-75canjc9ou4whmc8
2011-01-08 05:02:08 +00:00
Launchpad Translations on behalf of openerp 35fa7cd34e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106043500-7v9lu0vz6rw06og9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106053849-1bfeq2m1gsv0j789
2011-01-06 05:38:49 +00:00
Thibault Francois a0a18a7edc [FIX] email_template : revno of previous method
bzr revid: tfr@openerp.com-20110104101306-1j1wmpjmb6k6e2f0
2011-01-04 11:13:06 +01:00
Thibault Francois 0de512ebe5 [FIX] email_template : Cleaning mailbox send_mail
bzr revid: tfr@openerp.com-20110104101155-lru81c424h9x9t4o
2011-01-04 11:11:55 +01:00
Sbh (OpenERP) e1a001b64e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110103041826-atjzj7zbs8ayxrl1
bzr revid: sbh@tinyerp.com-20110104050350-ht7063oddesu3esy
2011-01-04 10:33:50 +05:30
Olivier Dony 67d825b03e [I18N] all: updated translation templates after latest changes (again)
bzr revid: odo@openerp.com-20110103172053-wc4dgcphwp3g7y18
2011-01-03 18:20:53 +01:00
Olivier Dony 64ce199e17 [I18N] all: updated translation templates after latest changes
bzr revid: odo@openerp.com-20110103161550-1rp408wtnl2vd1xi
2011-01-03 17:15:50 +01:00
Sbh (OpenERP) 93c221d296 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101231071411-p0pft257rwt189s5
2010-12-31 12:44:11 +05:30