merging from the trunk

add new rules to the rng, so that now
notebook can be add in the page

bzr revid: mga@tinyerp.com-20081217114518-wfbmmhbwxuqx85pc

bin/addons/base/module/module.py

@@ -461,7 +461,7 @@ class module(osv.osv):
             for lang in filter_lang:
                 f = os.path.join(tools.config['addons_path'], mod.name, 'i18n', lang + '.po')
                 if os.path.exists(f):
-                    logger.notifyChannel("init", netsvc.LOG_INFO, 'addon %s: loading translation file for language %s' % (mod.name, lang))
+                    logger.notifyChannel("init", netsvc.LOG_INFO, 'module %s: loading translation file for language %s' % (mod.name, lang))
                     tools.trans_load(cr.dbname, f, lang, verbose=False)
 
 module()

bin/addons/base/rng/view.rng

@@ -19,6 +19,7 @@
                     <rng:ref name="separator"/>
                     <rng:ref name="image"/>
                     <rng:ref name="form"/>
+                    <rng:ref name="vpaned"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                     <rng:element name="properties"><rng:empty/></rng:element>
                 </rng:choice>
@@ -101,6 +102,15 @@
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
+    
+    <rng:define name="vpaned">
+        <rng:element name="vpaned">
+            <rng:optional><rng:attribute name="position"/></rng:optional>
+            <rng:zeroOrMore>
+                <rng:ref name="any" />
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
 
     <rng:define name="any">
         <rng:element>
@@ -135,6 +145,8 @@
                     <rng:ref name="form" />
                     <rng:ref name="page" />
                     <rng:ref name="notebook"/>
+                    <rng:ref name="hpaned"/>
+                    <rng:ref name="vpaned"/>
                 </rng:choice>
             </rng:zeroOrMore>
         </rng:element>

bin/osv/fields.py

@@ -426,7 +426,7 @@ class one2many(_column):
             context = {}
         if not values:
             return
-        print obj, id, field, values
+
         _table = obj.pool.get(self._obj)._table
         obj = obj.pool.get(self._obj)
         for act in values:
@@ -634,7 +634,6 @@ class function(_column):
         return res
 
     def set(self, cr, obj, id, name, value, user=None, context=None):
-        print obj,name,value
         if not context:
             context = {}
         if self._fnct_inv:
@@ -693,9 +692,11 @@ class related(function):
         self._field_get2(cr, uid, obj, context)
         if not ids: return {}
         relation = obj._name
-        res = {}
+        res = {}.fromkeys(ids, False)
         objlst = obj.browse(cr, uid, ids)
         for data in objlst:
+            if not data:
+                continue
             t_data = data
             relation = obj._name
             for i in range(len(self.arg)):

bin/sql_db.py

@@ -222,6 +222,7 @@ class PoolManager(object):
 
     def close(db_name):
         if db_name in PoolManager._pools:
+            logger = netsvc.Logger()
             logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Closing all connections to %s' % (db_name,))
             PoolManager._pools[db_name].closeall()
             del PoolManager._pools[db_name]

bin/tools/convert.py

@@ -488,7 +488,7 @@ form: module.record_id""" % (xml_id,)
                     try:
                         npid = self.pool.get('ir.model.data')._update_dummy(cr, self.uid, 'ir.ui.menu', self.module, xml_id, idx==len(m_l)-1)
                     except:
-                        self.logger.notifyChannel('init', netsvc.LOG_ERROR, "addon: %s xml_id: %s" % (self.module, xml_id))
+                        self.logger.notifyChannel('init', netsvc.LOG_ERROR, "module: %s xml_id: %s" % (self.module, xml_id))
                 else:
                     # the menuitem does't exist but we are in branch (not a leaf)
                     self.logger.notifyChannel("init", netsvc.LOG_WARNING, 'Warning no ID for submenu %s of menu %s !' % (menu_elem, str(m_l)))