odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merge document changes 

bzr revid: sbh@tinyerp.com-20120618101205-twulesbgj19vnpan
This commit is contained in:
Sbh (Openerp) 2012-06-18 15:42:05 +05:30
parent cc70376580 ceb22841d6
commit e9c9f91b3c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/document/document.py
View File

@ -140,8 +140,7 @@ class document_file(osv.osv):
_defaults = {
'user_id': lambda self, cr, uid, ctx:uid,
'file_size': lambda self, cr, uid, ctx:0,
'parent_id': __get_def_directory
'file_size': lambda self, cr, uid, ctx:0
}
_sql_constraints = [
# filename_uniq is not possible in pure SQL

6
addons/document/document_data.xml
View File

@ -104,6 +104,10 @@
<!-- After we have setup the root directory, migrate the attachments
to point to that. -->
<function model="ir.attachment" name="_attach_parent_id"/>
<function
eval="('default',False,'parent_id', [('document.directory', False)], ref('document.dir_root'), True, False, False, False, True)"
id="document_default_set"
model="ir.values"
name="set"/>
</data>
</openerp>