e5f8d73bce
[MERGE] Merged lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20130610131953-psfzlhcuzhv7chcx
2013-06-10 18:49:53 +05:30
70f16ce73b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608055225-r7ywbpq3uy3jesvh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611054057-l97gta47ob4sj5ir
2013-06-11 05:40:57 +00:00
a94bbf8e5e
[FIX] Merge fix in saas1 for the problem that made the server crash when install a db
...
bzr revid: nicolas.vanhoren@openerp.com-20130610144915-0nj8vpk7n84ocj3f
bzr revid: nicolas.vanhoren@openerp.com-20130610150657-3xddn91gm0iq0ubp
bzr revid: nicolas.vanhoren@openerp.com-20130610154514-oee6s4f9g17bx63z
2013-06-10 17:45:14 +02:00
02aa3f2114
[FIX] regression that made the server crash when we install a db
...
bzr revid: nicolas.vanhoren@openerp.com-20130610154139-jylxm135apnu3app
2013-06-10 17:41:39 +02:00
dbf432ee25
[REM] Removed the filter_domain which is added by mistake.
...
bzr revid: psa@tinyerp.com-20130610131908-8r4ufv7vjnqppdw6
2013-06-10 18:49:08 +05:30
c59fe603ef
[FIX]l10n_be: partner vat intra report rml
...
bzr revid: dle@openerp.com-20130610124549-kfk5wnl34ufd90q2
2013-06-10 14:45:49 +02:00
901ba0cba5
[IMP] Sets the request object in web controlles as a global object
...
bzr revid: nicolas.vanhoren@openerp.com-20130607121905-dq474wdsppatfv9c
2013-06-07 14:19:05 +02:00
9b1904e892
Put back stuff removed by merge
...
bzr revid: nicolas.vanhoren@openerp.com-20130607103749-7pe6k3vgwudohnxo
2013-06-07 12:37:49 +02:00
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
a16e1a8ba1
[MERGE] [FIX] mail, email_template: various fixes
...
- [FIX] [IMP] mail_thread: allow to use message_post on models not having message_post method defined. mail_compose_message.send() wizard and mail_thread.message_process() now check that the active model has message_post defined. Otherwise using thread_model context key, it is possible to use mail_thread.message_post() while keeping model and res_id on the created mail_message.
- [FIX] [TESTS] mail_message, mail_mail: fixed reply_to and email_from default / specified values + added tests (mostly backported from trunk)
- [IMP] mail_message, mail_followers: _notify now have 2 new arguments force_send and user_signature. force_send allows to immediately send the notification emails. user_signature tells whether to add the author's signature in the notification emails sent.
- [FIX] mail_message: notified people: when having no subtype, just avoid notifying the followers but take into account specified recipients (partner_ids).
- [FIX] mail_mail: removed duplicate field email_from, as it is already defined on mail_message (mail_mail inherits from mail_message).
- [IMP] mail_mail: no need to search on type = email in list view.
- [FIX] email_template: allow to add a context action even without having create access on ir.values and ir.action by using SUPERUSER_ID.
- [FIX] mail_compose_message: support user_signature of template. Note that in case of multiple wizards (having ids), user_signature=False on one template is used for all wizards.
- [FIX] mass mailing: emails due to mass mailing are not queued instead of sent immediately.
- [IMP] Chatter: better display of recipients when having a message_post due to mass mailing (not always displaying logged a note).
bzr revid: tde@openerp.com-20130607101641-5h6z2707tu0f3i2n
2013-06-07 12:16:41 +02:00
956a05e0f2
Replaced main
...
bzr revid: nicolas.vanhoren@openerp.com-20130607091856-mnjnllza9oafqxb7
2013-06-07 11:18:56 +02:00
636c793c70
[TESTS] mail: added tests
...
bzr revid: tde@openerp.com-20130607091619-tfh78a1agqdiqc23
2013-06-07 11:16:19 +02:00
a1a6698558
[CLEAN] mail: cleaned reply_to code, finally.
...
bzr revid: tde@openerp.com-20130607091611-7cpzlxzngkrs86a0
2013-06-07 11:16:11 +02:00
b778d3c45a
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130607085618-quxxm6izqlfnoy1n
2013-06-07 10:56:18 +02:00
7a0308cdfe
[MERGE] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607082958-a59md26e0nmhzsf7
2013-06-07 10:29:58 +02:00
9d412b63cb
fix another stupid bug
...
bzr revid: nicolas.vanhoren@openerp.com-20130607080108-ajjly9a05ny96hmd
2013-06-07 10:01:08 +02:00
5deae04585
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130607054825-38kbw2umxndg1w3v
2013-06-07 05:48:25 +00:00
72f82f8fa3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130607054801-oxz1o62tu2fx01d8
2013-06-07 05:48:01 +00:00
06043f11b9
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130607052333-uw6pig2zge1cms4i
2013-06-07 10:53:33 +05:30
3d782a25d9
fix stupid bug
...
bzr revid: nicolas.vanhoren@openerp.com-20130606164726-zdwd4rf93m7unt35
2013-06-06 18:47:26 +02:00
a3e430ec63
Changed to use werkzeug's LocalStack
...
bzr revid: nicolas.vanhoren@openerp.com-20130606162020-oemq8eyuxr47a2e1
2013-06-06 18:20:20 +02:00
216cb2122e
[IMP] mail: mass_mailing: avoid having 'Followers of' when having a specified reply_to coming from the mail_message
...
bzr revid: tde@openerp.com-20130606152814-iqftppk06s7g8weg
2013-06-06 17:28:14 +02:00
30a7720452
[IMP] mail_message: added reply_to to the form view of mail.message
...
bzr revid: tde@openerp.com-20130606152538-4u3s1k4vvkotxz6c
2013-06-06 17:25:38 +02:00
1ef65f1577
[FIX] mail_mail: reply_to: use tools.email_split to avoid issues when handling email addresses.
...
bzr revid: tde@openerp.com-20130606151440-atdhk834ny248xqq
2013-06-06 17:14:40 +02:00
a1e942c0de
[FIX] mail.compose.message: fixed reply_to from template in mass mailing.
...
bzr revid: tde@openerp.com-20130606142814-jyw76nhaeivotu6k
2013-06-06 16:28:14 +02:00
05d463a0e2
[FIX] mail_mail: sdearch view: no need to have default_type_email
...
bzr revid: tde@openerp.com-20130606142720-ghs664yqhgemd132
2013-06-06 16:27:20 +02:00
d5d2f88b01
[MERGE] Forward porting of saas-1 up to revision 8739
...
bzr revid: mat@openerp.com-20130606132925-buuf13n6m73cen6i
2013-06-06 15:29:25 +02:00
62a03693a3
[FIX] mail.compose.message in email_template: var typo
...
bzr revid: tde@openerp.com-20130606130851-h5jswklvvz98enue
2013-06-06 15:08:51 +02:00
a5698b8016
[IMP] mail: better tests for gateway
...
bzr revid: mat@openerp.com-20130606125046-0f0sj5u64blqxbrs
2013-06-06 14:50:46 +02:00
72f6a8c646
[FIX] mail.compose.message: supports user_signature of template. Note that in case of multiple wizards (send on ids that is not a singleton list), user_signature on one template is valid for all wizard.
...
bzr revid: tde@openerp.com-20130606123724-f7q3mwm81ek7mr5c
2013-06-06 14:37:24 +02:00
b3cde8da4a
[FIX] email_template: allow to define context action even without having create access on ir.values and ir.action
...
Hint: look for backport into 7.0
bzr revid: tde@openerp.com-20130606123415-vuelai2eh1yy3c87
2013-06-06 14:34:15 +02:00
a216e70e85
[FIX] [IMP] mail: allow to use message_post on models not having message_post method defined.
...
mail.compose.message wizard and messaage_process now check that the active model
has message_post defined. Otherwise using thread_model context key that is better
managed in message_post, it is possible to use mail_thread.message_post() with a
thread_model and thread_id that should not allow message_post otherwise.
Hint: look for backport into 7.0
bzr revid: tde@openerp.com-20130606123230-d7ql14yydzfrlc7h
2013-06-06 14:32:30 +02:00
9c57f6e1cd
[FIX] mail: various fixes
...
Mass mailing: emails due to mass mailing are not queued instead of sent immediately.
As most of cases go through mail_followers._notify(), a new argument is added that
allows to control the force_send (like what is done in email_template).
Chatter: better display of recipients when having a message_post due to mass mailing
(not always displaying logged a note).
Notified people: when having no subtype, just avoid notifying the followers but
take into account specified recipients (partner_ids).
bzr revid: tde@openerp.com-20130606102437-43s4xp96b5wa3r1q
2013-06-06 12:24:37 +02:00
cef85ce5a8
[IMP] updated filter for partner_id when the customers is searched.
...
bzr revid: psa@tinyerp.com-20130606101225-85ssqpgpb8x1l1yk
2013-06-06 15:42:25 +05:30
b45fc9bb82
[FIX] correctly display char[password] as stars in list views
...
lp bug: https://launchpad.net/bugs/1113419 fixed
bzr revid: xmo@openerp.com-20130606091325-q2wgizk8yq4xkgj6
2013-06-06 11:13:25 +02:00
d98dc92fae
[MERGE] MergeD lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130606072432-l0njdyy6h327zbvs
2013-06-06 12:54:32 +05:30
1f96789be6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130606052150-3gmo30yv2a4jrql4
2013-06-06 05:21:50 +00:00
0298755c67
[FIX] base_partner_merge: properly ignore computed fields when merging 2 partners
...
bzr revid: odo@openerp.com-20130605161622-7xj8b585sslvd3lj
2013-06-05 18:16:22 +02:00
d0202ffb19
[IMP] mail: remove unecessary write in test
...
bzr revid: mat@openerp.com-20130605152316-tnd9oilxq7910061
2013-06-05 17:23:16 +02:00
1482ce563f
[FIX] mail: fix emails to adapt changes in saas (you ruined my afternoon tde)
...
bzr revid: mat@openerp.com-20130605151039-ps29tnqmn5pilxz4
2013-06-05 17:10:39 +02:00
691cd6e2a5
[MERGE] change_password_wizard: add password=True on the field.
...
bzr revid: vmt@openerp.com-20130605140818-m6hoesdwbbiiidey
2013-06-05 16:08:18 +02:00
fd61bfac43
[MERGE] ir_ui_view: better constraints on `arch` and `model`.
...
bzr revid: vmt@openerp.com-20130605132332-s0azrlqk0hjvders
2013-06-05 15:23:32 +02:00
8d0a477644
[IMP] ir_ui_view: do not use _logger.exception() (because there is no exception), add a check on `model`.
...
bzr revid: vmt@openerp.com-20130605121143-u2nkmcmeifphr54h
2013-06-05 14:11:43 +02:00
1ed9049041
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20130605120443-wgt24723597pak4b
2013-06-05 14:04:43 +02:00
dd7859e383
[MERGE] openerp.servie.model: removed duplicated code.
...
bzr revid: vmt@openerp.com-20130605111204-pmjt3olbl30xa4nt
2013-06-05 13:12:04 +02:00
9fd2e7297f
[IMP] Chatter: better display of date
...
bzr revid: tde@openerp.com-20130605101300-t1lwykg3d6lp7au2
2013-06-05 12:13:00 +02:00
d6383b2a51
[IMP] report_webkit: remove backward compatibility for report path names
...
bzr revid: mat@openerp.com-20130605100237-dva80nwzlsl8iotg
2013-06-05 12:02:37 +02:00
12e3ce123f
detail
...
bzr revid: nicolas.vanhoren@openerp.com-20130605093915-kmwtw7cq578lb230
2013-06-05 11:39:15 +02:00
6afbca24f9
[REV] revert of previous improvement
...
bzr revid: nicolas.vanhoren@openerp.com-20130605092926-dhoumh76dwtl211t
2013-06-05 11:29:26 +02:00
ccb38117ee
[MERGE] Forward porting of saas-1 until rev 8739
...
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
Paramjit Singh Sahota
Launchpad Translations on behalf of openerp
niv-openerp
Christophe Matthieu
Thibault Delavallée
Martin Trigaux
Xavier Morel
Olivier Dony
Vo Minh Thu