Browse Source

Merge remote-tracking branch 'origin/8.0' into 9.0

pull/2/head
Ivan Yelizariev 9 years ago
parent
commit
6981db6005
  1. 1
      mail_move_message_models.py
  2. 1
      mail_move_message_views.xml
  3. BIN
      static/description/delete-message.png
  4. BIN
      static/description/html-message-viewer.png
  5. BIN
      static/description/html-message-viewer1.png
  6. 12
      static/description/index.html
  7. BIN
      static/description/record-move-back.png

1
mail_move_message_models.py

@ -57,6 +57,7 @@ class wizard(models.TransientModel):
message_id = fields.Many2one('mail.message', string='Message')
message_body = fields.Html(related='message_id.body', string='Message to move', readonly=True)
message_from = fields.Char(related='message_id.email_from', string='From', readonly=True)
message_subject = fields.Char(related='message_id.subject', string='Subject', readonly=True)
message_moved_by_message_id = fields.Many2one('mail.message', related='message_id.moved_by_message_id', string='Moved with', readonly=True)
message_moved_by_user_id = fields.Many2one('res.users', related='message_id.moved_by_user_id', string='Moved by', readonly=True)
message_is_moved = fields.Boolean(string='Is Moved', related='message_id.is_moved', readonly=True)

1
mail_move_message_views.xml

@ -53,6 +53,7 @@
<button string="Close" class="" special="cancel" />
<separator string="Message"/>
<group>
<field name="message_subject"/>
<field name="message_from"/>
<field name="message_id" invisible="1"/>
</group>

BIN
static/description/delete-message.png

After

Width: 1012  |  Height: 546  |  Size: 73 KiB

BIN
static/description/html-message-viewer.png

Before

Width: 1027  |  Height: 546  |  Size: 58 KiB

After

Width: 1012  |  Height: 546  |  Size: 62 KiB

BIN
static/description/html-message-viewer1.png

After

Width: 1012  |  Height: 546  |  Size: 51 KiB

12
static/description/index.html

@ -106,8 +106,20 @@
<p class="oe_mt32">
Check message and then close window.
</p>
<div class="oe_demo oe_picture oe_screenshot">
<img src="html-message-viewer1.png"/>
</div>
<p class="oe_mt32">
Also, you can mark as read and close
</p>
<div class="oe_demo oe_picture oe_screenshot">
<img src="html-message-viewer.png?2"/>
</div>
<p class="oe_mt32">
In addition, the module can be used to delete a message (it's available for superuser only)
</p>
<div class="oe_demo oe_picture oe_screenshot">
<img src="delete-message.png"/>
</div>
</div>
</div>

BIN
static/description/record-move-back.png

Before

Width: 904  |  Height: 482  |  Size: 67 KiB

After

Width: 904  |  Height: 482  |  Size: 68 KiB

Loading…
Cancel
Save