diff --git a/l10n_th_fields/__openerp__.py b/l10n_th_fields/__openerp__.py
index 17f8925c5..c12ec0cd5 100755
--- a/l10n_th_fields/__openerp__.py
+++ b/l10n_th_fields/__openerp__.py
@@ -20,7 +20,6 @@
     'data': [
         'views/voucher_payment_receipt_view.xml',
         'views/partner_view.xml',
-        'views/account_bank_view.xml',
         'views/account_invoice_view.xml',
         'views/ir_sequence_view.xml',
     ],
diff --git a/l10n_th_fields/models/__init__.py b/l10n_th_fields/models/__init__.py
index f0e402838..9d0879ef4 100755
--- a/l10n_th_fields/models/__init__.py
+++ b/l10n_th_fields/models/__init__.py
@@ -3,7 +3,6 @@
 from . import partner
 from . import account_voucher
 from . import account_invoice
-from . import account_bank
 from . import ir_sequence
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/l10n_th_fields/models/account_bank.py b/l10n_th_fields/models/account_bank.py
deleted file mode 100755
index bc8ef9eab..000000000
--- a/l10n_th_fields/models/account_bank.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp import models, fields
-
-
-class Bank(models.Model):
-    _inherit = "res.partner.bank"
-
-    bank_branch = fields.Char(
-        string='Bank Branch',
-        size=64,
-    )
diff --git a/l10n_th_fields/views/account_bank_view.xml b/l10n_th_fields/views/account_bank_view.xml
deleted file mode 100755
index 3d50d1d8d..000000000
--- a/l10n_th_fields/views/account_bank_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	    <record id="view_partner_bank_form_inherit" model="ir.ui.view">
-	        <field name="name">Partner Bank Accounts - Journal</field>
-	        <field name="model">res.partner.bank</field>
-	        <field name="inherit_id" ref="account.view_partner_bank_form_inherit"/>
-	        <field name="arch" type="xml">
-	            <group name="accounting" position="attributes">
-	            	<attribute name="attrs" >{}</attribute>
-	            </group>
-	            <!-- <xpath expr="//field[@name='journal_id']" position="after">
-	            	<field name="journal_ids" widget="many2many_tags"/>
-	            </xpath> -->
-	            <xpath expr="//field[@name='bank_bic']" position="after">
-                    <field name="bank_branch"/>
-                </xpath>
-	        </field>
-	    </record>
-
-    </data>
-</openerp>
diff --git a/pabi_bank/models/res_bank.py b/pabi_bank/models/res_bank.py
index 3205f515e..011f33e8f 100755
--- a/pabi_bank/models/res_bank.py
+++ b/pabi_bank/models/res_bank.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from openerp import fields, models, api
+from openerp import fields, models, api, _
+from openerp.exceptions import ValidationError
 
 
 class ResBank(models.Model):
@@ -31,8 +32,18 @@ class ResPartnerBank(models.Model):
 
     @api.onchange('bank')
     def _onchange_bank(self):
-        self.bank_branch = False
+        for rec in self:
+            if rec.bank:
+                rec.bank_name = rec.bank.name
+                rec.bank_bic = rec.bank.bic
+                rec.bank_branch = False
 
+    @api.onchange('bank_branch')
+    def _onchange_bank_branch(self):
+        for rec in self:
+            if rec.bank_branch and rec.bank and rec.bank_branch.bank_id != rec.bank:
+                raise ValidationError(_('กรุณาเลือกสาขาใหม่ \nเนื่องจากสาขาไม่สัมพันธ์กับธนาคาร'))
+            
     @api.multi
     def name_get(self):
         res = []
diff --git a/pabi_bank/views/res_bank_view.xml b/pabi_bank/views/res_bank_view.xml
index ff6b7b8a4..f9f4849a3 100755
--- a/pabi_bank/views/res_bank_view.xml
+++ b/pabi_bank/views/res_bank_view.xml
@@ -15,6 +15,25 @@
                 </field>
             </field>
         </record>
+        
+        <delete id="l10n_th_fields.view_partner_bank_form_inherit" model="ir.ui.view"/>
+
+	    <record id="view_partner_bank_form_inherit" model="ir.ui.view">
+	        <field name="name">Partner Bank Accounts - Journal</field>
+	        <field name="model">res.partner.bank</field>
+	        <field name="inherit_id" ref="account.view_partner_bank_form_inherit"/>
+	        <field name="arch" type="xml">
+	            <group name="accounting" position="attributes">
+	            	<attribute name="attrs" >{}</attribute>
+	            </group>
+	            <field name="bank" position="attributes">
+	            	<attribute name="on_change">1</attribute>
+	            </field>
+	            <xpath expr="//field[@name='bank_bic']" position="after">
+                    <field name="bank_branch"/>
+                </xpath>
+	        </field>
+	    </record>
 
         <!-- res.bank.branch.branch -->
         <record id="view_res_bank_master_form" model="ir.ui.view">