+
+
+
+
+ | ${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity} | ||||||||||||
| ${inv.address_invoice_id.street or ''|entity} | ||||||||||||
| ${inv.address_invoice_id.street2 or ''|entity} | ||||||||||||
| ${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity} | ||||||||||||
| ${inv.address_invoice_id.country_id.name or ''|entity} | ||||||||||||
| ${inv.partner_id.street or ''|entity} | ||||||||||||
| ${inv.partner_id.street2 or ''|entity} | ||||||||||||
| ${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity} | ||||||||||||
| ${inv.partner_id.country_id.name or ''|entity} | ||||||||||||
| ${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity} | ||||||||||||
| ${_("Tel") |entity}: ${inv.partner_id.phone|entity} | ||||||||||||
| ${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity} | ||||||||||||
| ${_("Fax") |entity}: ${inv.partner_id.fax|entity} | ||||||||||||
| ${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity} | ||||||||||||
| ${_("E-mail") |entity}: ${inv.partner_id.email|entity} | ||||||||||||
| ${_("VAT") |entity}: ${inv.partner_id.vat|entity} |
${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''} | ${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''} | |||||||||||
${user.company_id.partner_id.name} | ${user.company_id.partner_id.name} | |||||||||||
|
| ${_space(_get_ref(inv))} | ||||||||||
|
| ${_space(_get_ref(inv))} | ||||||||||
|
| |||||||||||
| ${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity} | |||||||
| ${inv.address_invoice_id.street or ''|entity} | |||||||
| ${inv.address_invoice_id.street2 or ''|entity} | |||||||
| ${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity} | |||||||
| ${inv.address_invoice_id.country_id.name or ''|entity} | |||||||
| ${inv.partner_id.street or ''|entity} | |||||||
| ${inv.partner_id.street2 or ''|entity} | |||||||
| ${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity} | |||||||
| ${inv.partner_id.country_id.name or ''|entity} | |||||||
| ${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity} | |||||||
| ${_("Tel") |entity}: ${inv.partner_id.phone|entity} | |||||||
| ${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity} | |||||||
| ${_("Fax") |entity}: ${inv.partner_id.fax|entity} | |||||||
| ${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity} | |||||||
| ${_("E-mail") |entity}: ${inv.partner_id.email|entity} | |||||||
| ${_("VAT") |entity}: ${inv.partner_id.vat|entity} | ${company.partner_id.name |entity} | ||||||
| ${company.partner_id.address and company.partner_id.address[0].street or ''|entity} | ${_("phone")}: | ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} | + | ${company.partner_id and company.partner_id.street or ''|entity} | ${_("phone")}: | ${company.partner_id and company.partner_id.phone or ''|entity} | |
| ${company.partner_id.address and company.partner_id.address[0].street2 or ''|entity} | ${_('Fax')}: | ${company.partner_id.address and company.partner_id.address[0].fax or ''|entity} | + | ${company.partner_id and company.partner_id.street2 or ''|entity} | ${_('Fax')}: | ${company.partner_id and company.partner_id.fax or ''|entity} | |
| ${company.partner_id.address and company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address and company.partner_id.address[0].city or ''|entity} | ${_('e-mail')}: | ${company.partner_id.address and company.partner_id.address[0].email or ''|entity} | + | ${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity} | ${_('e-mail')}: | ${company.partner_id and company.partner_id.email or ''|entity} | |
| ${company.partner_id.address and company.partner_id.address[0].country_id.name or ''|entity} | / | +${company.partner_id and company.partner_id.country_id.name or ''|entity} | / |
+
![]()
-
+
@@ -60,7 +61,7 @@
-
@@ -95,8 +96,8 @@
-
@@ -111,7 +112,6 @@
-
-
+
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4f43819e03b..5ac146066cf 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -69,12 +69,42 @@ class mail_message_common(osv.osv_memory):
database model or wizard screen that needs to hold a kind of
message"""
+ def get_body(self, cr, uid, ids, name, arg, context=None):
+ if context is None:
+ context = {}
+ result = dict.fromkeys(ids, '')
+ for message in self.browse(cr, uid, ids, context=context):
+ if message.subtype == 'html':
+ result[message.id] = message.body_html
+ else:
+ result[message.id] = message.body_text
+ return result
+
+ def search_body(self, cr, uid, obj, name, args, context=None):
+ """will receive:
+ - obj: mail.message object
+ - name: 'body'
+ - args: [('body', 'ilike', 'blah')]"""
+ return ['|', '&', ('subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
+
+ def get_record_name(self, cr, uid, ids, name, arg, context=None):
+ if context is None:
+ context = {}
+ result = dict.fromkeys(ids, '')
+ for message in self.browse(cr, uid, ids, context=context):
+ if not message.model or not message.res_id:
+ continue
+ result[message.id] = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
+ return result
+
_name = 'mail.message.common'
_rec_name = 'subject'
_columns = {
'subject': fields.char('Subject', size=512, required=True),
'model': fields.char('Related Document model', size=128, select=1),
'res_id': fields.integer('Related Document ID', select=1),
+ 'record_name': fields.function(get_record_name, type='string', string='Message record name',
+ help="Name of the record, matching the result of the name_get."),
'date': fields.datetime('Date'),
'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
'email_to': fields.char('To', size=256, help='Message recipients'),
@@ -82,18 +112,26 @@ class mail_message_common(osv.osv_memory):
'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
'headers': fields.text('Message headers', readonly=1,
- help="Full message headers, e.g. SMTP session headers "
- "(usually available on inbound messages only)"),
+ help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
'subtype': fields.char('Message type', size=32, help="Type of message, usually 'html' or 'plain', used to "
"select plaintext or rich text contents accordingly", readonly=1),
'body_text': fields.text('Text contents', help="Plain-text version of the message"),
'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"),
- 'parent_id': fields.many2one('mail.message', 'Parent message', help="Parent message, used for displaying as threads with hierarchy"),
+ 'body': fields.function(get_body, fnct_search = search_body, string='Message content', type='text',
+ help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
+ 'parent_id': fields.many2one('mail.message', 'Parent message', help="Parent message, used for displaying as threads with hierarchy",
+ select=True, ondelete='set null',),
+ 'type': fields.selection([
+ ('email', 'e-mail'),
+ ('comment', 'Comment'),
+ ('notification', 'System notification'),
+ ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
}
_defaults = {
+ 'type': 'comment',
'subtype': 'plain',
'date': (lambda *a: fields.datetime.now()),
}
@@ -102,18 +140,16 @@ class mail_message(osv.osv):
'''Model holding messages: system notification (replacing res.log
notifications), comments (for OpenSocial feature) and
RFC2822 email messages. This model also provides facilities to
- parse, queue and send new email messages.
-
- Messages that do not have a value for the email_from column
- are simple log messages (e.g. document state changes), while
- actual e-mails have the email_from value set.
+ parse, queue and send new email messages. Type of messages
+ are differentiated using the 'type' column.
+
The ``display_text`` field will have a slightly different
presentation for real emails and for log messages.
'''
_name = 'mail.message'
_inherit = 'mail.message.common'
- _description = 'Generic Message (Email, Comment, Notification)'
+ _description = 'Mail Message (email, comment, notification)'
_order = 'date desc'
# XXX to review - how to determine action to use?
@@ -184,17 +220,10 @@ class mail_message(osv.osv):
], 'State', readonly=True),
'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1),
- 'type': fields.selection([
- ('email', 'e-mail'),
- ('comment', 'Comment'),
- ('notification', 'System notification'),
- ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
-
}
_defaults = {
'state': 'received',
- 'type': 'comment',
}
#------------------------------------------------------
@@ -261,6 +290,7 @@ class mail_message(osv.osv):
'user_id': uid,
'model': model,
'res_id': res_id,
+ 'type': 'email',
'body_text': body if subtype != 'html' else False,
'body_html': body if subtype == 'html' else False,
'email_from': email_from,
@@ -480,6 +510,23 @@ class mail_message(osv.osv):
msg['sub_type'] = msg['subtype'] or 'plain'
return msg
+ def _postprocess_sent_message(self, cr, uid, message, context=None):
+ """Perform any post-processing necessary after sending ``message``
+ successfully, including deleting it completely along with its
+ attachment if the ``auto_delete`` flag of the message was set.
+ Overridden by subclasses for extra post-processing behaviors.
+
+ :param browse_record message: the message that was just sent
+ :return: True
+ """
+ if message.auto_delete:
+ self.pool.get('ir.attachment').unlink(cr, uid,
+ [x.id for x in message.attachment_ids \
+ if x.res_model == self._name and \
+ x.res_id == message.id],
+ context=context)
+ message.unlink()
+ return True
def send(self, cr, uid, ids, auto_commit=False, context=None):
"""Sends the selected emails immediately, ignoring their current
@@ -537,16 +584,9 @@ class mail_message(osv.osv):
message.write({'state':'sent', 'message_id': res})
else:
message.write({'state':'exception'})
-
- # if auto_delete=True then delete that sent messages as well as attachments
message.refresh()
- if message.state == 'sent' and message.auto_delete:
- self.pool.get('ir.attachment').unlink(cr, uid,
- [x.id for x in message.attachment_ids \
- if x.res_model == self._name and \
- x.res_id == message.id],
- context=context)
- message.unlink()
+ if message.state == 'sent':
+ self._postprocess_sent_message(cr, uid, message, context=context)
except Exception:
_logger.exception('failed sending mail.message %s', message.id)
message.write({'state':'exception'})
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index e58c2d1c818..e01da45c13d 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -57,6 +57,20 @@
+
+
+ mail.message.search.wall
+ mail.message
+ search
+ 25
+
+
+
+
+
+
mail.message.form
mail.message
@@ -156,7 +170,7 @@
mail.message
form
tree,form
- [('type', '=', 'email'), '|',('state','in',['outgoing','exception']),('email_from', '!=', False)]
+ [('type', '=', 'email')]
+ {'search_default_received': 1, 'search_default_exception': 1}
@@ -205,21 +220,22 @@
src_model="res.partner"
view_id="view_email_message_tree"/>
-
+
+
+
+
+
All Feeds
mail.all_feeds
-
My Feeds
mail.all_feeds
-
diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index aa5662190f6..fc82af879a9 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -26,35 +26,40 @@ class mail_subscription(osv.osv):
"""
mail_subscription holds the data related to the follow mechanism inside OpenERP.
A subscription is characterized by:
- - res_model: model of the followed objects
- - res_id: ID of resource (may be 0 for every objects)
+ :param: res_model: model of the followed objects
+ :param: res_id: ID of resource (may be 0 for every objects)
+ :param: user_id: user_id of the follower
"""
_name = 'mail.subscription'
_rec_name = 'id'
_order = 'res_model asc'
+ _description = 'Mail subscription'
_columns = {
'res_model': fields.char('Related Document Model', size=128,
- select=1, required=True),
- 'res_id': fields.integer('Related Document ID', select=1),
- 'user_id': fields.many2one('res.users', string='Related User ID',
+ required=True, select=1,
+ help='Model of the followed resource'),
+ 'res_id': fields.integer('Related Document ID', select=1,
+ help='Id of the followed resource'),
+ 'user_id': fields.many2one('res.users', string='Related User',
ondelete='cascade', required=True, select=1),
}
class mail_notification(osv.osv):
"""
mail_notification is a relational table modeling messages pushed to users.
- - read: todo
+ :param: read: not used currently
"""
_name = 'mail.notification'
_rec_name = 'id'
_log_access = False
_order = 'message_id desc'
+ _description = 'Mail notification'
_columns = {
'user_id': fields.many2one('res.users', string='User',
ondelete='cascade', required=True, select=1),
'message_id': fields.many2one('mail.message', string='Message',
ondelete='cascade', required=True, select=1),
- 'read': fields.boolean('Read'),
+ 'read': fields.boolean('Read', help="Not used currently",),
# TODO: add a timestamp ? or use message date ?
}
_defaults = {
diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index 4fde0938ad4..fa71981eda2 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -52,5 +52,11 @@
tree,form
+
+
+
+
+
+
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 4ecf5e88481..6d91e126400 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -61,20 +61,17 @@ class mail_thread(osv.osv):
'''
_name = 'mail.thread'
_description = 'Email Thread'
- _inherit = ['base.needaction']
def _get_message_ids(self, cr, uid, ids, name, arg, context=None):
res = {}
- for thread in self.browse(cr, uid, ids, context=context):
- records = self.message_load(cr, uid, [thread.id], context=context)
- res[thread.id] = [obj['id'] for obj in records]
+ for id in ids:
+ res[id] = self.message_load_ids(cr, uid, [id], context=context)
return res
- # OpenSocial: message_ids_social is a dummy field that should not be used
+ # OpenChatter: message_ids_social is a dummy field that should not be used
_columns = {
'message_ids_social': fields.function(_get_message_ids, method=True,
- type='one2many', obj='mail.message', string='Temp messages',
- _fields_id = 'res_id'),
+ type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
}
#------------------------------------------------------
@@ -82,11 +79,13 @@ class mail_thread(osv.osv):
#------------------------------------------------------
def create(self, cr, uid, vals, context=None):
+ """Automatically subscribe the creator"""
thread_id = super(mail_thread, self).create(cr, uid, vals, context=context);
self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
return thread_id;
def write(self, cr, uid, ids, vals, context=None):
+ """Automatically subscribe the writer"""
if isinstance(ids, (int, long)):
ids = [ids]
write_res = super(mail_thread, self).write(cr, uid, ids, vals, context=context);
@@ -104,17 +103,16 @@ class mail_thread(osv.osv):
"""
if context is None:
context = {}
-
subscr_obj = self.pool.get('mail.subscription')
msg_obj = self.pool.get('mail.message')
-
+ # delete subscriptions
subscr_to_del_ids = subscr_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
subscr_obj.unlink(cr, uid, subscr_to_del_ids, context=context)
-
+ # delete notifications
msg_to_del_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
- super(mail_thread, self).unlink(cr, uid, ids, context=context)
+ return super(mail_thread, self).unlink(cr, uid, ids, context=context)
#------------------------------------------------------
# Generic message api
@@ -122,43 +120,62 @@ class mail_thread(osv.osv):
def message_create(self, cr, uid, thread_id, vals, context=None):
"""OpenSocial: wrapper of mail.message create method
- - creates the mail.message
- - automatically subscribe the message writer if not already done
- - push the message to subscribed users"""
+ - creates the mail.message
+ - automatically subscribe the message writer
+ - push the message to subscribed users
+ """
if context is None:
context = {}
-
- need_action_pushed = False
user_to_push_ids = []
+ message_obj = self.pool.get('mail.message')
subscription_obj = self.pool.get('mail.subscription')
notification_obj = self.pool.get('mail.notification')
# create message
- msg_id = self.pool.get('mail.message').create(cr, uid, vals, context=context)
- thread_obj = self.browse(cr, uid, [thread_id], context=context)[0]
+ msg_id = message_obj.create(cr, uid, vals, context=context)
- # automatically subscribe the writer of the message if not subscribed
- if vals['user_id'] and not self.message_is_subscriber(cr, vals['user_id'], [thread_id], context=context):
+ # automatically subscribe the writer of the message
+ if vals['user_id']:
self.message_subscribe(cr, uid, [thread_id], [vals['user_id']], context=context)
- # push the message to suscribed users
- users = self.message_get_subscribers(cr, uid, [thread_id], context=context)
- user_to_push_ids += [user['id'] for user in users]
- # parse message to get requested users
- user_to_push_ids += self.message_parse_users(cr, uid, [msg_id], vals['body_text'], context=context)
- # push to need_action_user_id if set
- #if thread_obj.need_action_user_id and thread_obj.need_action_user_id.id not in user_to_push_ids:
- #user_to_push_ids.append(thread_obj.need_action_user_id.id)
-
- # effectively push message to users
+ # push message to users
+ user_to_push_ids = self.message_create_get_notification_user_ids(cr, uid, [thread_id], msg_id, vals, context=context)
for id in user_to_push_ids:
notification_obj.create(cr, uid, {'user_id': id, 'message_id': msg_id}, context=context)
return msg_id
+ def message_create_get_notification_user_ids(self, cr, uid, thread_ids, msg_id, new_msg_vals, context=None):
+ if context is None:
+ context = {}
+
+ notif_user_ids = []
+ for thread_id in thread_ids:
+ # add subscribers
+ users = self.message_get_subscribers(cr, uid, [thread_id], context=context)
+ notif_user_ids += [user['id'] for user in users]
+ # add users requested via parsing message (@login)
+ notif_user_ids += self.message_parse_users(cr, uid, [thread_id], new_msg_vals['body_text'], context=context)
+ # add users requested to perform an action (need_action mechanism)
+ if hasattr(self, 'get_needaction_user_ids'):
+ notif_user_ids += self.get_needaction_user_ids(cr, uid, [thread_id], context=context)[thread_id]
+ # add users notified of the parent messages (because: if parent message contains @login, login must receive the replies)
+ if new_msg_vals.get('parent_id', False):
+ notif_obj = self.pool.get('mail.notification')
+ parent_notif_ids = notif_obj.search(cr, uid, [('message_id', '=', new_msg_vals.get('parent_id'))], context=context)
+ parent_notifs = notif_obj.read(cr, uid, parent_notif_ids, context=context)
+ notif_user_ids += [parent_notif['user_id'][0] for parent_notif in parent_notifs]
+
+ # remove duplicate entries
+ notif_user_ids = list(set(notif_user_ids))
+ return notif_user_ids
+
def message_parse_users(self, cr, uid, ids, string, context=None):
- '''Parse message content; if find @login -(^|\s)@(\w*)-: returns the related ids'''
- regex = re.compile('(^|\s)@(\w*)')
+ """Parse message content
+ - if find @login -(^|\s)@((\w|@|\.)*)-: returns the related ids
+ this supports login that are emails (such as @admin@lapin.net)
+ """
+ regex = re.compile('(^|\s)@((\w|@|\.)*)')
login_lst = [item[1] for item in regex.findall(string)]
if not login_lst: return []
user_ids = self.pool.get('res.users').search(cr, uid, [('login', 'in', login_lst)], context=context)
@@ -172,18 +189,20 @@ class mail_thread(osv.osv):
ret_dict[model_name] = model._description
return ret_dict
- def message_append(self, cr, uid, threads, subject, parent_id=False, body_text=None, type='email',
- email_to=False, email_from=False, email_cc=None, email_bcc=None,
- reply_to=None, email_date=None, message_id=False, references=None,
- attachments=None, body_html=None, subtype=None, headers=None,
- original=None, context=None):
+ def message_append(self, cr, uid, threads, subject, parent_id=False, body_text=None,
+ type='email', email_to=False, email_from=False, email_cc=None,
+ email_bcc=None, reply_to=None, email_date=None, message_id=False,
+ references=None, attachments=None, body_html=None, subtype=None,
+ headers=None, original=None, context=None):
"""Creates a new mail.message attached to the current mail.thread,
containing all the details passed as parameters. All attachments
will be attached to the thread record as well as to the actual
message.
- If only the ``threads`` and ``subject`` parameters are provided,
- a *event log* message is created, without the usual envelope
- attributes (sender, recipients, etc.).
+ If ``email_from`` is not set or ``type`` not set as 'meail',
+ a note message is created, without the usual envelope
+ attributes (sender, recipients, etc.).
+ The creation of the message is done by calling ``message_create``
+ method, that will manage automatic pushing of notifications.
:param threads: list of thread ids, or list of browse_records representing
threads to which a new message should be attached
@@ -253,41 +272,33 @@ class mail_thread(osv.osv):
'model' : thread._name,
'partner_id': partner_id,
'res_id': thread.id,
- 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'date': email_date or fields.datetime.now(),
'message_id': message_id,
'body_text': body_text or (hasattr(thread, 'description') and thread.description or ''),
+ 'body_html': body_html or '',
'attachment_ids': [(6, 0, to_attach)],
- 'state': 'received',
'type': type,
+ 'subtype': subtype,
}
- if email_from:
+ if email_from or type == 'email':
for param in (email_to, email_cc, email_bcc):
if isinstance(param, list):
param = ", ".join(param)
- data = {
+
+ data.update({
'subject': subject or _('History'),
- 'user_id': uid,
- 'model' : thread._name,
- 'res_id': thread.id,
- 'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
- 'body_text': body_text,
+ 'body_text': body_text or '',
'email_to': email_to,
'email_from': email_from or \
(hasattr(thread, 'user_id') and thread.user_id and thread.user_id.user_email),
'email_cc': email_cc,
'email_bcc': email_bcc,
- 'partner_id': partner_id,
'references': references,
- 'message_id': message_id,
- 'attachment_ids': [(6, 0, to_attach)],
- 'state' : 'received',
- 'body_html': body_html,
- 'subtype': subtype,
'headers': headers,
'reply_to': reply_to,
- 'original': original,
- }
+ 'original': original, })
+
self.message_create(cr, uid, thread.id, data, context=context)
return True
@@ -307,99 +318,98 @@ class mail_thread(osv.osv):
to determine the model of the thread to
update (instead of the current model).
"""
- # OpenSocial: add default email type for old API
- if not 'type' in msg_dict: msg_dict['type'] = 'email'
return self.message_append(cr, uid, ids,
subject = msg_dict.get('subject'),
parent_id = msg_dict.get('parent_id', False),
- body_text = msg_dict.get('body_text'),
- type = msg_dict.get('type'),
- email_to = msg_dict.get('to'),
- email_from = msg_dict.get('from'),
- email_cc = msg_dict.get('cc'),
- email_bcc = msg_dict.get('bcc'),
- reply_to = msg_dict.get('reply'),
+ body_text = msg_dict.get('body_text', None),
+ type = msg_dict.get('type', 'email'),
+ email_from = msg_dict.get('from', msg_dict.get('email_from')),
+ email_to = msg_dict.get('to', msg_dict.get('email_to')),
+ email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),
+ email_bcc = msg_dict.get('bcc', msg_dict.get('email_bcc')),
+ reply_to = msg_dict.get('reply', msg_dict.get('reply_to')),
email_date = msg_dict.get('date'),
- message_id = msg_dict.get('message-id'),
+ message_id = msg_dict.get('message-id', msg_dict.get('message_id')),
references = msg_dict.get('references')\
or msg_dict.get('in-reply-to'),
attachments = msg_dict.get('attachments'),
body_html= msg_dict.get('body_html'),
- subtype = msg_dict.get('subtype'),
+ subtype = msg_dict.get('subtype', 'plain'),
headers = msg_dict.get('headers'),
original = msg_dict.get('original'),
context = context)
# Message loading
- def _message_get_parent_ids(self, cr, uid, ids, child_ids, root_ids, context=None):
+ def _message_add_ancestor_ids(self, cr, uid, ids, child_ids, root_ids, context=None):
+ """ Given message child_ids
+ Find their ancestors until root ids"""
if context is None:
context = {}
msg_obj = self.pool.get('mail.message')
- msgs_tmp = msg_obj.read(cr, uid, child_ids, context=context)
- parent_ids = [msg['parent_id'][0] for msg in msgs_tmp if msg['parent_id'] not in root_ids and msg['parent_id'][0] not in child_ids]
+ tmp_msgs = msg_obj.read(cr, uid, child_ids, ['id', 'parent_id'], context=context)
+ parent_ids = [msg['parent_id'][0] for msg in tmp_msgs if msg['parent_id'] and msg['parent_id'][0] not in root_ids and msg['parent_id'][0] not in child_ids]
child_ids += parent_ids
- cur_iter = 0; max_iter = 10;
+ cur_iter = 0; max_iter = 100; # avoid infinite loop
while (parent_ids and (cur_iter < max_iter)):
cur_iter += 1
- msgs_tmp = msg_obj.read(cr, uid, parent_ids, context=context)
- parent_ids = [msg['parent_id'][0] for msg in msgs_tmp if msg['parent_id'] not in root_ids and msg['parent_id'][0] not in child_ids]
+ tmp_msgs = msg_obj.read(cr, uid, parent_ids, ['id', 'parent_id'], context=context)
+ parent_ids = [msg['parent_id'][0] for msg in tmp_msgs if msg['parent_id'] and msg['parent_id'][0] not in root_ids and msg['parent_id'][0] not in child_ids]
child_ids += parent_ids
+ if (cur_iter > max_iter):
+ _logger.warning("Possible infinite loop in _message_add_ancestor_ids. Note that this algorithm is intended to check for cycle in message graph.")
return child_ids
- def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
- """ OpenSocial feature: return thread messages ids (for web compatibility)
- loading messages: search in mail.messages where res_id = ids, (res_)model = current model
- see get_pushed_messages for parameters explanation
+ def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
+ """ OpenChatter feature: return thread messages ids. It searches in
+ mail.messages where res_id = ids, (res_)model = current model.
+ :param domain: domain to add to the search; especially child_of
+ is interesting when dealing with threaded display
+ :param ascent: performs an ascended search; will add to fetched msgs
+ all their parents until root_ids
+ :param root_ids: for ascent search
+ :param root_ids: root_ids when performing an ascended search
"""
if context is None:
context = {}
msg_obj = self.pool.get('mail.message')
msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', ids), ('model', '=', self._name)] + domain,
limit=limit, offset=offset, context=context)
- if (ascent): msg_ids = self._message_get_parent_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+ if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
return msg_ids
- def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
- """ OpenSocial feature: return thread messages
- loading messages: search in mail.messages where res_id = ids, (res_)model = current model
- see get_pushed_messages for parameters explanation
+ def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
+ """ OpenChatter feature: return thread messages
"""
msg_ids = self.message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
return self.pool.get('mail.message').read(cr, uid, msg_ids, context=context)
- def get_pushed_messages(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
- """OpenSocial: wall: get messages to display (=pushed notifications)
- :param domain: domain to add to the search; especially child_of is interesting when dealing with threaded display
- :param deep: performs an ascended search; will add to fetched msgs all their parents until root_ids
- WARNING: must be used in combinaison with a child_of domain
- EXAMPLE: domain = ['id', 'child_of', [32, 33]], root_ids=[32,33]
- :param root_ids: root_ids when performing an ascended search
- :return: list of mail.messages sorted by date
+ def get_pushed_messages(self, cr, uid, ids, limit=100, offset=0, notif_search_domain=[], msg_search_domain=[], ascent=False, root_ids=[], context=None):
+ """ OpenChatter: wall: get messages to display (=pushed notifications)
+ :param domain: domain to add to the search; especially child_of
+ is interesting when dealing with threaded display
+ :param ascent: performs an ascended search; will add to fetched msgs
+ all their parents until root_ids
+ :param root_ids: for ascent search
+ :return list of mail.messages sorted by date
"""
if context is None: context = {}
notification_obj = self.pool.get('mail.notification')
msg_obj = self.pool.get('mail.message')
- # get user notifications
- notification_ids = notification_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+ # update message search
+ for arg in msg_search_domain:
+ if isinstance(arg, (tuple, list)):
+ arg[0] = 'message_id.' + arg[0]
+ # compose final domain
+ domain = [('user_id', '=', uid)] + notif_search_domain + msg_search_domain
+ # get notifications
+ notification_ids = notification_obj.search(cr, uid, domain, limit=limit, offset=offset, context=context)
notifications = notification_obj.browse(cr, uid, notification_ids, context=context)
msg_ids = [notification.message_id.id for notification in notifications]
- # search messages: ids in notifications, add domain coming from wall search view
- search_domain = [('id', 'in', msg_ids)] + domain
- msg_ids = msg_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context)
- if (ascent): msg_ids = self._message_get_parent_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+ # get messages
+ msg_ids = msg_obj.search(cr, uid, [('id', 'in', msg_ids)], context=context)
+ if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
msgs = msg_obj.read(cr, uid, msg_ids, context=context)
return msgs
-
- # Message tools
- def message_get_discussions_nbr(self, cr, uid, ids, context=None):
- message_obj = self.pool.get('mail.message')
- count = message_obj.search(cr, uid, [('model', '=', self._name), ('res_id', '=', ids), ('parent_id', '=', False)], count=True)
- return count
-
- def message_get_messages_nbr(self, cr, uid, ids, context=None):
- message_obj = self.pool.get('mail.message')
- count = message_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], count=True)
- return count
#------------------------------------------------------
# Email specific
@@ -627,18 +637,14 @@ class mail_thread(osv.osv):
{ 'partner_address_id': id or False,
'partner_id': pid or False }
"""
- address_pool = self.pool.get('res.partner.address')
- res = {
- 'partner_address_id': False,
- 'partner_id': False
- }
+ partner_pool = self.pool.get('res.partner')
+ res = {'partner_id': False}
if email:
email = to_email(email)[0]
- address_ids = address_pool.search(cr, uid, [('email', '=', email)])
- if address_ids:
- address = address_pool.browse(cr, uid, address_ids[0])
- res['partner_address_id'] = address_ids[0]
- res['partner_id'] = address.partner_id.id
+ contact_ids = partner_pool.search(cr, uid, [('email', '=', email)])
+ if contact_ids:
+ contact = partner_pool.browse(cr, uid, contact_ids[0])
+ res['partner_id'] = contact.id
return res
# for backwards-compatibility with old scripts
@@ -648,6 +654,19 @@ class mail_thread(osv.osv):
# Note specific
#------------------------------------------------------
+ def log(self, cr, uid, id, message, secondary=False, context=None):
+ _logger.warning("log() is deprecated. Please use OpenChatter notification system instead of the res.log mechanism.")
+ self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
+
+ # tmp stuff
+ def message_add_note(self, cr, uid, ids, body, type='notification', parent_id=False, subject=False, subtype='html', context=None):
+ if not subject:
+ if type == 'notification':
+ subject = _('System notification on %s') % (self._name, fields.datetime.now())
+ elif type == 'comment':
+ subject = _('Reply on %s at %s') % (self._name, fields.datetime.now())
+ return self.message_append(cr, uid, ids, subject, body_text=body, parent_id=parent_id, type=type, context=context)
+
def message_append_note(self, cr, uid, ids, subject, body, parent_id=False, type='notification', context=None):
return self.message_append(cr, uid, ids, subject, body_text=body, parent_id=parent_id, type=type, context=context)
@@ -663,7 +682,7 @@ class mail_thread(osv.osv):
def message_get_subscribers(self, cr, uid, ids, context=None):
user_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context)
- users = self.pool.get('res.users').read(cr, uid, user_ids, fields=['id', 'name', 'avatar_mini'], context=context)
+ users = self.pool.get('res.users').read(cr, uid, user_ids, fields=['id', 'name', 'avatar'], context=context)
return users
def message_is_subscriber(self, cr, uid, ids, user_id = None, context=None):
@@ -684,6 +703,8 @@ class mail_thread(osv.osv):
return create_ids
def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
+ if not user_ids and not uid in self.message_get_subscribers_ids(cr, uid, ids, context=context):
+ return False
subscription_obj = self.pool.get('mail.subscription')
to_unsubscribe_uids = [uid] if user_ids is None else user_ids
to_delete_sub_ids = subscription_obj.search(cr, uid,
@@ -691,4 +712,20 @@ class mail_thread(osv.osv):
subscription_obj.unlink(cr, uid, to_delete_sub_ids, context=context)
return True
+ #------------------------------------------------------
+ # Notification API
+ #------------------------------------------------------
+
+ def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):
+ if context is None:
+ context = {}
+ notif_obj = self.pool.get('mail.notification')
+ msg_obj = self.pool.get('mail.message')
+ if remove_childs:
+ notif_msg_ids = msg_obj.search(cr, uid, [('id', 'child_of', msg_ids)], context=context)
+ else:
+ notif_msg_ids = msg_ids
+ to_del_notif_ids = notif_obj.search(cr, uid, ['&', ('user_id', '=', uid), ('message_id', 'in', notif_msg_ids)], context=context)
+ return notif_obj.unlink(cr, uid, to_del_notif_ids, context=context)
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index def47fc73da..1823abb96b1 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -5,6 +5,7 @@
Feeds
+ 0
@@ -22,11 +23,6 @@
+
+
+
+
+ res.users.preferences.form.mail
+ res.users
+
+
+
+
+
+
+
+
+
+
+ res.users.form.mail
+ res.users
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 88482da473e..eea87b6ab2d 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,5 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message,mail.message,model_mail_message,,1,0,1,0
-access_mail_thread,mail.thread,model_mail_thread,,1,0,1,0
-access_mail_subscription,mail.subscription,model_mail_subscription,,1,0,1,0
-access_mail_notification,mail.notification,model_mail_notification,,1,0,1,0
+access_mail_message_base,mail.message.base,model_mail_message,,1,1,1,1
+access_mail_thread,mail.thread,model_mail_thread,,1,1,1,0
+access_mail_subscription_base,mail.subscription.base,model_mail_subscription,,1,1,1,1
+access_mail_notification_base,mail.notification.base,model_mail_notification,,1,1,1,1
+access_mail_group_base,mail.group.base,model_mail_group,,1,1,1,1
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
new file mode 100644
index 00000000000..88a7b060be4
--- /dev/null
+++ b/addons/mail/security/mail_security.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+ Social and Sharing Tools
+ 26
+
+
+
+
+ Mail manager
+
+
+
+
+
+
+
+
+ Mail.group: access only public and joined groups
+ ['|', ('public', '=', True), ('member_ids', 'in', user.id)]
+
+
+ Mail.group: delete my groups only
+ [('responsible_id', '=', user.id)]
+
+
+ Mail.group: all groups
+ [(1,'=',1)]
+
+
+
+
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9c4fc416123..638fc1ea111 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -2,22 +2,22 @@
/* Wall */
/* ------------------------------ */
-.oe_mail_wall {
+div.oe_mail_wall {
overflow: auto;
padding: 5px;
}
-.oe_mail_wall_search {
+div.oe_mail_wall_search {
width: 55%;
}
/* 2 columns view */
-.oe_mail_wall_left {
+div.oe_mail_wall_left {
float: left;
width: 65%;
}
-.oe_mail_wall_right {
+div.oe_mail_wall_right {
float: right;
width: 34%;
}
@@ -36,8 +36,9 @@
margin-left: 40px;
}
-.oe_mail_wall_more {
+div.oe_mail_wall_more {
text-align: center;
+ display: none;
}
/* ------------------------------ */
@@ -50,11 +51,11 @@
}
/* Left-side CSS */
-.oe_mail_actions {
+.oe_mail_recthread_actions {
margin-bottom: 10px;
}
-.oe_mail_followers {
+.oe_mail_recthread_followers {
margin-bottom: 10px;
}
@@ -93,6 +94,7 @@
div.oe_mail_thread_act {
white-space: normal;
margin-bottom: 5px;
+ padding: 4px;
}
div.oe_mail_thread_display {
@@ -106,10 +108,11 @@ div.oe_mail_thread_subthread {
}
div.oe_mail_thread_more {
+ display: none;
border-bottom: 1px solid #D2D9E7;
}
-div.oe_mail_thread_msg {
+li.oe_mail_thread_msg {
padding: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -118,15 +121,15 @@ div.oe_mail_thread_msg {
border-radius: 4px;
}
-div.notification {
+li.notification {
background: #E0E0E0;
}
-div.email {
+li.email {
background: #E0E0E0;
}
-div.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
+li.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
content: "";
display: block;
clear: both;
@@ -176,6 +179,16 @@ div.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
/* Styling (should be openerp) */
/* ------------------------------ */
+ul.oe_mail {
+ padding: 0;
+ margin: 0;
+}
+
+li.oe_mail {
+ list-style-type: none;
+ margin-bottom: 2px;
+}
+
input.oe_mail, textarea.oe_mail {
width: 100%;
padding: 4px;
@@ -218,7 +231,6 @@ p.oe_mail_msg {
}
.oe_mail_oe_fade {
- font-size: 12px;
color: #888888;
}
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index fad7b1a865d..90261499753 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -27,7 +27,7 @@
.oe_group_photo {
width: 100px;
height: auto;
- clip: rect(10px, 100px, 110px, 0px);
+ clip: rect(0px, 100px, 100px, 0px);
}
.oe_group_photo_wide {
@@ -44,6 +44,11 @@
min-height: 120px;
}
+.oe_group_details a, .oe_group_details a:hover {
+ font-weight: bold;
+ color: #4c4c4c;
+}
+
.oe_group_details h4 {
margin: 0;
font-size: 13px;
diff --git a/addons/mail/static/src/img/groupdefault.png b/addons/mail/static/src/img/groupdefault.png
new file mode 100644
index 00000000000..fd826837266
Binary files /dev/null and b/addons/mail/static/src/img/groupdefault.png differ
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e18d96fd595..c736eadd85e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1,4 +1,6 @@
openerp.mail = function(session) {
+ var _t = session.web._t,
+ _lt = session.web._lt;
var mail = session.mail = {};
@@ -9,9 +11,8 @@ openerp.mail = function(session) {
'Thread', 'openerp.mail.Thread');
/**
- * ThreadDisplay widget: this widget handles the display of a thread of messages.
- * Two displays are managed through the [thread_level] parameter that sets
- * the level number in the thread:
+ * ThreadDisplay widget: this widget handles the display of a thread of
+ * messages. The [thread_level] parameter sets the thread level number:
* - root message
* - - sub message (parent_id = root message)
* - - - sub sub message (parent id = sub message)
@@ -44,49 +45,42 @@ openerp.mail = function(session) {
this.params.parent_id = this.params.parent_id || false;
this.params.thread_level = this.params.thread_level || 0;
this.params.msg_more_limit = this.params.msg_more_limit || 100;
- this.params.limit = this.params.limit || 2;
+ this.params.limit = this.params.limit || 100;
this.params.offset = this.params.offset || 0;
this.params.records = this.params.records || null;
- /* DataSets and internal vars */
+ // datasets and internal vars
this.ds = new session.web.DataSet(this, this.params.res_model);
this.ds_users = new session.web.DataSet(this, 'res.users');
this.ds_msg = new session.web.DataSet(this, 'mail.message');
- this.name = 'Unknown record'
this.sorted_comments = {'root_ids': [], 'root_id_msg_list': {}};
- /* Display vars */
+ // display customization vars
this.display = {};
this.display.show_post_comment = this.params.show_post_comment || false;
this.display.show_reply = (this.params.thread_level > 0);
this.display.show_delete = true;
- this.display.show_hide = true;
+ this.display.show_hide = this.params.show_hide || false;
this.display.show_more = (this.params.thread_level == 0);
// not used currently
this.intlinks_mapping = {};
},
start: function() {
- var self = this;
this._super.apply(this, arguments);
// customize display
- this.$element.find('p.oe_mail_p_nomore').hide();
if (! this.display.show_post_comment) this.$element.find('div.oe_mail_thread_act').hide();
- if (! this.display.show_more) this.$element.find('div.oe_mail_thread_more').hide();
+ //if (this.display.show_more) this.$element.find('div.oe_mail_thread_more').show();
// add events
this.add_events();
- /* get record name */
- var name_get_done = self.ds.name_get([this.params.res_id]).then(function (records) { self.name = records[0][1]; });
- var display_done = $.when(name_get_done).then(function () {
- /* display user, fetch comments */
- self.display_current_user();
- if (self.params.records) return self.display_comments(self.params.records);
- else return self.init_comments();
- });
+ /* display user, fetch comments */
+ this.display_current_user();
+ if (this.params.records) var display_done = this.fetch_comments_tmp(this.params.records);
+ else var display_done = this.init_comments();
return display_done
},
add_events: function() {
var self = this;
- // event: click on 'more'
+ // event: click on 'more' at bottom of thread
this.$element.find('button.oe_mail_button_more').click(function () {
self.do_more();
});
@@ -96,25 +90,37 @@ openerp.mail = function(session) {
if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
else if (charCode == 13) { self.do_comment(); }
});
- // event: click on 'reply'
+ // event: click on 'reply' in msg
this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
- var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_act:first');
- act_dom.toggle();
+ var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_act:first');
+ act_dom.toggle();
});
- // event: click on 'delete'
+ // event: click on 'delete' in msg
this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
- console.log('deleting');
- var msg_id = event.srcElement.dataset.id;
- if (! msg_id) return false;
- self.ds_msg.unlink([parseInt(msg_id)]).then();
- return false;
+ //console.log('deleting');
+ if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
+ var msg_id = event.srcElement.dataset.id;
+ if (! msg_id) return false;
+ var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
+ $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+ if (self.params.thread_level > 0) {
+ $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+ }
+ return false;
});
- // event: click on 'hide'
+ // event: click on 'hide' in msg
this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide', 'click', function (event) {
- console.log('hiding');
- var msg_id = event.srcElement.dataset.id;
- if (! msg_id) return false;
- return false;
+ //console.log('hiding');
+ if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
+ var msg_id = event.srcElement.dataset.id;
+ if (! msg_id) return false;
+ //console.log(msg_id);
+ var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
+ $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+ if (self.params.thread_level > 0) {
+ $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+ }
+ return false;
});
// event: click on an internal link
this.$element.find('div.oe_mail_thread_display').delegate('a.intlink', 'click', function (event) {
@@ -137,8 +143,8 @@ openerp.mail = function(session) {
});
},
- stop: function () {
- //this._super.apply(this, arguments);
+ destroy: function () {
+ this._super.apply(this, arguments);
},
init_comments: function() {
@@ -150,16 +156,30 @@ openerp.mail = function(session) {
return this.fetch_comments(this.params.limit, this.params.offset, domain).then();
},
- fetch_comments: function (limit, offset, domain) {
- console.log('fetch comments');
+ fetch_comments_tmp: function (records_good) {
+ console.log('fetch comments tmp');
var self = this;
- var defer = this.ds.call('message_load', [[this.params.res_id], (limit||this.params.limit), (offset||this.params.offset), (domain||[]), (this.params.thread_level > 0), (this.sorted_comments['root_ids'])]);
+ var defer = this.ds.call('message_load', [[this.params.res_id], 1, 0, [ ['id', 'child_of', this.params.parent_id], ['id', '!=', this.params.parent_id]] ]);
$.when(defer).then(function (records) {
- if (records.length < self.params.limit) self.display.show_more = false;
+ //console.log(records);
+ if (records.length <= 0) self.display.show_more = false;
+ self.display_comments(records_good);
+ if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
+ else self.$element.find('div.oe_mail_thread_more:last').hide();
+ });
+ return defer;
+ },
+
+ fetch_comments: function (limit, offset, domain) {
+ //console.log('fetch comments');
+ var self = this;
+ var defer = this.ds.call('message_load', [[this.params.res_id], ( (limit+1)||(this.params.limit+1) ), (offset||this.params.offset), (domain||[]), (this.params.thread_level > 0), (this.sorted_comments['root_ids'])]);
+ $.when(defer).then(function (records) {
+ if (records.length <= self.params.limit) self.display.show_more = false;
+ else records.pop();
self.display_comments(records);
- if (self.display.show_more == false) {
- self.$element.find('button.oe_mail_button_more:last').hide();
- self.$element.find('p.oe_mail_p_nomore:last').show(); }
+ if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
+ else self.$element.find('div.oe_mail_thread_more:last').hide();
});
return defer;
},
@@ -204,15 +224,15 @@ openerp.mail = function(session) {
*/
display_comment: function (record) {
if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
- else { record.mini_url = this.thread_get_avatar_mini('res.users', 'avatar_mini', record.user_id[0]); }
+ else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); }
// body text manipulation
record.body_text = this.do_clean_text(record.body_text);
record.tr_body_text = this.do_truncate_string(record.body_text, this.params.msg_more_limit);
record.body_text = this.do_replace_internal_links(record.body_text);
if (record.tr_body_text) record.tr_body_text = this.do_replace_internal_links(record.tr_body_text);
// render
- $(session.web.qweb.render('ThreadMsg', {'record': record, 'res_model': this.params.res_model, 'res_id': this.params.res_id, 'name': this.name,
- 'display': this.display})).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
+ $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
+ ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
// truncated: hide full-text, show summary, add buttons
if (record.tr_body_text) {
var node_body = this.$element.find('span.oe_mail_msg_body:last').append(' [ ... Show less]');
@@ -269,14 +289,14 @@ openerp.mail = function(session) {
},
display_current_user: function () {
- return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar_mini('res.users', 'avatar_mini', this.params.uid));
+ return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.params.uid));
},
do_comment: function () {
var comment_node = this.$element.find('textarea');
var body_text = comment_node.val();
comment_node.val('');
- return this.ds.call('message_append_note', [[this.params.res_id], 'Reply comment', body_text, this.params.parent_id, 'comment']).then(
+ return this.ds.call('message_add_note', [[this.params.res_id], body_text, 'comment', this.params.parent_id]).then(
this.proxy('init_comments'));
},
@@ -288,11 +308,24 @@ openerp.mail = function(session) {
*/
get_fetch_domain: function (sorted_comments) {
var domain = [];
- var ids = [];
+ var ids = sorted_comments.root_ids.slice();
var dis2 = [];
- if (this.params.parent_id) {
- domain.push(['id', 'child_of', this.params.parent_id]);
+ // must be child of current parent
+ if (this.params.parent_id) { domain.push(['id', 'child_of', this.params.parent_id]); }
+ // must not be children of already fetched messages
+ if (ids.length > 0) {
+ domain.push('&');
+ domain.push('!');
+ domain.push(['id', 'child_of', ids]);
}
+ // must not be current roots
+ //if (this.params.parent_id != false) {
+ //ids.push(this.params.parent_id);
+ //}
+ //if (ids.length > 0) {
+ //domain.push['id', 'not in', ids]);
+ //}
+
_(sorted_comments.root_ids).each(function (id) { // each record
ids.push(id);
dis2.push(id);
@@ -316,8 +349,8 @@ openerp.mail = function(session) {
do_more: function () {
domain = this.get_fetch_domain(this.sorted_comments);
- console.log(domain);
- console.log(this.params.limit + '-' + this.params.offset + '-' + this.params.parent_id + '-' + this.params.res_id);
+ //console.log(domain);
+ //console.log(this.params.limit + '-' + this.params.offset + '-' + this.params.parent_id + '-' + this.params.res_id);
//return true;
return this.fetch_comments(this.params.limit, this.params.offset, domain);
},
@@ -335,7 +368,7 @@ openerp.mail = function(session) {
return string;
},
- thread_get_avatar_mini: function(model, field, id) {
+ thread_get_avatar: function(model, field, id) {
return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
},
@@ -376,6 +409,11 @@ openerp.mail = function(session) {
regex_res = regex_intlink.exec(string);
}
},
+
+ /** checks if tue current user is the message author */
+ _is_author: function (id) {
+ return (this.session.uid == id);
+ },
});
@@ -392,52 +430,51 @@ openerp.mail = function(session) {
form_template: 'RecordThread',
init: function() {
- this.is_sub = 0;
- this.see_sub = 1;
this._super.apply(this, arguments);
+ this.see_subscribers = true;
this.thread = null;
- /* DataSets */
+ // datasets
this.ds = new session.web.DataSet(this, this.view.model);
this.ds_users = new session.web.DataSet(this, 'res.users');
},
start: function() {
- var self = this;
this._super.apply(this, arguments);
- /* bind and hide buttons */
- self.$element.find('button.oe_mail_button_followers').bind('click', function () { self.do_toggle_followers(); }).hide();
- self.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); }).hide()
+ var self = this;
+ // bind buttons
+ this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
+ this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
.mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
- self.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); }).hide()
+ this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
.mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
+ this.reinit();
},
- stop: function () {
+ destroy: function () {
this._super.apply(this, arguments);
},
- set_value: function() {
- var self = this;
- this._super.apply(this, arguments);
- this.see_sub = 1;
- /* hide follow/unfollow/see followers buttons */
+ reinit: function() {
+ this.see_subscribers = true;
this.$element.find('button.oe_mail_button_followers').html('Hide followers')
this.$element.find('button.oe_mail_button_follow').hide();
this.$element.find('button.oe_mail_button_unfollow').hide();
- if (! this.view.datarecord.id) { return; }
- /* find wich (un)follow buttons to show */
- var fetch_fol_done = this.ds.call('message_is_subscriber', [[this.view.datarecord.id]]).then(function (records) {
- if (records == true) { self.is_sub = 1; self.$element.find('button.oe_mail_button_unfollow').show(); }
- else { self.is_sub = 0; self.$element.find('button.oe_mail_button_follow').show(); }
- });
- /* fetch subscribers */
+ },
+
+ set_value: function() {
+ this._super.apply(this, arguments);
+ var self = this;
+ this.reinit();
+ if (! this.view.datarecord.id) { this.$element.find('ul.oe_mail_thread').hide(); return; }
+ // fetch followers
var fetch_sub_done = this.fetch_subscribers();
- /* create ThreadDisplay widget and render it */
+ // create and render Thread widget
this.$element.find('div.oe_mail_recthread_left').empty();
- if (this.thread) this.thread.stop();
- this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid, 'show_post_comment': true});
- this.thread.appendTo(this.$element.find('div.oe_mail_recthread_left'));
- return fetch_fol_done && fetch_sub_done;
+ if (this.thread) this.thread.destroy();
+ this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
+ 'show_post_comment': true, 'limit': 15});
+ var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_left'));
+ return fetch_sub_done && thread_done;
},
fetch_subscribers: function () {
@@ -446,39 +483,42 @@ openerp.mail = function(session) {
display_subscribers: function (records) {
var self = this;
- var sub_node = this.$element.find('div.oe_mail_followers')
+ this.is_subscriber = false;
+ var sub_node = this.$element.find('div.oe_mail_recthread_followers')
sub_node.empty();
$('').html('Followers (' + records.length + ')').appendTo(sub_node);
_(records).each(function (record) {
- var mini_url = self.thread_get_avatar_mini('res.users', 'avatar_mini', record.id);
- $('
').appendTo(sub_node);
+ if (record.id == self.session.uid) { self.is_subscriber = true; }
+ var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id);
+ $('').appendTo(sub_node);
});
+ if (self.is_subscriber) {
+ self.$element.find('button.oe_mail_button_follow').hide();
+ self.$element.find('button.oe_mail_button_unfollow').show(); }
+ else {
+ self.$element.find('button.oe_mail_button_follow').show();
+ self.$element.find('button.oe_mail_button_unfollow').hide(); }
},
do_follow: function () {
- this.do_toggle_follow();
- return this.ds.call('message_subscribe', [[this.view.datarecord.id]]).then(this.proxy('fetch_subscribers'));
+ return this.ds.call('message_subscribe', [[this.view.datarecord.id]]).pipe(this.proxy('fetch_subscribers'));
},
do_unfollow: function () {
- this.do_toggle_follow();
- return this.ds.call('message_unsubscribe', [[this.view.datarecord.id]]).then(this.proxy('fetch_subscribers'));
- },
-
- do_toggle_follow: function () {
- this.is_sub = 1 - this.is_sub;
- this.$element.find('button.oe_mail_button_unfollow').toggle();
- this.$element.find('button.oe_mail_button_follow').toggle();
+ var self = this;
+ return this.ds.call('message_unsubscribe', [[this.view.datarecord.id]]).then(function (record) {
+ if (record == false) self.do_notify("Impossible to unsubscribe", "You are automatically subscribed to this record. You cannot unsubscribe.");
+ }).pipe(this.proxy('fetch_subscribers'));
},
do_toggle_followers: function () {
- this.see_sub = 1 - this.see_sub;
- if (this.see_sub == 1) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
+ this.see_subscribers = ! this.see_subscribers;
+ if (this.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
else { this.$element.find('button.oe_mail_button_followers').html('Display followers'); }
- this.$element.find('div.oe_mail_followers').toggle();
+ this.$element.find('div.oe_mail_recthread_followers').toggle();
},
- thread_get_avatar_mini: function(model, field, id) {
+ thread_get_avatar: function(model, field, id) {
return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
},
});
@@ -503,49 +543,61 @@ openerp.mail = function(session) {
init: function (parent, params) {
this._super(parent);
this.params = params || {};
- this.params.limit = params.limit || 2;
+ this.params.limit = params.limit || 50;
+ this.params.limit = 10;
+ this.params.domain = params.domain || [];
+ this.params.context = params.context || {};
+ this.params.search = {'domain': [], 'context': {}, 'groupby': {}}
this.params.search_view_id = params.search_view_id || false;
this.params.thread_level = params.thread_level || 1;
- this.params.search = {};
- this.params.domain = [];
this.sorted_comments = {'models': {}};
+ this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}};
this.display_show_more = true;
- /* DataSets */
+ // datasets
this.ds_msg = new session.web.DataSet(this, 'mail.message');
+ this.ds_groups = new session.web.DataSet(this, 'mail.group');
this.ds_thread = new session.web.DataSet(this, 'mail.thread');
this.ds_users = new session.web.DataSet(this, 'res.users');
},
- start: function() {
- var self = this;
+ start: function () {
this._super.apply(this, arguments);
- /* events and buttons */
- this.$element.find('button.oe_mail_wall_button_comment').bind('click', function () { self.do_comment(); });
- this.$element.find('button.oe_mail_wall_button_more').bind('click', function () { self.do_more(); });
- this.$element.find('p.oe_mail_wall_nomore').hide();
- /* load mail.message search view */
- var search_view_loaded = this.load_search_view(this.params.search_view_id, {}, false);
- var search_view_ready = $.when(search_view_loaded).then(function () {
- self.searchview.on_search.add(self.do_searchview_search);
- });
- /* fetch comments */
- var comments_ready = this.init_comments(this.params.domain, {}, 0, this.params.limit);
+ var self = this;
+ // add events
+ this.add_event_handlers();
+ // load mail.message search view
+ var search_view_ready = this.load_search_view(this.params.search_view_id, {}, false);
+ // fetch first threads
+ var comments_ready = this.init_and_fetch_comments(this.params.limit, 0);
return (search_view_ready && comments_ready);
},
stop: function () {
this._super.apply(this, arguments);
},
+
+ /** Add events */
+ add_event_handlers: function () {
+ var self = this;
+ // post a comment
+ this.$element.find('button.oe_mail_wall_button_comment').click(function () { self.do_comment(); });
+ // display more threads
+ this.$element.find('button.oe_mail_wall_button_more').click(function () { self.do_more(); });
+ },
/**
* Loads the mail.message search view
* @param {Number} view_id id of the search view to load
* @param {Object} defaults ??
- * @param {Boolean} hidden ??
+ * @param {Boolean} hidden some kind of trick we do not care here
*/
load_search_view: function (view_id, defaults, hidden) {
+ var self = this;
this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
- return this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+ var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+ return $.when(search_view_loaded).then(function () {
+ self.searchview.on_search.add(self.do_searchview_search);
+ });
},
/**
@@ -563,45 +615,46 @@ openerp.mail = function(session) {
contexts: contexts || [],
group_by_seq: groupbys || []
}, function (results) {
- self.params.search['context'] = results.context;
- self.params.search['domain'] = results.domain;
- self.params.search['groupby'] = results.group_by;
- self.init_comments(self.params.search['domain'], self.params.search['context']);
+ //self.params.search['context'] = results.context;
+ //self.params.search['domain'] = results.domain;
+ //self.params.search['groupby'] = results.group_by;
+ return self.init_and_fetch_comments(self.params.limit, 0, results.domain, results.context);
});
},
/**
- * Initializes Wall and calls fetch_comments
- * @param {Array} domains
- * @param {Array} contexts
- * @param {Array} groupbys
- * @param {Number} limit number of messages to fetch
+ * Initializes the wall and calls fetch_comments
+ * @param {Number} limit: number of notifications to fetch
+ * @param {Number} offset: offset in notifications search
+ * @param {Array} domain
+ * @param {Array} context
*/
- init_comments: function(domain, context, offset, limit) {
- this.params.domain = [];
+ init_and_fetch_comments: function(limit, offset, domain, context) {
+ this.params.search['domain'] = _.union(this.params.domain, domain || []);
+ this.params.search['context'] = _.extend(this.params.context, context || {});
this.display_show_more = true;
this.sorted_comments = {'models': {}};
this.$element.find('div.oe_mail_wall_threads').empty();
- return this.fetch_comments(domain, context, offset, limit);
+ return this.fetch_comments(limit, offset);
},
/**
- * Fetches Wall comments (mail.thread.get_pushed_messages)
- * @param {Array} domains
- * @param {Array} contexts
- * @param {Array} groupbys
- * @param {Number} limit number of messages to fetch
+ * Fetches wall messages
+ * @param {Number} limit: number of notifications to fetch
+ * @param {Number} offset: offset in notifications search
+ * @param {Array} domain
+ * @param {Array} context
*/
- fetch_comments: function (domain, context, offset, limit) {
+ fetch_comments: function (limit, offset, additional_domain, additional_context) {
var self = this;
+ if (additional_domain) var fetch_domain = _.union(this.params.search['domain'], additional_domain);
+ else var fetch_domain = this.params.search['domain'];
+ if (additional_context) var fetch_context = _.extend(this.params.search['context'], additional_context);
+ else var fetch_context = this.params.search['context'];
var load_res = this.ds_thread.call('get_pushed_messages',
- [[this.session.uid], (limit || 2), (offset || 0), (domain || []), true, [false], (context || null)]).then(function (records) {
- if (records.length < self.params.limit) self.display_show_more = false;
+ [[this.session.uid], (limit || 0), (offset || 0), [], fetch_domain, true, [], fetch_context]).then(function (records) {
+ self.do_update_show_more(records.length >= self.params.limit);
self.display_comments(records);
- if (! self.display_show_more) {
- self.$element.find('button.oe_mail_wall_button_more:last').hide();
- self.$element.find('p.oe_mail_wall_nomore:last').show();
- }
});
return load_res;
},
@@ -611,7 +664,10 @@ openerp.mail = function(session) {
*/
display_comments: function (records) {
var sorted_comments = this.sort_comments(records);
- console.log(sorted_comments);
+ console.log('debut !');
+ this.sort_comments_new(records);
+ console.log('fin');
+ //console.log(sorted_comments);
var self = this;
_(sorted_comments.model_list).each(function (model_name) {
_(sorted_comments.models[model_name].root_ids).each(function (id) {
@@ -621,11 +677,14 @@ openerp.mail = function(session) {
$('
-
-
-
members
- - Joined -
- Join -
- Leave -
messages in discussions
+ members
+ - Not following +
- Following +
messages last month
').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
var thread = new mail.Thread(self, {
'res_model': model_name, 'res_id': records[0]['res_id'], 'uid': self.session.uid, 'records': records,
- 'parent_id': false, 'thread_level': self.params.thread_level}
+ 'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
);
var thread_displayed = thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));
});
});
+ // update TODO
+ this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
+ this.comments_structure['new_root_ids'] = [];
},
/**
@@ -639,6 +698,33 @@ openerp.mail = function(session) {
* 'msgs': {'root_id': [records]}, still sorted by date desc
* }, for each model
*/
+ sort_comments_new: function(records) {
+ var cs = this.comments_structure;
+ var cur_iter = 0; var max_iter = 10; var modif = true;
+ while ( modif && (cur_iter++) < max_iter) {
+ modif = false;
+ _(records).each(function (record) {
+ if (record.parent_id == false && (! cs['msgs'][record.id])) {
+ cs['new_root_ids'].push(record.id);
+ cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': []};
+ cs['msgs'][record.id] = record;
+ modif = true;
+ }
+ else if (! cs['msgs'][record.id]) {
+ if ((cs['msgs'][record.parent_id[0]]) && (! cs['msgs'][record.id])) {
+ cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
+ for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
+ cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
+ }
+ cs['msgs'][record.id] = record;
+ modif = true;
+ }
+ }
+ });
+ }
+ console.log(this.comments_structure);
+ },
+
sort_comments: function (records) {
var self = this;
var sc = {'model_list': [], 'models': {}}
@@ -684,7 +770,9 @@ openerp.mail = function(session) {
/**
* Create a domain to fetch new comments according to
- * comment already present in sorted_comments
+ * comments already present in sorted_comments
+ * - for each model:
+ * -- should not be child of already displayed ids
* @param {Object} sorted_comments (see sort_comments)
* @returns {Array} fetch_domain (OpenERP domain style)
*/
@@ -700,27 +788,24 @@ openerp.mail = function(session) {
return domain;
},
- /**
- * Action: Shows more discussions
- */
+ /** Display update: show more button */
+ do_update_show_more: function (new_value) {
+ if (new_value != undefined) this.display_show_more = new_value;
+ if (this.display_show_more) this.$element.find('div.oe_mail_wall_more:last').show();
+ else this.$element.find('div.oe_mail_wall_more:last').hide();
+ },
+
+ /** Action: Shows more discussions */
do_more: function () {
var domain = this.get_fetch_domain(this.sorted_comments);
- return this.fetch_comments(domain);
+ return this.fetch_comments(this.params.limit, 0, domain);
},
- /**
- * Action: Posts a comment
- */
+ /** Action: Posts a comment */
do_comment: function () {
var body_text = this.$element.find('textarea.oe_mail_wall_action_textarea').val();
- return this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment']).then(this.init_comments());
- },
-
- /**
- * Tools: get avatar mini (TODO: should be moved in some tools ?)
- */
- thread_get_mini: function(model, field, id) {
- return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+ return this.ds_users.call('message_add_note', [[this.session.uid], body_text, 'comment', false, 'Tweet', 'html']).then(
+ this.init_and_fetch_comments(this.params.limit, 0));
},
});
};
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c9ab259ddf8..a8e674c48bb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -6,36 +6,32 @@
-
+
-
- -
+ - -
+
-
You have loaded all discussions.
-
+
-
OpenSocial
+ History and Comments
-
+
-
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 0300122e8ff..c7540935005 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -122,7 +122,7 @@
-
+
@@ -1022,7 +1022,7 @@
parent="base.menu_mrp_root" sequence="2"
groups="base.group_extended"/>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index b7e51dd7cf0..251eafc89ea 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -41,8 +41,8 @@
-
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 4289010d165..cd6b8db2195 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -37,7 +37,6 @@ access_product_product_user,product.product user,product.model_product_product,m
access_product_template_user,product.template user,product.model_product_template,mrp.group_mrp_user,1,0,0,0
access_product_uom_user,product.uom user,product.model_product_uom,mrp.group_mrp_user,1,0,0,0
access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1
-access_res_partner_address,res.partner.address,base.model_res_partner_address,mrp.group_mrp_user,1,0,0,0
access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0
access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0
access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index 496e039d0d4..ee78e036d44 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -22,8 +22,8 @@
assert line.product_qty == (2.0*factor), "Qty is not correspond."
assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond"
sidepanel = True
- elif line.product_id.id == ref('product.product_product_woodlintelm0'): #LIN40 4*0.25 Meter
- assert not woodlintelm, "Production line is already generated for LIN40."
+ elif line.product_id.id == ref('product.product_product_woodlintelm0'): #LIN40 4*0.25 Meter
+ assert not woodlintelm, "Production line is already generated for LIN40."
assert line.product_qty == (4*0.25*factor), "Qty is not correspond."
assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
woodlintelm = True
@@ -32,7 +32,7 @@
assert line.product_qty == (0.25*factor), "Qty is not correspond."
assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
woodmm0 = True
- elif line.product_id.id == ref('product.product_product_metalcleats0'): #METC000 4*3 Unit
+ elif line.product_id.id == ref('product.product_product_metalcleats0'): #METC000 4*3 Unit
assert not metalcleats, "Production line is already generated for METC000."
assert line.product_qty == (4*3*factor), "Qty is not correspond."
assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond"
@@ -107,7 +107,7 @@
routing_loc = None
if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
routing_loc = order.bom_id.routing_id.location_id.id
- date_planned = order.date_planned
+ date_planned = order.date_planned
for move_line in order.move_lines:
for order_line in order.product_lines:
if move_line.product_id.type not in ('product', 'consu'):
@@ -129,18 +129,18 @@
procurement = self.pool.get('procurement.order')
order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
assert order.picking_id, 'Internal Shipment should be created!'
-
+
routing_loc = None
pick_type = 'internal'
- address_id = False
+ partner_id = False
if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
routing_loc = order.bom_id.routing_id.location_id
if routing_loc.usage <> 'internal':
pick_type = 'out'
- address_id = routing_loc.address_id and routing_loc.address_id.id or False
+ partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
routing_loc = routing_loc.id
assert order.picking_id.type == pick_type, "Shipment should be Internal."
- assert order.picking_id.address_id.id == address_id, "Shipment Address is not correspond with Adderss of Routing Location."
+ assert order.picking_id.partner_id.id == partner_id, "Shipment Address is not correspond with Adderss of Routing Location."
date_planned = order.date_planned
for move_line in order.picking_id.move_lines:
for order_line in order.product_lines:
@@ -167,7 +167,7 @@
assert shipment_procurement.product_uos.id == order_line.product_uos.id, "UOS is not correspond in procurement."
assert shipment_procurement.location_id.id == order.location_src_id.id, "Location is not correspond in procurement."
assert shipment_procurement.procure_method == order_line.product_id.procure_method, "Procure method is not correspond in procurement."
-
+
-
I change production qty with 3 Dozen Shelf 100cm.
-
@@ -187,7 +187,7 @@
assert order.product_qty == 3, "Qty is not changed in order."
move = order.move_created_ids[0]
assert move.product_qty == order.product_qty, "Qty is not changed in move line."
--
+-
I run scheduler.
-
!python {model: procurement.order}: |
@@ -223,7 +223,7 @@
order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
for move in order.move_lines:
move.action_consume(move.product_qty)
- if move.product_id.id == ref("product.product_product_metalcleats0"):
+ if move.product_id.id == ref("product.product_product_metalcleats0"):
move.action_scrap(5.0, scrap_location_id)
-
I produce product.
@@ -242,8 +242,8 @@
!python {model: mrp.production}: |
order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
assert order.state == 'done', "Production order should be closed."
--
- I check Total Costs at End of Production.
+-
+ I check Total Costs at End of Production.
-
!python {model: mrp.production}: |
order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
@@ -275,7 +275,7 @@
assert line.journal_id.id == wc.costs_journal_id.id, "Account Journal is not correspond."
assert line.product_id.id == wc.product_id.id, "Product is not correspond."
assert line.product_uom_id.id == wc.product_id.uom_id.id, "UOM is not correspond."
-
+
-
I print a "BOM Structure".
-
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index c40b9611fb5..00b4947122e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -261,17 +261,17 @@
id="menu_mrp_production_wc_order"
action="mrp_production_wc_action_form"
groups="base.group_extended" sequence="2"/>
-
-
+ groups="base.group_extended"/>-->
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 2edaba9431a..4a0085e3db9 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -70,12 +70,12 @@ class mrp_repair(osv.osv):
for line in repair.operations:
#manage prices with tax included use compute_all instead of compute
if line.to_invoice:
- tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)
+ tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, line.product_id, repair.partner_id)
for c in tax_calculate['taxes']:
val += c['amount']
for line in repair.fees_lines:
if line.to_invoice:
- tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)
+ tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, line.product_id, repair.partner_id)
for c in tax_calculate['taxes']:
val += c['amount']
res[repair.id] = cur_obj.round(cr, uid, cur, val)
@@ -117,8 +117,8 @@ class mrp_repair(osv.osv):
'name': fields.char('Repair Reference',size=24, required=True),
'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
- 'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
- 'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner.address"),
+ 'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]"),
+ 'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"),
'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
'state': fields.selection([
('draft','Quotation'),
@@ -142,7 +142,7 @@ class mrp_repair(osv.osv):
'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'),
- 'partner_invoice_id':fields.many2one('res.partner.address', 'Invoicing Address', domain="[('partner_id','=',partner_id)]"),
+ 'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'),
'invoice_method':fields.selection([
("none","No Invoice"),
("b4repair","Before Repair"),
@@ -229,12 +229,12 @@ class mrp_repair(osv.osv):
data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
data['value']['location_id'] = move.location_dest_id.id
data['value']['location_dest_id'] = move.location_dest_id.id
- if move.address_id:
- data['value']['partner_id'] = move.address_id.partner_id and move.address_id.partner_id.id
+ if move.partner_id:
+ data['value']['partner_id'] = move.partner_id and move.partner_id.id
else:
data['value']['partner_id'] = False
- data['value']['address_id'] = move.address_id and move.address_id.id
- d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['address_id'])
+ data['value']['partner_id'] = move.partner_id and move.partner_id.id
+ d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['partner_id'])
data['value'].update(d['value'])
return data
@@ -261,7 +261,7 @@ class mrp_repair(osv.osv):
partner = part_obj.browse(cr, uid, part)
pricelist = partner.property_product_pricelist and partner.property_product_pricelist.id or False
return {'value': {
- 'address_id': address_id or addr['delivery'],
+ 'address_id': addr['delivery'] or addr['default'],
'partner_invoice_id': addr['invoice'],
'pricelist_id': pricelist
}
@@ -389,7 +389,6 @@ class mrp_repair(osv.osv):
'type': 'out_invoice',
'account_id': account_id,
'partner_id': repair.partner_id.id,
- 'address_invoice_id': repair.address_id.id,
'currency_id': repair.pricelist_id.currency_id.id,
'comment': repair.quotation_notes,
'fiscal_position': repair.partner_id.property_account_position.id
@@ -516,7 +515,7 @@ class mrp_repair(osv.osv):
'product_id': move.product_id.id,
'product_qty': move.product_uom_qty,
'product_uom': move.product_uom.id,
- 'address_id': repair.address_id and repair.address_id.id or False,
+ 'partner_id': repair.address_id and repair.address_id.id or False,
'location_id': move.location_id.id,
'location_dest_id': move.location_dest_id.id,
'tracking_id': False,
@@ -531,7 +530,7 @@ class mrp_repair(osv.osv):
'origin': repair.name,
'state': 'draft',
'move_type': 'one',
- 'address_id': repair.address_id and repair.address_id.id or False,
+ 'partner_id': repair.address_id and repair.address_id.id or False,
'note': repair.internal_notes,
'invoice_state': 'none',
'type': 'out',
@@ -543,7 +542,7 @@ class mrp_repair(osv.osv):
'product_qty': move.product_uom_qty or 1.0,
'product_uom': repair.product_id.uom_id.id,
'prodlot_id': repair.prodlot_id and repair.prodlot_id.id or False,
- 'address_id': repair.address_id and repair.address_id.id or False,
+ 'partner_id': repair.address_id and repair.address_id.id or False,
'location_id': repair.location_id.id,
'location_dest_id': repair.location_dest_id.id,
'tracking_id': False,
@@ -684,7 +683,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
location_id = location_id and location_id[0] or False
if type == 'add':
- # TOCHECK: Find stock location for user's company warehouse or
+ # TOCHECK: Find stock location for user's company warehouse or
# repair order's company's warehouse (company_id field is added in fix of lp:831583)
args = company_id and [('company_id', '=', company_id)] or []
warehouse_ids = warehouse_obj.search(cr, uid, args, context=context)
diff --git a/addons/pad_project/i18n/fi.po b/addons/pad_project/i18n/fi.po
new file mode 100644
index 00000000000..941bb5239e4
--- /dev/null
+++ b/addons/pad_project/i18n/fi.po
@@ -0,0 +1,39 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-03-30 10:23+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-31 05:08+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Tehtävä"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 37b924f319f..a267dc24e8f 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -66,8 +66,8 @@
{'menu':True}
-
-
+
+
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 3b4107c8358..f7971f1f981 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -61,8 +61,8 @@
automatic
-
-
+
+
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 4a88ce3cc16..5af78b131b2 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -50,7 +50,7 @@ class pos_order(osv.osv):
_name = "pos.order"
_description = "Point of Sale"
_order = "id desc"
-
+
def create_from_ui(self, cr, uid, orders, context=None):
#_logger.info("orders: %r", orders)
list = []
@@ -205,7 +205,7 @@ class pos_order(osv.osv):
addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
picking_id = picking_obj.create(cr, uid, {
'origin': order.name,
- 'address_id': addr.get('delivery',False),
+ 'partner_id': addr.get('delivery',False),
'type': 'out',
'company_id': order.company_id.id,
'move_type': 'direct',
@@ -414,7 +414,7 @@ class pos_order(osv.osv):
wf_service.trg_validate(uid, 'pos.order', order.id, 'invoice', cr)
if not inv_ids: return {}
-
+
mod_obj = self.pool.get('ir.model.data')
res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
res_id = res and res[1] or False
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 1e4b2ec7c35..8d5fdc67d63 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -31,9 +31,7 @@
SAJ/2010/010
none
open
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5461bf690bd..adb05fec578 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -748,7 +748,7 @@
-
+
@@ -770,8 +770,10 @@
[('origin','like','POS')]
+
+
+ id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" />
Start Point of Sale
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 721f4bc86e2..93604e755e0 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -42,7 +42,7 @@ class order(report_sxw.rml_parse):
'disc': self.discount,
'net': self.netamount,
'get_journal_amt': self._get_journal_amt,
- 'address': partner.address and partner.address[0] or False,
+ 'address': partner or False,
'titlize': titlize
})
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 11bc8b33558..31e35d3fa10 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -52,9 +52,9 @@ class pos_open_statement(osv.osv_memory):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
if journal.sequence_id:
- number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id)
+ number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id, context=context)
else:
- number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement')
+ number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement', context=context)
data.update({
'journal_id': journal.id,
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 30b16a717d4..0e5d4e1fbb5 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
Add Portal Access
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 518a8900072..6ce26ecb98c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -273,7 +273,7 @@
-
+
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 3ddfe1e6900..3b8eeb750cf 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -4,7 +4,7 @@
-
+
product.pricelist.version.form
@@ -180,7 +180,7 @@
+ parent="base.menu_base_config" sequence="20"/>
product.price.type.form
@@ -195,7 +195,7 @@
-
+
Price Types
ir.actions.act_window
@@ -206,7 +206,7 @@
+ parent="product.menu_product_pricelist_main" sequence="4" groups="base.group_no_one"/>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 83da24292ae..d12b62dbf18 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -214,8 +214,8 @@
With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability.
-
+
@@ -292,14 +292,11 @@
-
-
+
+ parent="project.menu_project_dashboard"/>
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index dd01832b575..924a1cbf5cc 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -98,7 +98,7 @@
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7dc2cc1d4f0..7fb84f12213 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -4,7 +4,7 @@
+ parent="base.menu_main_pm" sequence="7"/>
@@ -178,7 +178,7 @@
Product Backlogs
project.scrum.product.backlog
form
- {'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id}
+ {'search_default_user_id':uid,'search_default_project_id':project_id}
The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project.
@@ -349,7 +349,7 @@
form
tree,form,calendar
{"search_default_current": 1}
+ {}
The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner.
@@ -450,7 +450,7 @@
project.scrum.meeting
form
tree,form,calendar
- {'search_default_scrum_daily':1,'search_default_project_id':project_id}
+ {'search_default_project_id':project_id}
The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face.
diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml
index 59a25c142b5..ed87cb8c65f 100644
--- a/addons/project_timesheet/project_timesheet_data.xml
+++ b/addons/project_timesheet/project_timesheet_data.xml
@@ -1,8 +1,8 @@
-
-
+
+
+
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 07873c00592..0412bdabb38 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -84,7 +84,7 @@
form
tree,form
[]
- {'search_default_to_invoice': 1}
+ {}
You will find here all works made on tasks that you can invoice.
In order to invoice the time spent on a project, you must define the
@@ -101,18 +101,18 @@ the project form.
parent="base.menu_main_pm" sequence="5"/>
-
+
-
+
Customer Projects
account.analytic.account
form
tree,form,graph
- {'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}
+ {}
[('type','=','normal')]
You will find here the contracts related to your customer projects in order to track the invoicing progress.
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index e24f604fbe6..b1ba9b8672e 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -3,8 +3,8 @@
@@ -43,7 +43,7 @@
-
+
report.timesheet.task.user.graph
report.timesheet.task.user
@@ -71,7 +71,7 @@
-
+
Task Hours Per Month
report.timesheet.task.user
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 0bf011e5cc5..4c9e776b96b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -4,8 +4,8 @@
+ name="Purchase"
+ parent="base.menu_reporting_dashboard" sequence="5"/>
Request for Quotations
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index b8359f3bf7f..787974646ff 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -65,7 +65,7 @@ class purchase_order(osv.osv, EDIMixin):
"""Exports a purchase order"""
edi_struct = dict(edi_struct or PURCHASE_ORDER_EDI_STRUCT)
res_company = self.pool.get('res.company')
- res_partner_address = self.pool.get('res.partner.address')
+ res_partner_obj = self.pool.get('res.partner')
edi_doc_list = []
for order in records:
# generate the main report
@@ -79,7 +79,7 @@ class purchase_order(osv.osv, EDIMixin):
'__import_module': 'sale',
'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
- 'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_address_id], context=context)[0],
+ 'partner_address': res_partner_obj.edi_export(cr, uid, [order.partner_id], context=context)[0],
'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
context=context)[0],
})
@@ -95,29 +95,22 @@ class purchase_order(osv.osv, EDIMixin):
# the desired company among the user's allowed companies
self._edi_requires_attributes(('company_id','company_address'), edi_document)
- res_partner_address = self.pool.get('res.partner.address')
- res_partner = self.pool.get('res.partner')
-
- # imported company = as a new partner
- src_company_id, src_company_name = edi_document.pop('company_id')
- partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
- src_company_id, context=context)
- partner_value = {'customer': True}
- res_partner.write(cr, uid, [partner_id], partner_value, context=context)
+ res_partner_obj = self.pool.get('res.partner')
# imported company_address = new partner address
+ src_company_id, src_company_name = edi_document.pop('company_id')
address_info = edi_document.pop('company_address')
- address_info['partner_id'] = (src_company_id, src_company_name)
- address_info['type'] = 'default'
- address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+ address_info['customer'] = True
+ if 'name' not in address_info:
+ address_info['name'] = src_company_name
+ address_id = res_partner_obj.edi_import(cr, uid, address_info, context=context)
# modify edi_document to refer to new partner/address
- partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
- edi_document['partner_id'] = (src_company_id, src_company_name)
+ partner_address = res_partner_obj.browse(cr, uid, address_id, context=context)
edi_document.pop('partner_address', False) # ignored
- edi_document['partner_address_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
+ edi_document['partner_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
- return partner_id
+ return address_id
def _edi_get_pricelist(self, cr, uid, partner_id, currency, context=None):
# TODO: refactor into common place for purchase/sale, e.g. into product module
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index f3f610b8e75..c4a7f75819a 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -21,8 +21,6 @@
-
-
-
- Addresses
- ir.actions.act_window
- res.partner.address
- form
- {"search_default_supplier":1}
- Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc.
-
-
- tree
-
-
- form
-
+ parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
-
-
+
-
+
purchase.order.tree
purchase.order
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index ffea456d77f..6c3250c59c6 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -166,8 +166,8 @@
Shipping address :
- [[ (o.dest_address_id and o.dest_address_id.partner_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]
- [[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and displaye_address(o.warehouse_id.partner_address_id)) or '']]
+ [[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]
+ [[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_id)) or '']]
@@ -182,13 +182,13 @@
[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ o.partner_address_id and display_address(o.partner_address_id) ]]
+ [[ o.partner_id and display_address(o.partner_id) ]]
- Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]
- Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]
- TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]
+ Tél. : [[ (o.partner_id.phone) or removeParentNode('para') ]]
+ Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]
+ TVA : [[ (o.partner_id.vat) or removeParentNode('para') ]]
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index e3a4a651b7f..99692907591 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -46,8 +46,6 @@ class purchase_report(osv.osv):
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
- 'partner_address_id':fields.many2one('res.partner.address', 'Address Contact Name', readonly=True),
- 'dest_address_id':fields.many2one('res.partner.address', 'Dest. Address Contact Name',readonly=True),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
'date_approve':fields.date('Date Approved', readonly=True),
'expected_date':fields.date('Expected Date', readonly=True),
@@ -82,7 +80,6 @@ class purchase_report(osv.osv):
s.state,
s.date_approve,
date_trunc('day',s.minimum_planned_date) as expected_date,
- s.partner_address_id,
s.dest_address_id,
s.pricelist_id,
s.validator,
@@ -122,7 +119,6 @@ class purchase_report(osv.osv):
l.date_planned,
l.product_uom,
date_trunc('day',s.minimum_planned_date),
- s.partner_address_id,
s.pricelist_id,
s.validator,
s.dest_address_id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 095f17090da..0ac69172612 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -172,7 +172,7 @@
-
@@ -185,7 +185,7 @@
{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}
Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.
-
+
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index e75d062542c..2372ab4d8e4 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -91,7 +91,7 @@
Expected Delivery address:
- [[ (order.dest_address_id and order.dest_address_id.partner_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]
+ [[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]
[[ order.dest_address_id and display_address(order.dest_address_id) ]]
@@ -100,14 +100,14 @@
- [[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]
- [[ order.partner_address_id and display_address(order.partner_address_id) ]]
+ [[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]
+ [[ display_address(order.partner_id) ]]
- Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]
- Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]
- TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]
+ Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]
+ Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]
+ TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 0ea49a9900b..b19a62bf5d1 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -30,7 +30,6 @@ access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_a
access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0
access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1
access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0
-access_res_partner_address_purchase_user,res.partner.address purchase,base.model_res_partner_address,group_purchase_user,1,0,0,0
access_account_journal_period,account.journal.period,account.model_account_journal_period,group_purchase_user,1,1,1,0
access_account_journal,account.journal,account.model_account_journal,group_purchase_user,1,0,0,0
access_account_journal_manager,account.journal,account.model_account_journal,group_purchase_manager,1,0,0,0
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 34579d2a7d9..35193dfa07b 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -58,8 +58,6 @@ class stock_picking(osv.osv):
"""
invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
if picking.purchase_id:
- invoice_vals['address_contact_id'], invoice_vals['address_invoice_id'] = \
- self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['contact', 'invoice']).values()
invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id
return invoice_vals
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 7afcc96767f..06d67eed281 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -78,15 +78,12 @@
domain="[('invoice_state', '=', '2binvoiced')]"/>
- , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-03-29 11:26+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-30 04:34+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index c43bd524090..43cfe2de069 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -128,7 +128,6 @@ class purchase_requisition(osv.osv):
res_partner = self.pool.get('res.partner')
fiscal_position = self.pool.get('account.fiscal.position')
supplier = res_partner.browse(cr, uid, partner_id, context=context)
- delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
supplier_pricelist = supplier.property_product_pricelist_purchase or False
res = {}
for requisition in self.browse(cr, uid, ids, context=context):
@@ -138,7 +137,6 @@ class purchase_requisition(osv.osv):
purchase_id = purchase_order.create(cr, uid, {
'origin': requisition.name,
'partner_id': supplier.id,
- 'partner_address_id': delivery_address_id,
'pricelist_id': supplier_pricelist.id,
'location_id': location_id,
'company_id': requisition.company_id.id,
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 9ef7bc40d97..41491cc64ca 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -32,7 +32,6 @@
purchase.requisition
form
tree,form
- {"search_default_create_uid":uid,'search_default_draft': 1}
+ {"search_default_create_uid":uid}
A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.
diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index 56e4c1ae0af..f33f25536af 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -223,7 +223,7 @@
- [[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.partner_id and purchase_ids.partner_address_id.partner_id.name) or '' ]]
+ [[ (purchase_ids.partner_id and purchase_ids.partner_id.name) or '' ]]
[[ formatLang(purchase_ids.date_order,date='True') ]]
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 043ed749f4b..a6b806471ef 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -29,7 +29,6 @@ class purchase_requisition_partner(osv.osv_memory):
_description = "Purchase Requisition Partner"
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
- 'partner_address_id':fields.many2one('res.partner.address', 'Address'),
}
def view_init(self, cr, uid, fields_list, context=None):
@@ -42,13 +41,6 @@ class purchase_requisition_partner(osv.osv_memory):
raise osv.except_osv(_('Error!'), _('No Product in Tender'))
return res
- def onchange_partner_id(self, cr, uid, ids, partner_id):
- if not partner_id:
- return {}
- addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['default'])
- part = self.pool.get('res.partner').browse(cr, uid, partner_id)
- return {'value':{'partner_address_id': addr['default']}}
-
def create_order(self, cr, uid, ids, context=None):
active_ids = context and context.get('active_ids', [])
data = self.browse(cr, uid, ids, context=context)[0]
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index d994ba71405..4656d3c37c6 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -8,8 +8,7 @@
- [[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ o.address_invoice_id and display_address(o.address_invoice_id) ]]
+ [[ (o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
+ [[ o.partner_id and display_address(o.partner_id) ]]
- Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]
- Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]
- VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]
+ Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]
+ Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]
+ VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]
@@ -184,7 +184,7 @@
[[ formatLang(o.date_invoice,date=True) ]]
- [[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]
+ [[ (o.partner_id.ref) or ' ' ]]
@@ -398,4 +398,4 @@
-
\ No newline at end of file
+
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index ffe90b54d4f..5a0c31bbdcc 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -112,10 +112,9 @@ class report_intrastat(osv.osv):
left join product_uom uom on uom.id=inv_line.uos_id
left join product_uom puom on puom.id = pt.uom_id
left join report_intrastat_code intrastat on pt.intrastat_id = intrastat.id
- left join (res_partner_address inv_address
+ left join (res_partner inv_address
left join res_country inv_country on (inv_country.id = inv_address.country_id))
- on (inv_address.id = inv.address_invoice_id)
-
+ on (inv_address.id = inv.partner_id)
where
inv.state in ('open','paid')
and inv_line.product_id is not null
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index b14b94ef315..2527f2e4f97 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -68,7 +68,7 @@
+ parent="base.menu_config_address_book" sequence="2" groups="base.group_no_one"/>
diff --git a/addons/report_intrastat/test/report_intrastat_report.yml b/addons/report_intrastat/test/report_intrastat_report.yml
index 2c85007e70c..e049c0ffcb8 100644
--- a/addons/report_intrastat/test/report_intrastat_report.yml
+++ b/addons/report_intrastat/test/report_intrastat_report.yml
@@ -4,13 +4,11 @@
!record {model: account.invoice, id: test_invoice_1}:
currency_id: base.EUR
company_id: base.main_company
- address_invoice_id: base.res_partner_address_tang
partner_id: base.res_partner_asus
state: draft
type: out_invoice
account_id: account.a_recv
name: Test invoice 1
- address_contact_id: base.res_partner_address_tang
-
In order to test the PDF reports defined using report_intrastat module, we print a Intrastat Report
-
diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data.xml
index 6cc254b1451..fb58c9fb1ac 100644
--- a/addons/report_webkit/data.xml
+++ b/addons/report_webkit/data.xml
@@ -67,15 +67,15 @@
- ${company.partner_id.address and company.partner_id.address[0].street or ''|entity}
+ ${company.partner_id.street or ''|entity}
- Phone: ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity}
+ Phone: ${company.partner_id.phone or ''|entity}
- Mail: ${company.partner_id.address and company.partner_id.address[0].email or ''|entity}
+ Mail: ${company.partner_id.email or ''|entity}
+
@@ -43,32 +39,31 @@
- Followers
+
+
-
-
+
+
-
- You have loaded all messages in this thread.
+
![]()
+
-
@@ -76,9 +71,13 @@