diff --git a/openerp/addons/base/res/ir_property.py b/openerp/addons/base/res/ir_property.py
index 496bfffe1a2..55ff48c6ece 100644
--- a/openerp/addons/base/res/ir_property.py
+++ b/openerp/addons/base/res/ir_property.py
@@ -55,7 +55,7 @@ class ir_property(osv.osv):
'fields_id': fields.many2one('ir.model.fields', 'Field', ondelete='cascade', required=True, select=1),
'value_float' : fields.float('Value'),
- 'value_integer' : fields.integer_big('Value'), # will contain (int, bigint)
+ 'value_integer' : fields.integer('Value')
'value_text' : fields.text('Value'), # will contain (char, text)
'value_binary' : fields.binary('Value'),
'value_reference': fields.reference('Value', selection=_models_get2, size=128),
@@ -65,7 +65,6 @@ class ir_property(osv.osv):
('float', 'Float'),
('boolean', 'Boolean'),
('integer', 'Integer'),
- ('integer_big', 'Integer Big'),
('text', 'Text'),
('binary', 'Binary'),
('many2one', 'Many2One'),
@@ -100,7 +99,6 @@ class ir_property(osv.osv):
'float': 'value_float',
'boolean' : 'value_integer',
'integer': 'value_integer',
- 'integer_big': 'value_integer',
'text': 'value_text',
'binary': 'value_binary',
'many2one': 'value_reference',
@@ -142,7 +140,7 @@ class ir_property(osv.osv):
return record.value_float
elif record.type == 'boolean':
return bool(record.value_integer)
- elif record.type in ('integer', 'integer_big'):
+ elif record.type == 'integer':
return record.value_integer
elif record.type == 'binary':
return record.value_binary
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 9f980c7d71c..b793c090491 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 7d51c068443..2576ee3bc1d 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1011,7 +1011,7 @@ class function(_column):
self._symbol_f = boolean._symbol_f
self._symbol_set = boolean._symbol_set
- if type in ['integer','integer_big']:
+ if type == 'integer':
self._symbol_c = integer._symbol_c
self._symbol_f = integer._symbol_f
self._symbol_set = integer._symbol_set
@@ -1051,7 +1051,7 @@ class function(_column):
elif not context.get('bin_raw'):
result = sanitize_binary_value(value)
- if field_type in ("integer","integer_big") and value > xmlrpclib.MAXINT:
+ if field_type == "integer" and value > xmlrpclib.MAXINT:
# integer/long values greater than 2^31-1 are not supported
# in pure XMLRPC, so we have to pass them as floats :-(
# This is not needed for stored fields and non-functional integer
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 160a70863fe..d04247508d5 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -544,7 +544,6 @@ def pg_varchar(size=0):
FIELDS_TO_PGTYPES = {
fields.boolean: 'bool',
fields.integer: 'int4',
- fields.integer_big: 'int8',
fields.text: 'text',
fields.date: 'date',
fields.datetime: 'timestamp',