[merge] merge stable/5.0 branch

bzr revid: hmo@tinyerp.com-20091104064625-8ufxibenj12wxj3o

1 files changed, 9 insertions, 5 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index 10b49ecabe9..3ce6a9d700f 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -530,17 +530,21 @@ class document_file(osv.osv):
                 result[id] = base64.encodestring(value)
             except:
                 result[id]=''
-
-            if context.get('bin_size', False):
-                result[id] = tools.human_size(len(result[id]))
-
+#            if context.get('bin_size', False):
+#                result[id] = tools.human_size(result[id])
         return result
 
     #
     # This code can be improved
     #
-    def _data_set(self, cr, obj, id, name, value, uid=None, context={}):
+    def _data_set(self, cr, uid, id, name, value, args=None, context={}):
         if not value:
+            filename = self.browse(cr, uid, id, context).store_fname
+            try:
+                os.unlink(os.path.join(self._get_filestore(cr), filename))
+            except:
+                pass
+            cr.execute('update ir_attachment set store_fname=NULL WHERE id=%s', (id,) )
             return True
         #if (not context) or context.get('store_method','fs')=='fs':
         try: