From 867fae5dd749d7452464fdac59fdcd4bc75f999a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 29 Mar 2007 07:20:07 +0000
Subject: [PATCH] BASE: add perm_id to ir_model and ir_model_fields

bzr revid: mga@tinyerp.com-1e1ec255e5683c4d29674d7332b4cde24b37500d
---
 bin/addons/base/base.sql       |  2 ++
 bin/addons/base/ir/ir.xml      | 10 +++++++++-
 bin/addons/base/ir/ir_model.py |  2 +-
 doc/migrate/4.0.0-4.1.0/pre.py |  8 ++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 8c31121564c..e62d1c748c9 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -42,6 +42,7 @@ create table ir_values
 
 CREATE TABLE ir_model (
   id serial,
+  perm_id int references perm on delete set null,
   model varchar(64) DEFAULT ''::varchar NOT NULL,
   name varchar(64),
   info text,
@@ -50,6 +51,7 @@ CREATE TABLE ir_model (
 
 CREATE TABLE ir_model_fields (
   id serial,
+  perm_id int references perm on delete set null,
   model varchar(64) DEFAULT ''::varchar NOT NULL,
   model_id int references ir_model,
   name varchar(64) DEFAULT ''::varchar NOT NULL,
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 4daff3657ae..0619492356b 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -411,7 +411,15 @@
 				<field name="model" select="1"/>
 				<field name="info" select="1" colspan="3"/>
 				<separator string="Fields" colspan="4"/>
-				<field name="field_id" colspan="4" nolabel="1"/>
+				<field name="field_id" colspan="4" nolabel="1">
+					<form string="Fields Description">
+					<field name="name" select="1"/>
+					<field name="field_description" select="1" colspan="4"/>
+					<field name="ttype" select="1"/>
+					<field name="relation" select="1"/>
+					<field name="relate" select="1"/>
+					</form>
+				</field>
 			</form>
 		</field>
 	</record>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index a20b8e62a9c..ec718924cab 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -67,7 +67,7 @@ class ir_model_fields(osv.osv):
 		'view_load': fields.boolean('View Auto-Load'),
 	}
 	_defaults = {
-		'relate': lambda *a: 1,
+		'relate': lambda *a: 0,
 		'view_load': lambda *a: 0,
 		'name': lambda *a: 'No Name',
 		'field_description': lambda *a: 'No description available',
diff --git a/doc/migrate/4.0.0-4.1.0/pre.py b/doc/migrate/4.0.0-4.1.0/pre.py
index a7934bb8b91..1d325a617be 100644
--- a/doc/migrate/4.0.0-4.1.0/pre.py
+++ b/doc/migrate/4.0.0-4.1.0/pre.py
@@ -102,4 +102,12 @@ cr.commit()
 cr.execute("ALTER TABLE res_partner_bank RENAME iban TO number")
 cr.commit()
 
+# ------------------------------------------- #
+# Add perm_id to ir_model and ir_model_fields #
+# ------------------------------------------- #
+
+cr.execute("ALTER TABLE ir_model ADD perm_id int references perm on delete set null")
+cr.execute("ALTER TABLE ir_model_fields ADD perm_id int references perm on delete set null")
+cr.commit()
+
 cr.close