diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml index 8f26d3ef496..285e7936bf7 100644 --- a/bin/addons/base/base_update.xml +++ b/bin/addons/base/base_update.xml @@ -157,6 +157,8 @@ + + diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index 22c3e04dde0..b36133d8a2e 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -310,6 +310,14 @@ [('supplier','<>',1),('customer','<>',1)] + + New Partner + ir.actions.act_window + res.partner + form + form,tree + + res.payterm diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 0178c2d078a..5d73ee402f3 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -769,7 +769,7 @@ class orm_template(object): fields[node.getAttribute('name')] = attrs elif node.nodeType==node.ELEMENT_NODE and node.localName in ('form', 'tree'): - result = self.pool.get(self._name).view_header_get(cr, user, False, node.localName, context) + result = self.view_header_get(cr, user, False, node.localName, context) if result: node.setAttribute('string', result.decode('utf-8')) if node.nodeType == node.ELEMENT_NODE and node.hasAttribute('groups'): @@ -1388,8 +1388,10 @@ class orm(orm_template): iids = ids_lst[:40] ids_lst = ids_lst[40:] res = f.get(cr, self, iids, k, 1, {}) - for r in res.items(): - cr.execute("UPDATE \"%s\" SET \"%s\"='%s' where id=%d"% (self._table, k, r[1], r[0])) + for key,val in res.items(): + if f._multi: + val = val[k] + cr.execute("UPDATE \"%s\" SET \"%s\"='%s' where id=%d"% (self._table, k, val, key)) # and add constraints if needed if isinstance(f, fields.many2one): @@ -1779,9 +1781,9 @@ class orm(orm_template): for key,val in todo.items(): if key: res2 = self._columns[val[0]].get(cr, self, ids, val, user, context=context, values=res) - for pos in range(len(val)): + for pos in val: for record in res: - record[val[pos]] = res2[record['id']][pos] + record[pos] = res2[record['id']][pos] else: for f in val: res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res)