From 0d168ae647fb2a1364af26ae468bf82e35dfa7de Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Wed, 12 Dec 2012 18:42:32 +0100
Subject: [PATCH 01/11] [FIX] Wrong pywebdav lib import

bzr revid: dle@openerp.com-20121212174232-5pnme7whe9yskrj7
---
 addons/document_webdav/__init__.py      | 10 +++-------
 addons/document_webdav/dav_fs.py        | 14 ++++++++++----
 addons/document_webdav/webdav.py        | 15 +++++++++++----
 addons/document_webdav/webdav_server.py | 14 ++++++++++----
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index 11bbd35f7c3..3dc4c104c80 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -20,13 +20,9 @@
 ##############################################################################
 import logging
 
-_logger = logging.getLogger(__name__)
+import webdav
+import webdav_server
+import document_webdav
 
-try:
-    import webdav
-    import webdav_server
-    import document_webdav
-except ImportError:
-    _logger.info('document_webdav disabled please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 1b826434f74..0a9df3d50d4 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -27,13 +27,19 @@ import errno
 
 import netsvc
 import urlparse
+try:
+    from pywebdav.lib.constants import COLLECTION  # , OBJECT
+    from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from pywebdav.lib.iface import dav_interface
+    from pywebdav.lib.davcmd import copyone, copytree, moveone, movetree, delone, deltree
+except ImportError:
+    from DAV.constants import COLLECTION  #, OBJECT
+    from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from DAV.iface import dav_interface
+    from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 
-from DAV.constants import COLLECTION  #, OBJECT
-from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-from DAV.iface import dav_interface
 import urllib
 
-from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 from cache import memoize
 from tools import misc
 
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index bf8b843a0a0..f7780883bda 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -20,6 +20,9 @@
 #
 ##############################################################################
 
+import logging
+
+_logger = logging.getLogger(__name__)
 import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
 from xml.dom.minicompat import StringTypes
@@ -29,10 +32,14 @@ import urllib
 from osv import osv
 from tools.translate import _
 
-from DAV import utils
-from DAV.propfind import PROPFIND
-from DAV.report import REPORT
-
+try:
+    from pywebdav.lib import utils
+    from pywebdav.lib.propfind import PROPFIND
+    from pywebdav.lib.report import REPORT
+except ImportError:
+    from DAV import utils
+    from DAV.propfind import PROPFIND
+    from DAV.report import REPORT
 
 import tools
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 70ad4d2657f..1dbad3510ca 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -38,7 +38,16 @@ import logging
 import netsvc
 from dav_fs import openerp_dav_handler
 from tools.config import config
-from DAV.WebDAVServer import DAVRequestHandler
+try:
+    from pywebdav.lib.WebDAVServer import DAVRequestHandler
+    from pywebdav.lib.utils import IfParser, TagList
+    from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from pywebdav.lib.propfind import PROPFIND
+except ImportError:
+    from DAV.WebDAVServer import DAVRequestHandler
+    from DAV.utils import IfParser, TagList
+    from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+    from DAV.propfind import PROPFIND
 from service import http_server
 from service.websrv_lib import FixSendError, HttpOptions
 from BaseHTTPServer import BaseHTTPRequestHandler
@@ -48,9 +57,6 @@ import re
 import time
 from string import atoi
 import addons
-from DAV.utils import IfParser, TagList
-from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-from DAV.propfind import PROPFIND
 # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
 from xml.dom import minidom
 from redirect import RedirectHTTPHandler

From d2cc57ffb6ac20be79e856a21e939eef756f9153 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Wed, 12 Dec 2012 19:24:13 +0100
Subject: [PATCH 02/11] [FIX]Copy colly of handle function of basehttpserver.
 Lucky guess

bzr revid: dle@openerp.com-20121212182413-kusxwx9g9qrg7jdv
---
 addons/document_webdav/webdav_server.py | 42 ++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 1dbad3510ca..887c0bc1d03 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -93,8 +93,48 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
     def _log(self, message):
         self._logger.debug(message)
 
+    def handle_one_request(self):
+        """Handle a single HTTP request.
+
+        You normally don't need to override this method; see the class
+        __doc__ string for information on how to handle specific HTTP
+        commands such as GET and POST.
+
+        """
+        try:
+            self.raw_requestline = self.rfile.readline(65537)
+            if len(self.raw_requestline) > 65536:
+                self.requestline = ''
+                self.request_version = ''
+                self.command = ''
+                self.send_error(414)
+                return
+            if not self.raw_requestline:
+                self.close_connection = 1
+                return
+            if not self.parse_request():
+                # An error code has been sent, just exit
+                return
+            mname = 'do_' + self.command
+            if not hasattr(self, mname):
+                self.send_error(501, "Unsupported method (%r)" % self.command)
+                return
+            method = getattr(self, mname)
+            method()
+            self.wfile.flush() #actually send the response if not already done.
+        except Exception as e:
+            #a read or a write timed out.  Discard this connection
+            self.log_error("Request timed out: %r", e)
+            self.close_connection = 1
+            return
+
     def handle(self):
-        self._init_buffer()
+        """Handle multiple requests if necessary."""
+        self.close_connection = 1
+
+        self.handle_one_request()
+        while not self.close_connection:
+            self.handle_one_request()
 
     def finish(self):
         pass

From 8256b41f0a440660895f3157b417ef20d3615961 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Thu, 13 Dec 2012 10:56:51 +0100
Subject: [PATCH 03/11] [FIX]Try to make things work on runbot

bzr revid: dle@openerp.com-20121213095651-be2skhlkh0i4dlnz
---
 addons/document_webdav/webdav_server.py | 58 +++++++++++++------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 887c0bc1d03..3d517f9e665 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -101,40 +101,44 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
         commands such as GET and POST.
 
         """
-        try:
-            self.raw_requestline = self.rfile.readline(65537)
-            if len(self.raw_requestline) > 65536:
-                self.requestline = ''
-                self.request_version = ''
-                self.command = ''
-                self.send_error(414)
-                return
-            if not self.raw_requestline:
-                self.close_connection = 1
-                return
-            if not self.parse_request():
-                # An error code has been sent, just exit
-                return
-            mname = 'do_' + self.command
-            if not hasattr(self, mname):
-                self.send_error(501, "Unsupported method (%r)" % self.command)
-                return
-            method = getattr(self, mname)
-            method()
-            self.wfile.flush() #actually send the response if not already done.
-        except Exception as e:
-            #a read or a write timed out.  Discard this connection
-            self.log_error("Request timed out: %r", e)
+        self.raw_requestline = self.rfile.readline(65537)
+        if len(self.raw_requestline) > 65536:
+            self.requestline = ''
+            self.request_version = ''
+            self.command = ''
+            self.send_error(414)
+            return
+        if not self.raw_requestline:
             self.close_connection = 1
             return
+        if not self.parse_request():
+            # An error code has been sent, just exit
+            return
+        mname = 'do_' + self.command
+        if not hasattr(self, mname):
+            self.send_error(501, "Unsupported method (%r)" % self.command)
+            return
+        method = getattr(self, mname)
+        method()
+        self.wfile.flush() #actually send the response if not already done.
+    
+        return
 
     def handle(self):
         """Handle multiple requests if necessary."""
         self.close_connection = 1
-
-        self.handle_one_request()
-        while not self.close_connection:
+        try:
             self.handle_one_request()
+            while not self.close_connection:
+                self.handle_one_request()
+        except Exception as e:
+            try:
+                self.log_error("Request timed out: %r \n Trying old version of HTTPServer", e)
+                self._init_buffer()
+            except Exception as e:
+                #a read or a write timed out.  Discard this connection
+                self.log_error("Not working neither, closing connection\n %r", e)
+                self.close_connection = 1
 
     def finish(self):
         pass

From 8efb6d3ea3e42dedd89937c0a5512728228e68ba Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Thu, 13 Dec 2012 14:55:05 +0100
Subject: [PATCH 04/11] [ADD]filter db

bzr revid: dle@openerp.com-20121213135505-fnmlrvscc6upliiv
---
 addons/document_webdav/dav_fs.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 0a9df3d50d4..5b3e4272042 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -24,7 +24,9 @@ import sql_db
 import os
 import time
 import errno
+import re
 
+import openerp
 import netsvc
 import urlparse
 try:
@@ -361,7 +363,8 @@ class openerp_dav_handler(dav_interface):
         return self.parent.get_baseuri(self) + '/'.join(ajoin)
 
     @memoize(4)
-    def db_list(self):
+    def _all_db_list(self):
+        """return all databases who have module document_webdav installed"""
         s = netsvc.ExportService.getService('db')
         result = s.exp_list()
         self.db_name_list=[]
@@ -370,7 +373,7 @@ class openerp_dav_handler(dav_interface):
             try:
                 db = sql_db.db_connect(db_name)
                 cr = db.cursor()
-                cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ")
+                cr.execute("SELECT id FROM ir_module_module WHERE name = 'document_webdav' AND state='installed' ")
                 res=cr.fetchone()
                 if res and len(res):
                     self.db_name_list.append(db_name)
@@ -381,6 +384,15 @@ class openerp_dav_handler(dav_interface):
                     cr.close()
         return self.db_name_list
 
+    def db_list(self, uri):
+        # import pudb;pudb.set_trace()
+        u = urlparse.urlsplit(uri)
+        h = u.hostname
+        d = h.split('.')[0]
+        r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d',d)
+        dbs = [i for i in self._all_db_list() if re.match(r, i)]
+        return dbs
+
     def get_childs(self,uri, filters=None):
         """ return the child objects as self.baseuris for the given URI """
         self.parent.log_message('get children: %s' % uri)
@@ -388,7 +400,7 @@ class openerp_dav_handler(dav_interface):
 
         if not dbname:
             if cr: cr.close()
-            res = map(lambda x: self.urijoin(x), self.db_list())
+            res = map(lambda x: self.urijoin(x), self.db_list(uri))
             return res
         result = []
         node = self.uri2object(cr, uid, pool, uri2[:])

From 3cce9d3569fe2507912c65d8dbe771166fc4ac55 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Thu, 13 Dec 2012 15:14:52 +0100
Subject: [PATCH 05/11] [DEL]handle_one_request useless

bzr revid: dle@openerp.com-20121213141452-ts3a0xdcgo63pscg
---
 addons/document_webdav/webdav_server.py | 34 ++-----------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 3d517f9e665..a23f1a0806b 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -77,7 +77,7 @@ def OpenDAVConfig(**kw):
     return Config()
 
 
-class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
+class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
     verbose = False
 
     protocol_version = 'HTTP/1.1'
@@ -93,37 +93,6 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
     def _log(self, message):
         self._logger.debug(message)
 
-    def handle_one_request(self):
-        """Handle a single HTTP request.
-
-        You normally don't need to override this method; see the class
-        __doc__ string for information on how to handle specific HTTP
-        commands such as GET and POST.
-
-        """
-        self.raw_requestline = self.rfile.readline(65537)
-        if len(self.raw_requestline) > 65536:
-            self.requestline = ''
-            self.request_version = ''
-            self.command = ''
-            self.send_error(414)
-            return
-        if not self.raw_requestline:
-            self.close_connection = 1
-            return
-        if not self.parse_request():
-            # An error code has been sent, just exit
-            return
-        mname = 'do_' + self.command
-        if not hasattr(self, mname):
-            self.send_error(501, "Unsupported method (%r)" % self.command)
-            return
-        method = getattr(self, mname)
-        method()
-        self.wfile.flush() #actually send the response if not already done.
-    
-        return
-
     def handle(self):
         """Handle multiple requests if necessary."""
         self.close_connection = 1
@@ -149,6 +118,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
         return res
 
     def setup(self):
+        DAVRequestHandler.setup(self)
         self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
         addr, port = self.server.server_name, self.server.server_port
         server_proto = getattr(self.server,'proto', 'http').lower()

From af10943f7b5bdad4d6f10ed0600be20375845880 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 17 Dec 2012 09:41:16 +0100
Subject: [PATCH 06/11] [IMP] mail: add an option 'readonly' for the client
 action and activate readonly mode (hide the action buttons)

bzr revid: chm@openerp.com-20121217084116-i2cjdsk56pzz0kjh
---
 addons/mail/doc/mail_message.rst    |  1 +
 addons/mail/static/src/js/mail.js   |  2 ++
 addons/mail/static/src/xml/mail.xml | 10 +++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/mail/doc/mail_message.rst b/addons/mail/doc/mail_message.rst
index 4a3d3634efa..14055f063e0 100644
--- a/addons/mail/doc/mail_message.rst
+++ b/addons/mail/doc/mail_message.rst
@@ -53,6 +53,7 @@ ClientAction (ir.actions.client)
       - ``compose_placeholder`` : Message to display on the textareaboxes.
       - ``show_link`` : Display partner (authors, followers...) on link or not
       - ``compose_as_todo`` : The root composer mark automatically the message as todo
+      - ``readonly`` : Read only mode, hide all action buttons and composer
 
 Fields
 +++++++
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dc5583eb951..864f19c31e8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1414,6 +1414,7 @@ openerp.mail = function (session) {
          *     @param {String} [no_message] Message to display when there are no message
          *     @param {Boolean} [show_link] Display partner (authors, followers...) on link or not
          *     @param {Boolean} [compose_as_todo] The root composer mark automatically the message as todo
+         *     @param {Boolean} [readonly] Read only mode, hide all action buttons and composer
          */
         init: function (parent, action) {
             this._super(parent, action);
@@ -1435,6 +1436,7 @@ openerp.mail = function (session) {
                 'view_inbox': false,
                 'message_ids': undefined,
                 'compose_as_todo' : false,
+                'readonly' : true,
             }, this.action.params);
 
             this.action.params.help = this.action.help || false;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 542e4eec7b7..3c510813029 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -20,7 +20,7 @@
         mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message">
-        <div t-if="widget.show_composer" t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+        <div t-if="widget.show_composer and !widget.options.readonly" t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
@@ -38,7 +38,7 @@
                 </div>
             </div>
         </div>
-        <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+        <div t-if="widget.show_compact_message and !widget.show_composer and !widget.options.readonly" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea t-if="widget.options.compose_placeholder" class="field_text oe_compact" t-att-placeholder="widget.options.compose_placeholder"/>
             <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this document..."/>
             <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share with my followers..."/>
@@ -211,7 +211,7 @@
             </div>
 
             <div class="oe_msg_center">
-                <div class='oe_msg_icons'>
+                <div class='oe_msg_icons' t-if="!widget.options.readonly">
                     <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
                     <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
@@ -236,8 +236,8 @@
                     <span t-if="widget.author_id and !widget.options.show_link"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
-                    <span class='oe_subtle'>•</span>
-                    <t t-call="mail.thread.message.vote"/>
+                    <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
+                    <t t-if="!widget.options.readonly" t-call="mail.thread.message.vote"/>
                 </div>
             </div>
         </div>

From c3d4d20d86b799e286d3870093ba4f58d3ff5561 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 17 Dec 2012 10:24:28 +0100
Subject: [PATCH 07/11] [IMP] mail: set default readonly to false

bzr revid: chm@openerp.com-20121217092428-s5a5thu4f1fjvejc
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 864f19c31e8..5b9696750a2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1436,7 +1436,7 @@ openerp.mail = function (session) {
                 'view_inbox': false,
                 'message_ids': undefined,
                 'compose_as_todo' : false,
-                'readonly' : true,
+                'readonly' : false,
             }, this.action.params);
 
             this.action.params.help = this.action.help || false;

From 9150d950623668d345990e17e53cd2842d047303 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 17 Dec 2012 10:35:01 +0100
Subject: [PATCH 08/11] [IMP] mail: add the readonly option on the field for
 the different views

bzr revid: chm@openerp.com-20121217093501-mxji9wb00xyvq35e
---
 addons/mail/static/src/js/mail.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5b9696750a2..f873daff9c3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1509,6 +1509,9 @@ openerp.mail = function (session) {
             if (this.node.attrs.placeholder) {
                 this.node.params.compose_placeholder = this.node.attrs.placeholder;
             }
+            if (this.node.attrs.readonly) {
+                this.node.params.readonly = this.node.attrs.readonly;
+            }
 
             this.domain = this.node.params && this.node.params.domain || [];
         },

From fe48c4eaa9487e7573bec4bf2dd597e29f74883c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 17 Dec 2012 14:02:49 +0100
Subject: [PATCH 09/11] [FIX] res_country_data: fix US postal address format

bzr revid: rco@openerp.com-20121217130249-w2wanhy1b7wsgbra
---
 openerp/addons/base/res/res_country_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_country_data.xml b/openerp/addons/base/res/res_country_data.xml
index 068850727e8..a7cfb961af1 100644
--- a/openerp/addons/base/res/res_country_data.xml
+++ b/openerp/addons/base/res/res_country_data.xml
@@ -1186,7 +1186,7 @@
         <record id="us" model="res.country">
             <field name="name">United States</field>
             <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="uy" model="res.country">

From d7461fb1c813590d70ddecaeff65c02a1029d61b Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 17 Dec 2012 14:20:45 +0100
Subject: [PATCH 10/11] [FIX]fleet: setting group for user_demo should be done
 in demo data instead of data

bzr revid: csn@openerp.com-20121217132045-lt0b2aeubty1hrkn
---
 addons/fleet/fleet_demo.xml              | 4 ++++
 addons/fleet/security/fleet_security.xml | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 50eb8a3fab1..a8d70eb06fa 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+      <record id="base.user_demo" model="res.users">
+        <field name="groups_id" eval="[(4, ref('fleet.group_fleet_user'))]" />
+      </record>
+
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
         <field name="name">In shop</field>
         <field name="sequence">1</field>
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index 6c718f4cdd7..c9b86799b5c 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -8,7 +8,6 @@
         <record id="group_fleet_user" model="res.groups">
             <field name="name">User</field>
             <field name="category_id" ref="module_fleet_category"/>
-            <field name="users" eval="[(4, ref('base.user_demo'))]"/>
         </record>
         <record id="group_fleet_manager" model="res.groups">
             <field name="name">Manager</field>

From 39fe69babe7e2f05330de6829a2843f91a04f440 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 17 Dec 2012 14:45:59 +0100
Subject: [PATCH 11/11] [FIX] expression: avoid delitem on a tuple

bzr revid: rco@openerp.com-20121217134559-cjc0b4ncs1drupn7
---
 openerp/osv/expression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index cca376994ec..899279c8015 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -1104,7 +1104,7 @@ class expression(object):
                 query = '(%s."%s" IS %s)' % (table_alias, left, r)
                 params = []
             elif isinstance(right, (list, tuple)):
-                params = right[:]
+                params = list(right)
                 check_nulls = False
                 for i in range(len(params))[::-1]:
                     if params[i] == False: