Commit Graph

751 Commits

Author SHA1 Message Date
Géry Debongnie 5cc8f9ca42 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 10:37:16 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Denis Ledoux 7ccd8fdcc7 [FIX] mail: push to breadcrumb on subject, author or notified partners links click
opw-608251: When coming from website > My account, and clicking on a lead link from a message in the inbox, and then deleting the lead, the history_back is triggered and we come back in the website, while we should have come back in the inbox. This is because the action performed was not pushed in the breadcrumb
2014-05-23 15:54:43 +02:00
Géry Debongnie 8159f4a18c [IMP] improves searchview appendTo
after some thought, the extra method insert was not really necessary.
It was at first a way to force the user to give two nodes to determine
where the searchview and the drawer were to be inserted.  However,
the second node can be omitted, a perfectly reasonable default is
to append the drawer just after the searchview.

Then, the role of insert is exactly the same as appendTo, so it makes
sense to override appendTo and remove insert.  Simpler, and the job is done.
2014-05-22 09:55:04 +02:00
Géry Debongnie 7c6c720425 [IMP] better architecture for searchview/drawer
Before, the searchview and the searchview drawer had to be instantiated by
the user and appended separately to their correct place.  Now, the
searchview is responsible for creating/destroying the drawer, and the
user is responsible for correctly using the insert method with
the node where the searchview/drawer are to be inserted.
2014-05-20 15:27:44 +02:00
Géry Debongnie 7e6d223e9e [IMP] work on inline search view in web client
incomplete work.  So far, the search view widget has been split in
two widgets: SearchView and SearchViewDrawer.  The SearchViewDrawer
has been inserted inline, and some preliminary work has been done
to improve the layout.
2014-05-19 14:16:09 +02:00
Thibault Delavallée 283ce860fc [REM] mail: removed dead code in mail.js
bzr revid: tde@openerp.com-20140325142535-rptr14zfxf8ctx27
2014-03-25 15:25:35 +01:00
Thibault Delavallée 7185a68775 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
2014-03-25 10:02:09 +01:00
Kersten Jeremy 758d467982 [FIX] In mail text2Html, replace url (http or ftp) before the replacement of return line, else some return line was sometimes considered as the link.
Eg : <a href="http://www.google.com<br/><br/>Puis">http://www.google.com<br/><br/><br/>Puis</a>

bzr revid: jke@openerp.com-20140318203051-lk92fjgwltkwbk68
2014-03-18 21:30:51 +01:00
Thibault Delavallée d5a8905941 [IMP] mail_compose_message: added is_log boolean field for internal notes; + removed context hack that
did the same thing. Fixed composer form view: internal note, only subject + body is
displayed.

bzr revid: tde@openerp.com-20140317122409-5fd5d5uwc35oq0hb
2014-03-17 13:24:09 +01:00
Thibault Delavallée 4a284821b4 [MERGE] Sync with trunnk
bzr revid: tde@openerp.com-20140221145716-vkusdgd56rnc85rl
2014-02-21 15:57:16 +01:00
Thibault Delavallée 1ac8e7cdfd [IMP] mail, email_template: mass mailing feature cleaning
- now differentiates mass mailing and mass post.
- mass mailing is a true mass mailing
- using same_thread log a copy in the document, without using message_post
(using notification field, + model and res_id)
- improved form view of composer, adding a filed explaining a bit the various
recipients
- removed unnecessary fields coming from the template (partner_to, ...) because
they are confusing -> composer should be easier to understand and use
- removed some unnecessary code
- removed double body computation when using templates (one for tmeplate, then
the wizard -> not necessary)

This commit will be followed by other to try to improve the mass mailing
and mass post.

bzr revid: tde@openerp.com-20140220152945-ash0hfkzevzamihq
2014-02-20 16:29:45 +01:00
Olivier Dony 76d89c0477 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9133 dle@openerp.com-20140214131810-9abebxpfeoga1crn
bzr revid: odo@openerp.com-20140217091203-kmeg4qsn2qyvll23
2014-02-17 10:12:03 +01:00
Thibault Delavallée 8409791018 [FIX] [IMP] mail: Wall widget: clickable links on the wall now use
the mail.action_mail_redirect client action that redirects to the correct
form view, like the link used in notification emails.

bzr revid: tde@openerp.com-20140213151638-ev2va4y3tmm9m7i8
2014-02-13 16:16:38 +01:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
Denis Ledoux 74e0fbae83 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
2014-01-10 18:40:38 +01:00
Thibault Delavallée 3f2d24d1b7 [FIX] mail: Chatter widget: the RecordThread widget, that is
used to display the Chatter on documents, should use the
domain defined on the field. Indeed this domain is used when
computing the 'read more' expandable domains.
Before this fix it was not taken into account, leading to
messages being fetched without respecting the domain
defined on the field.

bzr revid: tde@openerp.com-20140109110709-iz2jxryg5xqjedo4
2014-01-09 12:07:09 +01:00
Thibault Delavallée 4998d09808 [FIX] mail: Chatter widget: keep void list of ids when fetching messages;
only specific false ids should be replaced by a domain.

bzr revid: tde@openerp.com-20140109100137-7yy9em3klefz77ij
2014-01-09 11:01:37 +01:00
Thibault Delavallée 0b2d085c1b [IMP] shop: added openchatter on product shop
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template

bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Denis Ledoux 7f00274384 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Christophe Simonis 0521d1aab3 [MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
Christophe Simonis 6b05beecc1 [MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
Thibault Delavallée 6bfcee2cb7 [FIX] mail: fixed replying to the first message in Inbox that was crashing
lp bug: https://launchpad.net/bugs/1212109 fixed

bzr revid: tde@openerp.com-20131125155349-4wfvjxuffnxyumkd
2013-11-25 16:53:49 +01:00
Thibault Delavallée f148061b94 [MERGE] [IMP] chatter: improved 'Log a note'
- the button is now only displayed for employee users. This is done
by overriding the fields_view_get in mail.thread and adding options
to the widget according to the groups the user belongs to. Indeed
it is currently not possible to set widget options specific to
some groups. Therefore an override of fields view get was
necessary.
- small layout improvements: Log a note -> Log an internal note, 
background color of notes updated.

bzr revid: tde@openerp.com-20131125130455-u8517iyr4jgdgoqn
2013-11-25 14:04:55 +01:00
Denis Ledoux f07e01f491 [ADD]mail: The announcement bar (blue bar) to inform customers
bzr revid: dle@openerp.com-20131025153829-xu6mee27a4hajnk3
2013-10-25 17:38:29 +02:00
ajay javiya (OpenERP) e5db6ce4e6 [MERGE]: with trunk
bzr revid: aja@tinyerp.com-20131007054529-3nlgi9szgaen4kau
2013-10-07 11:15:29 +05:30
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
Denis Ledoux 22baa3253f [FIX]mail: backport of fix 8787 from saas-1 branch, rev-id: chm@openerp.com-20131003091603-rarztafazl56ugid
bzr revid: dle@openerp.com-20131003095400-wgfwaazfdfhho3vb
2013-10-03 11:54:00 +02:00
Christophe Matthieu acb8f23a19 [FIX] mail.js: not found do_reload_menu_emails; fix: Use instanceof insead of comparaison of __proto__ arguments
bzr revid: chm@openerp.com-20131003091603-rarztafazl56ugid
2013-10-03 11:16:03 +02:00
ajay javiya (OpenERP) 2f708369cb [IMP][REM]: Improve code and remove unused method
bzr revid: aja@tinyerp.com-20130924133041-0j2k8qc5ubjxwghx
2013-09-24 19:00:41 +05:30
ajay javiya (OpenERP) cbe9d337a5 [IMP]: reduce rpc call , add options 'display_log_button' on field,
[REM]: unwanted record rule

bzr revid: aja@tinyerp.com-20130923133201-zclwecr2n596e989
2013-09-23 19:02:01 +05:30
ajay javiya (OpenERP) de52e90cfa [ADD]: add an option in chatter 'display_log_button', that is true for employee action, and False for portal action
bzr revid: aja@tinyerp.com-20130920130449-8c5z33tgegftdxu3
2013-09-20 18:34:49 +05:30
Atul Patel (OpenERP) 1a382f268c [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130812043810-y14dmqwvuxrxkuag
2013-08-12 10:08:10 +05:30
Thibault Delavallée 079ea21883 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130808083451-plvcks1kwjhh2vzi
2013-08-08 10:34:51 +02:00
niv-openerp ea92a186f5 [FIX] mail: minor potential problem with JavaScript module loading
bzr revid: nicolas.vanhoren@openerp.com-20130726121938-b2uapok2dup56ol9
2013-07-26 14:19:38 +02:00
Atul Patel (OpenERP) 4468117ad5 [FIX] mail: remove is author unused assignment.
bzr revid: atp@tinyerp.com-20130725073249-t1fvurzfdp0wh8j3
2013-07-25 13:02:49 +05:30
Atul Patel (OpenERP) 2706328ca4 [IMP] mail: Pass current user partner id into datasets and get it into template. add author also for private mail.
bzr revid: atp@tinyerp.com-20130725071939-9lmuhfgte987nu03
2013-07-25 12:49:39 +05:30
Atul Patel (OpenERP) 48c68c3a99 [FIX]: Fix private message partnerid problem and display and when no author
bzr revid: atp@tinyerp.com-20130723055511-edtutz2au78rcinx
2013-07-23 11:25:11 +05:30
Thibault Delavallée 48dd55b1e8 [FIX] mail: fixed merge issue, forgottent conflict
bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
2013-07-17 10:59:25 +02:00
Thibault Delavallée 32d0f6bce0 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij
2013-07-17 09:47:10 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Olivier Dony 52379022db [FIX] OPW 586673: mail: make `read more/less` labels translatable
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130606161837-1loqbdr269cr1udl
2013-06-06 18:18:37 +02:00
Thibault Delavallée 9fd2e7297f [IMP] Chatter: better display of date
bzr revid: tde@openerp.com-20130605101300-t1lwykg3d6lp7au2
2013-06-05 12:13:00 +02:00
Thibault Delavallée 2d8f1f4327 [FIX] [IMP] mail_message: adding a non-stored author_avatar field, allowing to display avatars in Chatter messages without having to write some hacks to display the avatars and author images. The field is not stored to avoid issues in a stable version.
bzr revid: tde@openerp.com-20130528143706-3973shwhganlohj8
2013-05-28 16:37:06 +02:00
Thibault Delavallée 71df1a41bc [FORWARD] Forward port of addons 7.0 until revision 9172
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Christophe Matthieu c61329943a [IMP] mail: add breadcrumb from inbox
bzr revid: chm@openerp.com-20130527121823-tfjevhu5zl5at4ar
2013-05-27 14:18:23 +02:00
Thibault Delavallée 7b7dfb955f [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130617095141-74uttqtw60iorl5g
2013-06-17 11:51:41 +02:00
Christophe Simonis aa133b4d29 [MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00