[MERGE] forward port of branch saas-2 up to revid 9109 [email protected]

bzr revid: [email protected]

Author: KangOl

addons/account/account.py

@@ -3187,11 +3187,14 @@ def _prepare_all_journals(self, cr, uid, chart_template_id, acc_template_ref, co
         def _get_analytic_journal(journal_type):
             # Get the analytic journal
             data = False
-            if journal_type in ('sale', 'sale_refund'):
-                data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale')
-            elif journal_type in ('purchase', 'purchase_refund'):
-                pass
-            elif journal_type == 'general':
+            try:
+                if journal_type in ('sale', 'sale_refund'):
+                    data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale')
+                elif journal_type in ('purchase', 'purchase_refund'):
+                    data = obj_data.get_object_reference(cr, uid, 'account', 'exp')
+                elif journal_type == 'general':
+                    pass
+            except ValueError:
                 pass
             return data and data[1] or False
 

addons/account/wizard/account_reconcile.py

@@ -23,6 +23,7 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from openerp.tools.float_utils import float_round
 import openerp.addons.decimal_precision as dp
 
 class account_move_line_reconcile(osv.osv_memory):
@@ -64,7 +65,11 @@ def trans_rec_get(self, cr, uid, ids, context=None):
                 credit += line.credit
                 debit += line.debit
                 account_id = line.account_id.id
-        return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': debit - credit}
+        precision = self.pool['decimal.precision'].precision_get(cr, uid, 'Account')
+        writeoff = float_round(debit-credit, precision_digits=precision)
+        credit = float_round(credit, precision_digits=precision)
+        debit = float_round(debit, precision_digits=precision)
+        return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': writeoff}
 
     def trans_rec_addendum_writeoff(self, cr, uid, ids, context=None):
         return self.pool.get('account.move.line.reconcile.writeoff').trans_rec_addendum(cr, uid, ids, context)

addons/account/wizard/account_reconcile_view.xml

@@ -17,8 +17,8 @@
                     </group>
                     <footer>
                         <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
-                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','=',0)]}" class="oe_highlight"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','=',0)]}" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>

addons/account_analytic_analysis/account_analytic_analysis_view.xml

@@ -219,7 +219,7 @@
                     <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>
                     <filter name="pending" string="To Renew" domain="[('state','=','pending')]" help="Pending contracts"/>
                     <filter name="closed" string="Closed" domain="[('state','=','close')]" help="Closed contracts"/>
-                    <filter name="cancelled" string="Cancelled" domain="[('state','=','cancel')]" help="Cancelled contracts"/>
+                    <filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]" help="Cancelled contracts"/>
                     <separator/>
                     <filter
                         string="Expired or consumed"

addons/account_asset/account_asset.py

@@ -35,9 +35,9 @@ class account_asset_category(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=1),
         'note': fields.text('Note'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
-        'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
-        'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
-        'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),
+        'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True, domain=[('type','=','other')]),
+        'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True, domain=[('type','=','other')]),
+        'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True, domain=[('type','=','other')]),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, help="Choose the method to use to compute the amount of depreciation lines.\n"\

addons/account_followup/report/account_followup_print.rml

@@ -149,7 +149,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9_followup_id">[[ format(get_text(o,data['form']['followup_id'])) ]]</para>
+    <pre style="terp_default_9_followup_id">[[ format(get_text(o,data['form']['followup_id'])) ]]</pre>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>

addons/auth_ldap/users_ldap.py

@@ -99,6 +99,9 @@ def authenticate(self, conf, login, password):
         filter = filter_format(conf['ldap_filter'], (login,))
         try:
             results = self.query(conf, filter)
+
+            # Get rid of (None, attrs) for searchResultReference replies
+            results = [i for i in results if i[0]]
             if results and len(results) == 1:
                 dn = results[0][0]
                 conn = self.connect(conf)

addons/calendar/calendar.py

@@ -1330,13 +1330,13 @@ def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, cou
                 new_id = get_real_ids(arg[2])
                 new_arg = (arg[0], arg[1], new_id)
             new_args.append(new_arg)
-        #offset, limit and count must be treated separately as we may need to deal with virtual ids
 
-        if context.get('virtual_id', True):
-            res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
-            res = self.get_recurrent_ids(cr, uid, res, args, order=order, context=context)
-        else:
-            res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=order, context=context, count=False)
+        if not context.get('virtual_id', True):
+            return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
+
+        # offset, limit, order and count must be treated separately as we may need to deal with virtual ids
+        res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
+        res = self.get_recurrent_ids(cr, uid, res, args, order=order, context=context)
         if count:
             return len(res)
         elif limit:

addons/decimal_precision/decimal_precision.py

@@ -50,9 +50,9 @@ def clear_cache(self, cr):
         self.precision_get.clear_cache(self)
         for obj in self.pool.obj_list():
             for colname, col in self.pool.get(obj)._columns.items():
-                if isinstance(col, (fields.float, fields.function)):
+                if hasattr(col, 'digits_change'):
                     col.digits_change(cr)
-        RegistryManager.signal_registry_change(cr.dbname)
+        RegistryManager.signal_caches_change(cr.dbname)
 
     def create(self, cr, uid, data, context=None):
         res = super(decimal_precision, self).create(cr, uid, data, context=context)

addons/document_ftp/ftpserver/abstracted_fs.py

@@ -262,6 +262,7 @@ def get_crdata(self, line, mode='file'):
         if path == '/' and mode in ('list', 'cwd'):
             return (None, None, None )
 
+        if path == '..': path = self.cwd + '/..'
         path = _to_unicode(os.path.normpath(path)) # again, for '/db/../ss'
         if path == '.': path = ''
 

addons/email_template/email_template.py

@@ -417,8 +417,8 @@ def send_mail(self, cr, uid, template_id, res_id, force_send=False, raise_except
 
         # create a mail_mail based on values, without attachments
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
-        assert values.get('email_from'), 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
-
+        if not values.get('email_from'):
+            raise osv.except_osv(_('Warning!'),_("Sender email is missing or empty after template rendering. Specify one to deliver your message"))
         # process partner_to field that is a comma separated list of partner_ids -> recipient_ids
         # NOTE: only usable if force_send is True, because otherwise the value is
         # not stored on the mail_mail, and therefore lost -> fixed in v8

addons/im/im.py

@@ -185,8 +185,8 @@ def get_messages(self, cr, uid, last=None, users_watch=None, uuid=None, context=
     def post(self, cr, uid, message, to_session_id, technical=False, uuid=None, context=None):
         assert_uuid(uuid)
         my_id = self.pool.get('im.user').get_my_id(cr, uid, uuid)
-        session = self.pool.get('im.session').browse(cr, uid, to_session_id, context)
-        to_ids = [x.id for x in session.user_ids if x.id != my_id]
+        session_user_ids = self.pool.get('im.session').get_session_users(cr, uid, to_session_id, context=context).get("user_ids", [])
+        to_ids = [user_id for user_id in session_user_ids if user_id != my_id]
         self.create(cr, openerp.SUPERUSER_ID, {"message": message, 'from_id': my_id,
             'to_id': [(6, 0, to_ids)], 'session_id': to_session_id, 'technical': technical}, context=context)
         notify_channel(cr, "im_channel", {'type': 'message', 'receivers': [my_id] + to_ids})
@@ -202,7 +202,7 @@ def _calc_name(self, cr, uid, ids, something, something_else, context=None):
         return res
 
     _columns = {
-        'user_ids': fields.many2many('im.user'),
+        'user_ids': fields.many2many('im.user', 'im_session_im_user_rel', 'im_session_id', 'im_user_id', 'Users'),
         "name": fields.function(_calc_name, string="Name", type='char'),
     }
 
@@ -225,6 +225,9 @@ def session_get(self, cr, uid, users_to, uuid=None, context=None):
             }, context=context)
         return self.read(cr, uid, session_id, context=context)
 
+    def get_session_users(self, cr, uid, session_id, context=None):
+        return self.read(cr, openerp.SUPERUSER_ID, session_id, ['user_ids'], context=context)
+
     def add_to_session(self, cr, uid, session_id, user_id, uuid=None, context=None):
         my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context)
         session = self.read(cr, uid, session_id, context=context)
@@ -259,7 +262,7 @@ def _status_search(self, cr, uid, obj, name, domain, context=None):
             return ['&', ('im_last_status', '=', True), ('im_last_status_update', '>', (current - delta).strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
         else:
             return ['|', ('im_last_status', '=', False), ('im_last_status_update', '<=', (current - delta).strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
-
+    # TODO: Remove fields arg in trunk. Also in im.js.
     def search_users(self, cr, uid, text_search, fields, limit, context=None):
         my_id = self.get_my_id(cr, uid, None, context)
         group_employee = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')[1]
@@ -271,7 +274,7 @@ def search_users(self, cr, uid, text_search, fields, limit, context=None):
         if len(found) < limit:
             found += self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False], ["im_status", "=", False], ["id", "not in", found]],
                 order="name asc", limit=limit-len(found), context=context)
-        users = self.read(cr, uid, found, fields, context=context)
+        users = self.read(cr,openerp.SUPERUSER_ID, found, ["name", "user_id", "uuid", "im_status"], context=context)
         users.sort(key=lambda obj: found.index(obj['id']))
         return users
 
@@ -319,6 +322,9 @@ def _get_name(self, cr, uid, ids, name, arg, context=None):
                 continue
         return res
 
+    def get_users(self, cr, uid, ids, context=None):
+        return self.read(cr,openerp.SUPERUSER_ID, ids, ["name", "im_status", "uuid"], context=context)
+
     _columns = {
         'name': fields.function(_get_name, type='char', size=200, string="Name", store=True, readonly=True),
         'assigned_name': fields.char(string="Assigned Name", size=200, required=False),
@@ -341,3 +347,16 @@ def _get_name(self, cr, uid, ids, name, arg, context=None):
         ('user_uniq', 'unique (user_id)', 'Only one chat user per OpenERP user.'),
         ('uuid_uniq', 'unique (uuid)', 'Chat identifier already used.'),
     ]
+
+class res_users(osv.osv):
+    _inherit = "res.users"
+
+    def _get_im_user(self, cr, uid, ids, field_name, arg, context=None):
+        result = dict.fromkeys(ids, False)
+        for index, im_user in enumerate(self.pool['im.user'].search_read(cr, uid, domain=[('user_id', 'in', ids)], fields=['name', 'user_id'], context=context)):
+            result[ids[index]] = im_user.get('user_id') and (im_user['user_id'][0], im_user['name']) or False
+        return result
+
+    _columns = {
+        'im_user_id' : fields.function(_get_im_user, type='many2one', string="IM User", relation="im.user"),
+    }

addons/im/security/im_security.xml

@@ -2,10 +2,10 @@
 <openerp>
     <data>
         <record id="message_rule_1" model="ir.rule">
-            <field name="name">Can only read messages that you sent or messages sent to you</field>
+            <field name="name">Can only read messages from a session where user is</field>
             <field name="model_id" ref="model_im_message"/>
             <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
-            <field name="domain_force">["|", ('to_id.user_id', 'in', [user.id]), ('from_id.user_id', '=', user.id)]</field>
+            <field name="domain_force">[('session_id.user_ids', 'in', user.im_user_id.id)]</field>
             <field name="perm_read" eval="1"/>
             <field name="perm_write" eval="0"/>
             <field name="perm_create" eval="0"/>

addons/im/security/ir.model.access.csv

@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_im_message,im.message,model_im_message,base.group_user,1,0,1,0
+access_im_message,im.message,model_im_message,,1,0,1,0
 access_im_user,im.user,model_im_user,,1,1,1,0
 access_im_session,im.session,model_im_session,,1,0,0,0

addons/im/static/src/js/im.js

@@ -92,6 +92,7 @@
         search_changed: function(e) {
             var users = new instance.web.Model("im.user");
             var self = this;
+            // TODO: Remove fields arg in trunk. Also in im.js.
             return this.user_search_dm.add(users.call("search_users", [this.get("current_search"), ["name", "user_id", "uuid", "im_status"],
                     USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(users) {
                 var logged_users = _.filter(users, function(u) { return !!u.im_status; });

addons/im/static/src/js/im_common.js

@@ -145,7 +145,7 @@ function declare($, _, openerp) {
             if (_.size(no_cache) === 0)
                 def = $.when();
             else
-                def = im_common.connection.model("im.user").call("read", [_.values(no_cache), []]).then(function(users) {
+                def = im_common.connection.model("im.user").call("get_users", [_.values(no_cache)]).then(function(users) {
                     self.add_to_user_cache(users);
                 });
             return def.then(function() {
@@ -230,7 +230,8 @@ function declare($, _, openerp) {
                 return self.chat_with_users(users);
             });
         },
-        activate_session: function(session_id, focus) {
+        activate_session: function(session_id, focus, message) {
+            var self = this;
             var conv = _.find(this.conversations, function(conv) {return conv.session_id == session_id;});
             var def = $.when();
             if (! conv) {
@@ -244,6 +245,9 @@ function declare($, _, openerp) {
                     this.calc_positions();
                     this.trigger("new_conversation", conv);
                 }, this));
+                def = def.then(function(){
+                    return self.load_history(conv, message);
+                });
             }
             if (focus) {
                 def = def.then(function() {
@@ -252,13 +256,32 @@ function declare($, _, openerp) {
             }
             return def.then(function() {return conv});
         },
-        received_messages: function(messages) {
+        load_history: function(conv, message){
+            var self = this;
+            var domain = [["session_id", "=", conv.session_id]];
+            if (!_.isUndefined(message)){
+                domain.push(["date", "<", message.date]);
+            }
+            return im_common.connection.model("im.message").call("search_read", [domain, [], 0, 10]).then(function(messages){
+                messages.reverse();
+                var users = _.unique(_.map(messages, function(message){
+                    return message.from_id[0];
+                }));
+                return self.ensure_users(users).then(function(){
+                    return self.received_messages(messages, true);
+                });
+            });
+        },
+        received_messages: function(messages, seen) {
             var self = this;
             var defs = [];
             var received = false;
+            if (_.isUndefined(seen)){
+                seen = false;
+            }
             _.each(messages, function(message) {
                 if (! message.technical) {
-                    defs.push(self.activate_session(message.session_id[0]).then(function(conv) {
+                    defs.push(self.activate_session(message.session_id[0], false, message).then(function(conv) {
                         received = self.my_id !== message.from_id[0];
                         return conv.received_message(message);
                     }));
@@ -269,7 +292,7 @@ function declare($, _, openerp) {
                 }
             });
             return $.when.apply($, defs).then(function(){
-                if (! self.get("window_focus") && received) {
+                if (! self.get("window_focus") && received && !seen) {
                     self.set("waiting_messages", self.get("waiting_messages") + messages.length);
                     self.ting.play();
                     self.create_ting();
@@ -368,7 +391,7 @@ function declare($, _, openerp) {
         refresh_users: function() {
             var self = this;
             var user_ids;
-            return im_common.connection.model("im.session").call("read", [self.session_id]).then(function(session) {
+            return im_common.connection.model("im.session").call("get_session_users", [self.session_id]).then(function(session) {
                 user_ids = _.without(session.user_ids, self.c_manager.me.get("id"));
                 return self.c_manager.ensure_users(user_ids);
             }).then(function(users) {
@@ -449,7 +472,7 @@ function declare($, _, openerp) {
             date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
             var to_show = _.map(items, im_common.escape_keep_url);
             this.last_bubble = $(openerp.qweb.render("im_common.conversation_bubble", {"items": to_show, "user": user, "time": date}));
-            $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
+            $(this.$(".oe_im_chatview_conversation")).append(this.last_bubble);
             this._go_bottom();
         },
         _go_bottom: function() {