[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934...

bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b

diff --cc addons/web/controllers/main.py
index 8683ef1,5ea54ab..1bcdb7f
--- 1/addons/web/controllers/main.py
--- 2/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@@ -86,9 -85,9 +87,9 @@@ def rjsmin(script)
      ).strip()
      return result
  
- def db_list():
 -def db_list(req, force=False):
++def db_list(force=False):
      proxy = req.session.proxy("db")
-     dbs = proxy.list()
+     dbs = proxy.list(force)
      h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
      d = h.split('.')[0]
      r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
@@@ -104,11 -103,7 +105,7 @@@ def db_monodb_redirect()
      if db_url:
          return (db_url, False)
  
-     try:
-         dbs = db_list()
-     except Exception:
-         # ignore access denied
-         dbs = []
 -    dbs = db_list(req, True)
++    dbs = db_list(True)
  
      # 2 use the database from the cookie if it's listable and still listed
      cookie_db = req.httprequest.cookies.get('last_used_database')
@@@ -765,11 -764,18 +763,18 @@@ class Database(openerpweb.Controller)
      _cp_path = "/web/database"
  
      @openerpweb.jsonrequest
 -    def get_list(self, req):
 +    def get_list(self):
-         return db_list()
+         # TODO change js to avoid calling this method if in monodb mode
+         try:
 -            return db_list(req)
++            return db_list()
+         except openerp.exceptions.AccessDenied:
+             monodb = db_monodb(req)
+             if monodb:
+                 return [monodb]
+             raise
  
      @openerpweb.jsonrequest
 -    def create(self, req, fields):
 +    def create(self, fields):
          params = dict(map(operator.itemgetter('name', 'value'), fields))
          return req.session.proxy("db").create_database(
              params['super_admin_pwd'],
@@@ -779,16 -785,8 +784,8 @@@
              params['create_admin_pwd'])
  
      @openerpweb.jsonrequest
 -    def duplicate(self, req, fields):
 +    def duplicate(self, fields):
          params = dict(map(operator.itemgetter('name', 'value'), fields))
-         return req.session.proxy("db").duplicate_database(
-             params['super_admin_pwd'],
-             params['db_original_name'],
-             params['db_name'])
- 
-     @openerpweb.jsonrequest
-     def duplicate(self, fields):
-         params = dict(map(operator.itemgetter('name', 'value'), fields))
          duplicate_attrs = (
              params['super_admin_pwd'],
              params['db_original_name'],

diff --cc addons/web/http.py
Simple merge

diff --cc addons/web/static/src/css/base.css
index 863b90a,3041323..74e027d
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -2147,16 -2139,6 +2148,15 @@@
  .openerp .oe_form_readonly .oe_form .oe_form_field_date {
    width: auto;
  }
- .openerp .oe_form_readonly .oe_form_field_boolean .boolean{
++.openerp .oe_form_readonly .oe_form_field_boolean.boolean {
 +  position: relative;
-   top: -14px;
++  top: -20px;
 +  width: 14px;
 +  height: 14px;
-   z-index:10000;
-   /* IE needs a color in order for the layer to respond to mouse events */
++  z-index: 10000;
 +  backgroundColor: "#fff";
 +  opacity: 0;
 +}
  .openerp .oe_form_nosheet {
    margin: 16px;
  }

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/view_list.js
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc addons/web/static/src/xml/base.xml
Simple merge

diff --cc openerp/__init__.py
Simple merge

diff --cc openerp/addons/base/res/res_company.py
Simple merge

diff --cc openerp/addons/base/res/res_partner.py
Simple merge

diff --cc openerp/addons/base/res/res_partner_view.xml
index ccf7420,a85272c..2e7b6f0
--- 1/openerp/addons/base/res/res_partner_view.xml
--- 2/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@@ -580,7 -577,14 +580,14 @@@
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">res.partner.category</field>
              <field name="view_type">form</field>
-             <field name="help">Manage the partner tags to better classify them for tracking and analysis purposes. A partner may have several tags and tags have a hierarchical structure: a partner with a tag has also the parent tags.</field>
+             <field name="help" type="html">
+               <p class="oe_view_nocontent_create">
 -                Click to create a new partner category.
++                Click to create a new partner tags.
+               </p><p>
 -                Manage the partner categories in order to better classify them for tracking and analysis purposes.
 -                A partner may belong to several categories and categories have a hierarchy structure: a partner belonging to a category also belong to his parent category.
++                Manage the partner tags to better classify them for tracking and analysis purposes.
++                A partner may have several tags and tags have a hierarchical structure: a partner with a tag has also the parent tags.
+               </p>
+             </field>
          </record>
  
          <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Tags" sequence="4" parent="menu_config_address_book" groups="base.group_no_one"/>

diff --cc openerp/addons/base/res/res_users.py
Simple merge