From 0d836ea56e5a5530ad558ac634da4b4240de0aeb Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 16 Feb 2010 13:21:43 +0530
Subject: [PATCH 1/2] [FIX] Fixed error notification on parent_store=true with
 a column without ondelete=cascade

lp bug: https://launchpad.net/bugs/522227 fixed

bzr revid: jvo@tinyerp.com-20100216075143-f0e3axlg1m2eskmq
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 3e8f869e4ea..fd67b593405 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1745,7 +1745,7 @@ class orm(orm_template):
                     if 'parent_right' not in self._columns:
                         logger.notifyChannel('orm', netsvc.LOG_ERROR, 'create a column parent_right on object %s: fields.integer(\'Right Parent\', select=1)' % (self._table, ))
                     if self._columns[self._parent_name].ondelete<>'cascade':
-                        logger.notifyChannel('orm', netsvc.LOG_ERROR, "the columns %s on object must be set as ondelete='cascasde'" % (self._name, self._parent_name))
+                        logger.notifyChannel('orm', netsvc.LOG_ERROR, "The column %s on object %s must be set as ondelete='cascade'" % (self._parent_name, self._name))
                     cr.execute('ALTER TABLE "%s" ADD COLUMN "parent_left" INTEGER' % (self._table,))
                     cr.execute('ALTER TABLE "%s" ADD COLUMN "parent_right" INTEGER' % (self._table,))
                     cr.commit()

From c7e1318927f514711d614176eec2813034162477 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 16 Feb 2010 14:24:53 +0530
Subject: [PATCH 2/2] [IMP] Account/base_iban : bank and iban displayed on list
 view of O2M to partner

lp bug: https://launchpad.net/bugs/519225 fixed

bzr revid: jvo@tinyerp.com-20100216085453-xgt3s52brv1ei04y
---
 addons/account/partner_view.xml     |  1 +
 addons/base_iban/base_iban_view.xml | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d93349d9f62..9402f0ff2e5 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -113,6 +113,7 @@
                         </form>
                         <tree string="Bank Details">
                             <field name="state"/>
+                            <field name="bank"/>
                             <field name="owner_name"/>
                             <field name="acc_number"/>
                         </tree>
diff --git a/addons/base_iban/base_iban_view.xml b/addons/base_iban/base_iban_view.xml
index d93e9ffb086..00203665c50 100644
--- a/addons/base_iban/base_iban_view.xml
+++ b/addons/base_iban/base_iban_view.xml
@@ -42,6 +42,17 @@
                 </field>
             </field>
         </record>
+        <record id="view_partner_iban_list" model="ir.ui.view">
+            <field name="name">res.partner.form.iban.inherit.list</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                	<field name="iban"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>