From ec525752fefdf50884e1fc5d6e69921ae8b96dd3 Mon Sep 17 00:00:00 2001
From: bch <>
Date: Wed, 10 Jan 2007 07:41:10 +0000
Subject: [PATCH] DTA : version avec iban et bvr

bzr revid: bch-00c09cc37262436e0d3c32b821f15339a005a61c
---
 bin/addons/base/res/partner/partner.py       | 31 ++----------
 bin/addons/base/res/partner/partner_view.xml | 52 +-------------------
 2 files changed, 5 insertions(+), 78 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index f9f8ac16880..a435e43982b 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -295,30 +295,6 @@ class res_partner(osv.osv):
 		return True
 res_partner()
 
-
-
-class res_partner_category_type(osv.osv):
-	_description='Partner category types'
-	_name = 'res.partner.category.type'
-	_columns = {
-		'name': fields.char('Category Name', required=True, size=64),
-	}
-	_order = 'name'
-res_partner_category_type()
-
-
-class res_partner_bank_type(osv.osv):
-	_description='Bank Type'
-	_name = "res.partner.bank.type"
-	_columns = {
-		'name': fields.char('Account Type', size=64, required=True),
-		'code': fields.char('Account Type Code', size=8),
-		'elect_pay': fields.char('Electronic Payment',size=64),
-
-		}
-res_partner_bank_type()
-
-
 class res_partner_bank(osv.osv):
 	_description='Bank Details'
 	_name = "res.partner.bank"
@@ -326,20 +302,19 @@ class res_partner_bank(osv.osv):
 	_columns = {
 		'name': fields.char('Account Name', size=64, required=True),
 		'sequence': fields.integer('Sequence'),
-		'iban': fields.char('Account Number', size=64),
+		'iban': fields.char('Account number', size=64),
 		'swift': fields.char('Swift', size=64),
 		'bank_name': fields.char('Bank Name', size=64),
 		'bank_guichet': fields.char('Branch', size=64),
 		'partner_id': fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', select=True),
 		'active': fields.boolean('Active'),
-		'type_id': fields.many2one('res.partner.bank.type', 'Type'),
 	}
 	_defaults = {
 		'active': lambda *a: 1,
 	}
 res_partner_bank()
 
-	
+
 class res_partner_address(osv.osv):
 	_description ='Partner Contact'
 	_name = 'res.partner.address'
@@ -352,7 +327,7 @@ class res_partner_address(osv.osv):
 		'name': fields.char('Contact Name', size=64),
 		'street': fields.char('Street', size=128),
 		'street2': fields.char('Street2', size=128),
-		'zip': fields.char('Zip code', change_default=True, size=24),
+		'zip': fields.char('Zip', change_default=True, size=24),
 		'city': fields.char('City', size=128),
 		'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
 		'country_id': fields.many2one('res.country', 'Country'),
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 2efcc1256fa..3cb0e4885fa 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -349,18 +349,13 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_payterm_form"/>
 	</record>
-	<!--
-	======================
-	Bank and bank type
-	======================
-	-->
 
 	<record model="ir.ui.view" id="view_partner_bank_form">
 		<field name="name">res.partner.bank.form</field>
 		<field name="model">res.partner.bank</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Bank Account Details">
+			<form string="Bank Details">
 				<field name="name" select="1" colspan="3"/>
 				<field name="sequence"/>
 				<field name="active" select="1"/>
@@ -368,7 +363,6 @@
 				<field name="swift" select="1"/>
 				<field name="bank_name" select="1"/>
 				<field name="bank_guichet" select="1"/>
-				<field name="type_id" select="1"/>
 			</form>
 		</field>
 	</record>
@@ -377,62 +371,20 @@
 		<field name="model">res.partner.bank</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Bank Account Details">
+			<tree string="Bank Details">
 				<field name="sequence"/>
 				<field name="name"/>
 				<field name="iban"/>
 				<field name="swift"/>
-				<field name="type_id"/>
 			</tree>
 		</field>
 	</record>
-	<record model="ir.actions.act_window" id="action_res_partner_bank">
-		<field name="name">res.partner.bank</field>
-		<field name="res_model">res.partner.bank</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-	</record>
-	<menuitem name="Partners/Configuration/Bank Account" action="action_res_partner_bank" id="menu_res_partner_bank"/>
-
-
-	<record model="ir.ui.view" id="view_partner_bank_type_form">
-		<field name="name">res.partner.bank.type.form</field>
-		<field name="model">res.partner.bank.type</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Bank Account Type">
-				<field name="name" />
-				<field name="code" />
-				<field name="elect_pay" />			
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_partner_bank_type_tree">
-		<field name="name">res.partner.bank.type.tree</field>
-		<field name="model">res.partner.bank.type</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Bank Account Type">
-				<field name="name" />
-				<field name="code" />
-				<field name="elect_pay" />
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_res_partner_bank_type">
-		<field name="name">res.partner.bank.type</field>
-		<field name="res_model">res.partner.bank.type</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-	</record>
-	<menuitem name="Partners/Configuration/Bank Account/Bank Account Type" action="action_res_partner_bank_type" id="menu_res_partner_bank_type"/>
 
 	<!--
 	======================
 	Company Architecture
 	======================
 	-->
-
 	<record model="ir.ui.view" id="view_partner_tree2">
 		<field name="name">res.partner.tree</field>
 		<field name="model">res.partner</field>