passing in GPL-3

[odoo/odoo.git] / bin / addons / base / ir / ir_attachment.py

diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index b025dc1..e9b23ff 100644 (file)
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -1,30 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution  
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# $Id$
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -47,9 +39,14 @@ class ir_attachment(osv.osv):
     
     check = tools.cache()(check)
         
-    def search(self, cr, uid, *args, **kwargs):
-        ids = super(ir_attachment, self).search(cr, uid, *args, **kwargs)
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+            context=None, count=False):
+        ids = super(ir_attachment, self).search(cr, uid, args, offset=offset, 
+                                                limit=limit, order=order, 
+                                                context=context, count=False)
         if not ids:
+            if count:
+                return 0
             return []
         models = super(ir_attachment,self).read(cr, uid, ids, ['id', 'res_model'])
         cache = {}
@@ -59,7 +56,11 @@ class ir_attachment(osv.osv):
                 if not cache[m['res_model']]:
                     ids.remove(m['id'])
                 continue
-            cache[m['res_model']] = ima.check(cr, uid, m['res_model'], 'read', raise_exception=False)
+            cache[m['res_model']] = ima.check(cr, uid, m['res_model'], 'read',
+                                              raise_exception=False)
+
+        if count:
+            return len(ids)
         return ids
 
     def read(self, cr, uid, ids, *args, **kwargs):