summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2014-03-28 12:47:37 +0100
committerMartin Trigaux <mat@openerp.com>2014-03-28 12:47:37 +0100
commit830e2d00a9f045edef9c2a36ab87ef0d7f1778f3 (patch)
tree7cef7d4efbc939f7ea361860b28aeef1085fa286
parent172ec1679db7da3b2fcce72c63c1b9c6e481ce55 (diff)
parent204ab9f60913614c68279552b688a28c3e409fef (diff)
[MERGE] [FIX] project: function field 'doc_count' is of type integer, not int, courtesy of Yanina Aular (Vauxoo)
bzr revid: mat@openerp.com-20140328114737-bk29fqfdyabx4r65
-rw-r--r--addons/project/project.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/project/project.py b/addons/project/project.py
index 219f42c9696..623a0809b96 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -288,7 +288,9 @@ class project(osv.osv):
help="The kind of document created when an email is received on this project's email alias"),
'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True),
'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
- 'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
+ 'doc_count': fields.function(
+ _get_attached_docs, string="Number of documents attached", type='integer'
+ )
}
def _get_type_common(self, cr, uid, context):