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

[FIX] revert ir_values on document 

bzr revid: al@openerp.com-20120626201946-44c5odspvbttqyv1
This commit is contained in:
Antony Lesuisse 2012-06-26 22:19:46 +02:00
parent ce583333f9
commit c180a7f941
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/document/document.py
View File

@ -143,7 +143,8 @@ class document_file(osv.osv):
_defaults = { _defaults = {
'user_id': lambda self, cr, uid, ctx:uid, '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 = [ _sql_constraints = [
# filename_uniq is not possible in pure SQL # filename_uniq is not possible in pure SQL

5
addons/document/document_data.xml
View File

@ -104,10 +104,5 @@
<!-- After we have setup the root directory, migrate the attachments <!-- After we have setup the root directory, migrate the attachments
to point to that. --> to point to that. -->
<function model="ir.attachment" name="_attach_parent_id"/> <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> </data>
</openerp> </openerp>

2
addons/document_ftp/ftpserver/__init__.py
View File

@ -47,7 +47,7 @@ def start_server():
ftpserver.log = lambda msg: _logger.info(msg) ftpserver.log = lambda msg: _logger.info(msg)
ftpserver.logline = lambda msg: None ftpserver.logline = lambda msg: None
ftpserver.logerror = lambda msg: self.logger.error(msg) ftpserver.logerror = lambda msg: _logger.error(msg)
ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler) ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
ftpd.serve_forever() ftpd.serve_forever()