Merge commit 'origin/master' into mdv-gpl3-fwd

bzr revid: p_christ@hol.gr-20081215182709-rusb3oq7npwecnt7

diff --cc bin/addons/base/ir/ir.xml
Simple merge

diff --cc bin/addons/base/ir/ir_actions.py
Simple merge

diff --cc bin/netsvc.py
Simple merge

diff --cc bin/osv/orm.py
index 59b5952,1375794..3e1395b
--- 1/bin/osv/orm.py
--- 2/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@@ -714,11 -709,10 +714,10 @@@ class orm_template(object)
          translation_obj = self.pool.get('ir.translation')
          model_access_obj = self.pool.get('ir.model.access')
          for parent in self._inherits:
-             res.update(self.pool.get(parent).fields_get(cr, user, fields,
-                 context))
+             res.update(self.pool.get(parent).fields_get(cr, user, fields, context))
          for f in self._columns.keys():
 -            if fields and f not in fields:
 -                continue
 +          if fields and f not in fields:
 +                  continue
              res[f] = {'type': self._columns[f]._type}
              for arg in ('string', 'readonly', 'states', 'size', 'required',
                      'change_default', 'translate', 'help', 'select'):

diff --cc bin/tools/convert.py
Simple merge