Thibault Delavallée
f6326c6917
[MERGE] [IMP] mail: improved management of links in notification emails.
...
A new server action is defined that handles the redirection. If the user has access to the document, it opens the form view of the document. A method is called that allows to define the form view to open in some specific models (such as lead/opportunities). If the user has no access to the document, it opens the inbox, filtered on the discussion. The inbox opened is different for employees and portal users.
This server action is called by the link included in notification emails. This way the redirection Inbox/document is done dynamically at login, and not statically when generating the email.
Added tests.
bzr revid: tde@openerp.com-20130522124930-21tgj52v83hw8cj0
2013-05-22 14:49:30 +02:00
Thibault Delavallée
978c76c5ea
[MERGE] [IMP] mail: improved management of links in notification emails.
...
This branch adds the URL parameters in context.params.
bzr revid: tde@openerp.com-20130522124012-pf2m5efmmz1vuilc
2013-05-22 14:40:12 +02:00
Olivier Dony
e6a8f9aac0
[FIX] portal: typos/wording in error messages
...
bzr revid: odo@openerp.com-20130522122556-mq3402op1n1315ae
2013-05-22 14:25:56 +02:00
Thibault Delavallée
6b572b8d90
[CLEAN] portal/mail_thread: cleaned a bit new code, using is_portal.
...
bzr revid: tde@openerp.com-20130522115549-ot3f31c5oty0zqya
2013-05-22 13:55:49 +02:00
Olivier Dony
8def4f274a
[IMP] crm: partner merge wizard: prevent merging more than 3 contacts together + log note in partner history
...
bzr revid: odo@openerp.com-20130522115408-ef82getdyo2otg3q
2013-05-22 13:54:08 +02:00
Thibault Delavallée
cd278d83ab
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
2013-05-22 13:42:36 +02:00
Thibault Delavallée
d4d6e88266
[IMP] [IMP] mail: now defines a catchall email alias, used to format the
...
reply_to of notification emails when having a document without alias, or for
private discussions.
bzr revid: tde@openerp.com-20130522114007-vlbkzghz278545zn
2013-05-22 13:40:07 +02:00
Olivier Dony
a5bf0f3181
[FIX] crm: partner merge wizard: fix detection of duplicate emails + improve error messages
...
bzr revid: odo@openerp.com-20130522111131-y1urx7qx280f3tdl
2013-05-22 13:11:31 +02:00
Alexandre Fayolle
0e3d497beb
enhanced tests
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522110608-acb2odz0tksm6sc2
2013-05-22 13:06:08 +02:00
Thibault Delavallée
c4a019bbfd
[CLEAN] mail: added CSS from web to mail module.
...
bzr revid: tde@openerp.com-20130522105434-nqmao3fyxy8on1rl
2013-05-22 12:54:34 +02:00
Thibault Delavallée
7de4d5b568
[CLEAN] web: removed mail-related CSS to the mail module.
...
bzr revid: tde@openerp.com-20130522105414-n405ipqbjgsarauq
2013-05-22 12:54:14 +02:00
Olivier Dony
710d2a37cc
[MERGE] auth_signup, portal: fix error handling when granting portal access + always send notification message including signup URL
...
bzr revid: odo@openerp.com-20130522105332-nl2gq346nb95wbru
2013-05-22 12:53:32 +02:00
Christophe Matthieu
35cd85b0ba
[FIX] sale: overwrite _make_invoice and get section_id in sale_crm module
...
bzr revid: chm@openerp.com-20130522104858-zlhe453zu9r41lqx
2013-05-22 12:48:58 +02:00
Thibault Delavallée
faefb9fad1
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130522103426-wjn0ttqdbf72g713
2013-05-22 12:34:26 +02:00
Parth Gajjar (Open ERP)
b4e6c2109c
[IMP]Google client id in ir.config_parameter
...
bzr revid: pga@tinyerp.com-20130522102857-fehfsdks1fq3zc1i
2013-05-22 15:58:57 +05:30
Thibault Delavallée
0d01d958fa
[MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143)
...
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
2013-05-22 12:26:05 +02:00
Thibault Delavallée
218024570d
[MERGE] [FORWARD] Forward-port of saas-1 branch until revision 4875
...
Revision ID: qdp-launchpad@openerp.com-20130507120149-p2m4ug20nfny234v
bzr revid: tde@openerp.com-20130522102240-ysni935cvnfvpe40
2013-05-22 12:22:40 +02:00
Martin Trigaux
9114185c85
[MERGE] improvement in l10n_it, contribution by Lorenzo Battistini (Agile BG)
...
bzr revid: mat@openerp.com-20130522102226-c9wdamouv05t9n14
2013-05-22 12:22:26 +02:00
Martin Trigaux
b7804d5cb5
[MERGE] l10n_it: update version number
...
bzr revid: mat@openerp.com-20130522101955-h26z9gx1xkfkqo83
2013-05-22 12:19:55 +02:00
Christophe Matthieu
aed639f6d1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130522100239-sbkwtitaxy8hj1cx
2013-05-22 12:02:39 +02:00
Martin Trigaux
5d47a52df3
[MERGE] fix various usability problems
...
bzr revid: mat@openerp.com-20130522095856-ol8igg97ctyh49sg
2013-05-22 11:58:56 +02:00
Christophe Matthieu
d3cf568649
[IMP] crm: search filter for salesteams view
...
bzr revid: chm@openerp.com-20130522095842-h88ztqk5ltkks7lf
2013-05-22 11:58:42 +02:00
Martin Trigaux
b86d62a297
[MERGE] fix various usability problems
...
bzr revid: mat@openerp.com-20130522095319-ls5d91bym2ry8ip6
2013-05-22 11:53:19 +02:00
Fabien Meghazi
435f022970
[REM] Remove point of sale testimonials
...
bzr revid: fme@openerp.com-20130522095027-61xih9viyrdadjxi
2013-05-22 11:50:27 +02:00
Christophe Matthieu
ffc466037d
[IMP] crm: remove 'Default to New Sales Team' checkbox if salesteams not used
...
bzr revid: chm@openerp.com-20130522094033-2xctzgr2p2fgmoy4
2013-05-22 11:40:33 +02:00
Quentin (OpenERP)
9fc3014e11
[FIX] hr_expense: fix in accounting entries generation for tax included in price
...
bzr revid: qdp-launchpad@openerp.com-20130522094017-b6xibz6b90s4w091
2013-05-22 11:40:17 +02:00
Lorenzo Battistini
2d6bb28f4c
[IMP] version number
...
bzr revid: lorenzo.battistini@agilebg.com-20130522092520-g1p02w7ii1n4jldx
2013-05-22 11:25:20 +02:00
Martin Trigaux
a17c4530d0
[MERGE] improvement in l10n_it, contribution by Lorenzo Battistini (Agile BG)
...
lp bug: https://launchpad.net/bugs/1095842 fixed
bzr revid: mat@openerp.com-20130522085116-p651pi4ithnnsgvk
2013-05-22 10:51:16 +02:00
Thibault Delavallée
8aa85c2523
[FORWARD] Forward port of addons until revision 8711
...
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
Thibault Delavallée
d2acb63af6
[FORWARD] Forward-port of saas-1 branch until revision 4875
...
bzr revid: tde@openerp.com-20130522082935-rzzbc3p625rkmcdy
2013-05-22 10:29:35 +02:00
Martin Trigaux
9e6d5ce29f
[MERGE] sync with latest trunk
...
bzr revid: mat@openerp.com-20130522082839-e39w7o160dh5aha6
2013-05-22 10:28:39 +02:00
Quentin (OpenERP)
d08295abf6
[FIX] account_followup, usability: modified the group on the button 'Mark as Done'
...
bzr revid: qdp-launchpad@openerp.com-20130522080928-u5f78ir49s2i1gev
2013-05-22 10:09:28 +02:00
Quentin (OpenERP)
7b773c1fbc
[FIX] project_long_term: domain overwritten in search view to avoid crash saying 'project_id is not defined'
...
bzr revid: qdp-launchpad@openerp.com-20130522080056-hz116wh4unu1tz09
2013-05-22 10:00:56 +02:00
DBR (OpenERP)
6cc1b4ee83
[Merge] lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20130522073218-o6m40rskd42idzvg
2013-05-22 13:02:18 +05:30
Alexandre Fayolle
51a96dc5cd
[TEST] enhance error message
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522065722-vuxha3lht56as98o
2013-05-22 08:57:22 +02:00
Turkesh Patel (Open ERP)
3d4c0a795a
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130522063035-nype13o1f6oneq4h
2013-05-22 12:00:35 +05:30
Turkesh Patel (Open ERP)
83740f70f0
[MRG] merge with lp:openerp-web
...
bzr revid: tpa@tinyerp.com-20130522063018-q6oevmlcnrfl7i79
2013-05-22 12:00:18 +05:30
sgo@tinyerp.com
c04dfafe0b
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130522062700-rcbg30jfinv0o392
2013-05-22 11:57:00 +05:30
Alexandre Fayolle
92b2d80072
[FIX] yaml syntax error
...
bzr revid: alexandre.fayolle@camptocamp.com-20130522062530-jqya3wbwka91ydor
2013-05-22 08:25:30 +02:00
Turkesh Patel (Open ERP)
b364ef52bf
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130522062202-btbabyskzr5s0z3z
2013-05-22 11:52:02 +05:30
Launchpad Translations on behalf of openerp
983b17ea0a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130522052736-t0x1wh4cm1tqvfy2
2013-05-22 05:27:36 +00:00
Josse Colpaert
9c224029fd
[IMP] Turn qty_remaining into a calculated field
...
bzr revid: jco@openerp.com-20130521172627-bgbaj398y5bsg5jo
2013-05-21 19:26:27 +02:00
Martin Trigaux
9d24045ab5
[MERGE] Fix partial picking, set unavailable products to zero, contribution by Sebastien LANGE (Syleam)
...
bzr revid: mat@openerp.com-20130521154537-skpw1sjnxrb6wfg8
2013-05-21 17:45:37 +02:00
Fabien Meghazi
8b0b9e071c
[ADD] testimonials photo for sale
...
bzr revid: fme@openerp.com-20130521154251-lhcb43x5uvmdn9px
2013-05-21 17:42:51 +02:00
Thibault Delavallée
176481a970
[FIX] mail: fixed link in notification email
...
bzr revid: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
2013-05-21 17:26:57 +02:00
Alexandre Fayolle
af6335c44a
[FIX] fix stock demo data used by new test
...
bzr revid: alexandre.fayolle@camptocamp.com-20130521151101-fjhr2q6t7g0jf9au
2013-05-21 17:11:01 +02:00
Fabien Meghazi
1fcc1515a3
[ADD] testimonials
...
bzr revid: fme@openerp.com-20130521150552-1krrc7y2xatjlb70
2013-05-21 17:05:52 +02:00
Thibault Delavallée
2663fd67b1
[FIX] auth_signup: fixed login_mode going to default when having another type given in parameter
...
bzr revid: tde@openerp.com-20130521145723-3os8q5qej9dr7dxo
2013-05-21 16:57:23 +02:00
Olivier Dony
87d4e69a65
[MERGE] web doc: less confusing client action example, courtesy of Nhomar (Vauxoo)
...
bzr revid: odo@openerp.com-20130521145721-v9vz5e8n7127z9vy
2013-05-21 16:57:21 +02:00
Christophe Matthieu
48f5b7b480
[IMP] portal managment: add get_error_messages method
...
bzr revid: chm@openerp.com-20130521144941-a0pfm3ulx7wr5cs1
2013-05-21 16:49:41 +02:00