diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-09-17 13:44:55 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-09-17 13:44:55 +0200 |
| commit | ccb15e76f64f324f2dc2e446cac43f05c3a0aab2 (patch) | |
| tree | 4f9f7732b0071ba48544d3767591545ada04265f /addons/document | |
| parent | 7488a675b4d9a8e99cf2b9b25c194e114babcafb (diff) | |
| parent | 84094e0c39bf20499aefccc6c78143aeb2227d18 (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
Diffstat (limited to 'addons/document')
60 files changed, 455 insertions, 448 deletions
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index d8e42703efc..212965a8162 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -29,7 +29,7 @@ This is a complete document management system. ============================================== * User Authentication - * Document Indexation :- .pptx and .docx files are not supported in Windows platform. + * Document Indexation:- .pptx and .docx files are not supported in Windows platform. * Dashboard for Document that includes: * New Files (list) * Files by Resource Type (graph) @@ -37,16 +37,16 @@ This is a complete document management system. * Files Size by Month (graph) ATTENTION: - - When you install this module in a running company that have already PDF files stored into the database, - you will lose them all. +---------- + - When you install this module in a running company that have already PDF + files stored into the database, you will lose them all. - After installing this module PDF's are no longer stored into the database, but in the servers rootpad like /server/bin/filestore. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['process','board', 'knowledge'], - 'init_xml': [], - 'update_xml': [ + 'data': [ 'security/document_security.xml', 'document_view.xml', 'document_data.xml', @@ -55,10 +55,8 @@ ATTENTION: 'report/document_report_view.xml', 'board_document_view.xml', ], - 'demo_xml': [ 'document_demo.xml','board_document_demo.xml'], - 'test': [ - 'test/document_test2.yml', - ], + 'demo': [ 'document_demo.xml','board_document_demo.xml'], + 'test': ['test/document_test2.yml'], 'installable': True, 'auto_install': False, 'certificate': '0070515416461', diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index 38e4a16ad85..986b054383f 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -4,14 +4,10 @@ <record model="ir.ui.view" id="board_document_manager_form"> <field name="name">board.document.manager.form</field> <field name="model">board.board</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Document board" version="7.0"> <board style="2-1" > <column> - <action string="New Files" - name="%(document.action_view_all_document_tree1)d" - view_mode="tree,form"/> <action string="Files by Month" name="%(document.action_view_files_by_month_graph)d" view_mode="graph,tree"/> diff --git a/addons/document/content_index.py b/addons/document/content_index.py index f24c033a7ec..4cf3c8dfed2 100644 --- a/addons/document/content_index.py +++ b/addons/document/content_index.py @@ -93,13 +93,13 @@ class indexer(object): except NhException: pass - raise NhException('No appropriate method to index file') + raise NhException('No appropriate method to index file.') def _doIndexContent(self,content): - raise NhException("Content not handled here") + raise NhException("Content cannot be handled here.") def _doIndexFile(self,fpath): - raise NhException("Content not handled here") + raise NhException("Content cannot be handled here.") def __repr__(self): return "<indexer %s.%s>" %(self.__module__, self.__class__.__name__) @@ -116,7 +116,7 @@ def mime_match(mime, mdict): return (None, None) class contentIndex(object): - + def __init__(self): self.mimes = {} self.exts = {} @@ -132,9 +132,9 @@ class contentIndex(object): f = True if f: - _logger.debug('Register content indexer: %r', obj) + _logger.debug('Register content indexer: %r.', obj) if not f: - raise Exception("Your indexer should at least suport a mimetype or extension") + raise Exception("Your indexer should at least support a mimetype or extension.") def doIndex(self, content, filename=None, content_type=None, realfname = None, debug=False): fobj = None @@ -169,22 +169,22 @@ class contentIndex(object): (result, _) = pop.communicate() mime2 = result.split(';')[0] - _logger.debug('File gave us: %s', mime2) + _logger.debug('File gives us: %s', mime2) # Note that the temporary file still exists now. mime,fobj = mime_match(mime2, self.mimes) if not mime: mime = mime2 except Exception: - _logger.exception('Cannot determine mime type') + _logger.exception('Cannot determine mime type.') try: if fobj: res = (mime, fobj.indexContent(content,filename,fname or realfname) ) else: - _logger.debug("Have no object, return (%s, None)", mime) + _logger.debug("Have no object, return (%s, None).", mime) res = (mime, None ) except Exception: - _logger.exception("Could not index file %s (%s)", + _logger.exception("Cannot index file %s (%s).", filename, fname or realfname) res = None @@ -193,7 +193,7 @@ class contentIndex(object): try: os.unlink(fname) except Exception: - _logger.exception("Could not unlink %s", fname) + _logger.exception("Cannot unlink %s.", fname) return res cntIndex = contentIndex() diff --git a/addons/document/document.py b/addons/document/document.py index fa65f8d9966..3ee52f8e4fb 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -23,7 +23,7 @@ import base64 from osv import osv, fields import os -# from psycopg2 import Binary +#from psycopg2 import Binary #from tools import config import tools from tools.translate import _ @@ -37,8 +37,8 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo class document_file(osv.osv): _inherit = 'ir.attachment' _rec_name = 'datas_fname' - - + + def _attach_parent_id(self, cr, uid, ids=None, context=None): """Migrate ir.attachments to the document module. @@ -61,7 +61,7 @@ class document_file(osv.osv): return False if ids is not None: - raise NotImplementedError("Ids is just there by convention! Don't use it yet, please.") + raise NotImplementedError("Ids are just there by convention, please do not use it.") cr.execute("UPDATE ir_attachment " \ "SET parent_id = %s, db_datas = decode(encode(db_datas,'escape'), 'base64') " \ @@ -294,7 +294,7 @@ class document_file(osv.osv): ('datas_fname', '=', vals['datas_fname']), ] attach_ids = self.search(cr, uid, domain, context=context) - super(document_file, self).write(cr, uid, attach_ids, + super(document_file, self).write(cr, uid, attach_ids, {'datas' : vals['datas']}, context=context) result = attach_ids[0] @@ -339,7 +339,7 @@ class document_file(osv.osv): if r: unres.append(r) else: - self.loggerdoc.warning("Unlinking attachment #%s %s that has no storage", + self.loggerdoc.warning("Unlinking attachment #%s %s that has no storage.", f.id, f.name) res = super(document_file, self).unlink(cr, uid, ids, context) stor.do_unlink(cr, uid, unres) diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 03b2dcc47bf..1ead23ab402 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -69,7 +69,7 @@ class document_directory(osv.osv): } - def _get_root_directory(self, cr,uid, context=None): + def _get_root_directory(self, cr, uid, context=None): objid=self.pool.get('ir.model.data') try: mid = objid._get_id(cr, uid, 'document', 'dir_root') @@ -77,9 +77,7 @@ class document_directory(osv.osv): return False root_id = objid.read(cr, uid, mid, ['res_id'])['res_id'] return root_id - except Exception, e: - - _logger.warning('Cannot set directory root:'+ str(e)) + except Exception: return False return objid.browse(cr, uid, mid, context=context).res_id @@ -108,7 +106,7 @@ class document_directory(osv.osv): _sql_constraints = [ ('dirname_uniq', 'unique (name,parent_id,ressource_id,ressource_parent_type_id)', 'The directory name must be unique !'), ('no_selfparent', 'check(parent_id <> id)', 'Directory cannot be parent of itself!'), - ('dir_parented', 'check(parent_id IS NOT NULL OR storage_id IS NOT NULL)', 'Directory must have a parent or a storage') + ('dir_parented', 'check(parent_id IS NOT NULL OR storage_id IS NOT NULL)', 'Directory must have a parent or a storage.') ] def name_get(self, cr, uid, ids, context=None): res = [] @@ -153,7 +151,7 @@ class document_directory(osv.osv): return True _constraints = [ - (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id']) + (_check_recursion, 'Error! You cannot create recursive directories.', ['parent_id']) ] def __init__(self, *args, **kwargs): @@ -179,7 +177,7 @@ class document_directory(osv.osv): def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None): """Retrieve the class of nodes for this directory - + This function can be overriden by inherited classes ;) @param dbro The browse object, if caller already has it """ @@ -193,17 +191,17 @@ class document_directory(osv.osv): elif dbro.type == 'ressource': return nodes.node_res_dir else: - raise ValueError("dir node for %s type", dbro.type) + raise ValueError("dir node for %s type.", dbro.type) def _prepare_context(self, cr, uid, nctx, context=None): """ Fill nctx with properties for this database @param nctx instance of nodes.node_context, to be filled @param context ORM context (dict) for us - - Note that this function is called *without* a list of ids, + + Note that this function is called *without* a list of ids, it should behave the same for the whole database (based on the ORM instance of document.directory). - + Some databases may override this and attach properties to the node_context. See WebDAV, CalDAV. """ diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py index 339b320e9a7..21cb4f9dcf4 100644 --- a/addons/document/document_storage.py +++ b/addons/document/document_storage.py @@ -52,7 +52,7 @@ For data /storage/ we have the cases: Have (ir.attachment, context), we modify the file (save, update, rename etc). Have (directory, context), we create a file. Have (path, context), we create or modify a file. - + Note that in all above cases, we don't explicitly choose the storage media, but always require a context to be present. @@ -61,7 +61,7 @@ nodes, for once, won't. Their metadata will be computed by the parent storage media + directory. The algorithm says that in any of the above cases, our first goal is to locate -the node for any combination of search criteria. It would be wise NOT to +the node for any combination of search criteria. It would be wise NOT to represent each node in the path (like node[/] + node[/dir1] + node[/dir1/dir2]) but directly jump to the end node (like node[/dir1/dir2]) whenever possible. @@ -99,13 +99,13 @@ class nodefd_file(nodes.node_descriptor): mode = mode[:-1] self.mode = mode self._size = os.stat(path).st_size - + for attr in ('closed', 'read', 'write', 'seek', 'tell', 'next'): setattr(self,attr, getattr(self.__file, attr)) def size(self): return self._size - + def __iter__(self): return self @@ -122,7 +122,7 @@ class nodefd_file(nodes.node_descriptor): filename = par.path if isinstance(filename, (tuple, list)): filename = '/'.join(filename) - + try: mime, icont = cntIndex.doIndex(None, filename=filename, content_type=None, realfname=fname) @@ -173,7 +173,7 @@ class nodefd_db(StringIO, nodes.node_descriptor): self._size = 0L if mode.endswith('b'): mode = mode[:-1] - + if mode in ('r', 'r+'): cr = ira_browse._cr # reuse the cursor of the browse object, just now cr.execute('SELECT db_datas FROM ir_attachment WHERE id = %s',(ira_browse.id,)) @@ -188,8 +188,8 @@ class nodefd_db(StringIO, nodes.node_descriptor): elif mode == 'a': StringIO.__init__(self, None) else: - _logger.error("Incorrect mode %s specified", mode) - raise IOError(errno.EINVAL, "Invalid file mode") + _logger.error("Incorrect mode %s is specified.", mode) + raise IOError(errno.EINVAL, "Invalid file mode.") self.mode = mode def size(self): @@ -209,7 +209,7 @@ class nodefd_db(StringIO, nodes.node_descriptor): filename = par.path if isinstance(filename, (tuple, list)): filename = '/'.join(filename) - + try: mime, icont = cntIndex.doIndex(data, filename=filename, content_type=None, realfname=None) @@ -238,7 +238,7 @@ class nodefd_db(StringIO, nodes.node_descriptor): (out, len(data), par.file_id)) cr.commit() except Exception: - _logger.exception('Cannot update db file #%d for close:', par.file_id) + _logger.exception('Cannot update db file #%d for close.', par.file_id) raise finally: cr.close() @@ -246,7 +246,7 @@ class nodefd_db(StringIO, nodes.node_descriptor): class nodefd_db64(StringIO, nodes.node_descriptor): """ A descriptor to db data, base64 (the old way) - + It stores the data in base64 encoding at the db. Not optimal, but the transparent compression of Postgres will save the day. """ @@ -255,7 +255,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor): self._size = 0L if mode.endswith('b'): mode = mode[:-1] - + if mode in ('r', 'r+'): data = base64.decodestring(ira_browse.db_datas) if data: @@ -268,8 +268,8 @@ class nodefd_db64(StringIO, nodes.node_descriptor): elif mode == 'a': StringIO.__init__(self, None) else: - _logger.error("Incorrect mode %s specified", mode) - raise IOError(errno.EINVAL, "Invalid file mode") + _logger.error("Incorrect mode %s is specified.", mode) + raise IOError(errno.EINVAL, "Invalid file mode.") self.mode = mode def size(self): @@ -289,7 +289,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor): filename = par.path if isinstance(filename, (tuple, list)): filename = '/'.join(filename) - + try: mime, icont = cntIndex.doIndex(data, filename=filename, content_type=None, realfname=None) @@ -317,7 +317,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor): (base64.encodestring(data), len(data), par.file_id)) cr.commit() except Exception: - _logger.exception('Cannot update db file #%d for close:', par.file_id) + _logger.exception('Cannot update db file #%d for close.', par.file_id) raise finally: cr.close() @@ -330,7 +330,7 @@ class document_storage(osv.osv): media. The referring document.directory-ies will control the placement of data into the storage. - + It is a bad idea to have multiple document.storage objects pointing to the same tree of filesystem storage. """ @@ -384,12 +384,12 @@ class document_storage(osv.osv): def __prepare_realpath(self, cr, file_node, ira, store_path, do_create=True): """ Cleanup path for realstore, create dirs if needed - + @param file_node the node @param ira ir.attachment browse of the file_node @param store_path the path of the parent storage object, list @param do_create create the directories, if needed - + @return tuple(path "/var/filestore/real/dir/", npath ['dir','fname.ext'] ) """ file_node.fix_ppath(cr, ira) @@ -401,10 +401,10 @@ class document_storage(osv.osv): # self._logger.debug('Npath: %s', npath) for n in npath: if n == '..': - raise ValueError("Invalid '..' element in path") + raise ValueError("Invalid '..' element in path.") for ch in ('*', '|', "\\", '/', ':', '"', '<', '>', '?',): if ch in n: - raise ValueError("Invalid char %s in path %s" %(ch, n)) + raise ValueError("Invalid char %s in path %s." %(ch, n)) dpath = [store_path,] dpath += npath[:-1] path = os.path.join(*dpath) @@ -420,8 +420,8 @@ class document_storage(osv.osv): """ boo = self.browse(cr, uid, id, context=context) if not boo.online: - raise IOError(errno.EREMOTE, 'medium offline') - + raise IOError(errno.EREMOTE, 'Medium offline.') + if fil_obj: ira = fil_obj else: @@ -435,11 +435,11 @@ class document_storage(osv.osv): context = {} boo = self.browse(cr, uid, id, context=context) if not boo.online: - raise IOError(errno.EREMOTE, 'medium offline') - + raise IOError(errno.EREMOTE, 'Medium offline.') + if boo.readonly and mode not in ('r', 'rb'): - raise IOError(errno.EPERM, "Readonly medium") - + raise IOError(errno.EPERM, "Readonly medium.") + ira = self.pool.get('ir.attachment').browse(cr, uid, file_node.file_id, context=context) if boo.type == 'filestore': if not ira.store_fname: @@ -447,8 +447,8 @@ class document_storage(osv.osv): # try to fix their directory. if mode in ('r','r+'): if ira.file_size: - _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id) - raise IOError(errno.ENOENT, 'No file can be located') + _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore. This should get fixed." % ira.id) + raise IOError(errno.ENOENT, 'No file can be located.') else: store_fname = self.__get_random_fname(boo.path) cr.execute('UPDATE ir_attachment SET store_fname = %s WHERE id = %s', @@ -470,7 +470,7 @@ class document_storage(osv.osv): do_create = (mode[0] in ('w','a')) ) fpath = os.path.join(path, npath[-1]) if (not os.path.exists(fpath)) and mode[0] == 'r': - raise IOError("File not found: %s" % fpath) + raise IOError("File not found: %s." % fpath) elif mode[0] in ('w', 'a') and not ira.store_fname: store_fname = os.path.join(*npath) cr.execute('UPDATE ir_attachment SET store_fname = %s WHERE id = %s', @@ -478,10 +478,10 @@ class document_storage(osv.osv): return nodefd_file(file_node, path=fpath, mode=mode) elif boo.type == 'virtual': - raise ValueError('Virtual storage does not support static files') - + raise ValueError('Virtual storage does not support static file(s).') + else: - raise TypeError("No %s storage" % boo.type) + raise TypeError("No %s storage." % boo.type) def __get_data_3(self, cr, uid, boo, ira, context): if boo.type == 'filestore': @@ -489,7 +489,7 @@ class document_storage(osv.osv): # On a migrated db, some files may have the wrong storage type # try to fix their directory. if ira.file_size: - _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id) + _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore. This should get fixed." % ira.id) return None fpath = os.path.join(boo.path, ira.store_fname) return file(fpath, 'rb').read() @@ -521,13 +521,13 @@ class document_storage(osv.osv): elif not ira.store_fname: return None else: - raise IOError(errno.ENOENT, "File not found: %s" % fpath) + raise IOError(errno.ENOENT, "File not found: %s." % fpath) elif boo.type == 'virtual': - raise ValueError('Virtual storage does not support static files') + raise ValueError('Virtual storage does not support static file(s).') else: - raise TypeError("No %s storage" % boo.type) + raise TypeError("No %s storage!" % boo.type) def set_data(self, cr, uid, id, file_node, data, context=None, fil_obj=None): """ store the data. @@ -541,12 +541,12 @@ class document_storage(osv.osv): ira = self.pool.get('ir.attachment').browse(cr, uid, file_node.file_id, context=context) if not boo.online: - raise IOError(errno.EREMOTE, 'medium offline') - + raise IOError(errno.EREMOTE, 'Medium offline.') + if boo.readonly: - raise IOError(errno.EPERM, "Readonly medium") + raise IOError(errno.EPERM, "Readonly medium.") - _logger.debug( "Store data for ir.attachment #%d" % ira.id) + _logger.debug( "Store data for ir.attachment #%d." % ira.id) store_fname = None fname = None if boo.type == 'filestore': @@ -557,15 +557,15 @@ class document_storage(osv.osv): fp = open(fname, 'wb') try: fp.write(data) - finally: + finally: fp.close() - _logger.debug( "Saved data to %s" % fname) + _logger.debug( "Saved data to %s." % fname) filesize = len(data) # os.stat(fname).st_size - + # TODO Here, an old file would be left hanging. except Exception, e: - _logger.warning( "Couldn't save data to %s", path, exc_info=True) + _logger.warning( "Cannot save data to %s.", path, exc_info=True) raise except_orm(_('Error!'), str(e)) elif boo.type == 'db': filesize = len(data) @@ -586,21 +586,21 @@ class document_storage(osv.osv): fp = open(fname,'wb') try: fp.write(data) - finally: + finally: fp.close() - _logger.debug("Saved data to %s", fname) + _logger.debug("Saved data to %s.", fname) filesize = len(data) # os.stat(fname).st_size store_fname = os.path.join(*npath) # TODO Here, an old file would be left hanging. except Exception,e : - _logger.warning("Couldn't save data:", exc_info=True) + _logger.warning("Cannot save data.", exc_info=True) raise except_orm(_('Error!'), str(e)) elif boo.type == 'virtual': - raise ValueError('Virtual storage does not support static files') + raise ValueError('Virtual storage does not support static file(s).') else: - raise TypeError("No %s storage" % boo.type) + raise TypeError("No %s storage!" % boo.type) # 2nd phase: store the metadata try: @@ -612,7 +612,7 @@ class document_storage(osv.osv): mime, icont = cntIndex.doIndex(data, ira.datas_fname, ira.file_type or None, fname) except Exception: - _logger.debug('Cannot index file:', exc_info=True) + _logger.debug('Cannot index file.', exc_info=True) pass try: @@ -629,7 +629,7 @@ class document_storage(osv.osv): file_node.content_type = mime return True except Exception, e : - self._logger.warning("Couldn't save data:", exc_info=True) + self._logger.warning("Cannot save data.", exc_info=True) # should we really rollback once we have written the actual data? # at the db case (only), that rollback would be safe raise except_orm(_('Error at doc write!'), str(e)) @@ -639,10 +639,10 @@ class document_storage(osv.osv): files that have to be removed, too. """ if not storage_bo.online: - raise IOError(errno.EREMOTE, 'medium offline') - + raise IOError(errno.EREMOTE, 'Medium offline.') + if storage_bo.readonly: - raise IOError(errno.EPERM, "Readonly medium") + raise IOError(errno.EPERM, "Readonly medium.") if storage_bo.type == 'filestore': fname = fil_bo.store_fname @@ -659,7 +659,7 @@ class document_storage(osv.osv): path = storage_bo.path return ( storage_bo.id, 'file', os.path.join(path, fname)) else: - raise TypeError("No %s storage" % storage_bo.type) + raise TypeError("No %s storage!" % storage_bo.type) def do_unlink(self, cr, uid, unres): for id, ktype, fname in unres: @@ -667,9 +667,9 @@ class document_storage(osv.osv): try: os.unlink(fname) except Exception: - _logger.warning("Could not remove file %s, please remove manually.", fname, exc_info=True) + _logger.warning("Cannot remove file %s, please remove it manually.", fname, exc_info=True) else: - _logger.warning("Unknown unlink key %s" % ktype) + _logger.warning("Unlink unknown key %s." % ktype) return True @@ -677,17 +677,17 @@ class document_storage(osv.osv): """ A preparation for a file rename. It will not affect the database, but merely check and perhaps rename the realstore file. - + @return the dict of values that can safely be be stored in the db. """ sbro = self.browse(cr, uid, file_node.storage_id, context=context) assert sbro, "The file #%d didn't provide storage" % file_node.file_id if not sbro.online: - raise IOError(errno.EREMOTE, 'medium offline') - + raise IOError(errno.EREMOTE, 'Medium offline.') + if sbro.readonly: - raise IOError(errno.EPERM, "Readonly medium") + raise IOError(errno.EPERM, "Readonly medium.") if sbro.type in ('filestore', 'db', 'db64'): # nothing to do for a rename, allow to change the db field @@ -699,9 +699,9 @@ class document_storage(osv.osv): fname = ira.store_fname if not fname: - _logger.warning("Trying to rename a non-stored file") + _logger.warning("Trying to rename a non-stored file.") if fname != os.path.join(*npath): - _logger.warning("inconsistency in realstore: %s != %s" , fname, repr(npath)) + _logger.warning("Inconsistency to realstore: %s != %s." , fname, repr(npath)) oldpath = os.path.join(path, npath[-1]) newpath = os.path.join(path, new_name) @@ -711,13 +711,13 @@ class document_storage(osv.osv): store_fname = os.path.join(*store_path) return { 'name': new_name, 'datas_fname': new_name, 'store_fname': store_fname } else: - raise TypeError("No %s storage" % sbro.type) + raise TypeError("No %s storage!" % sbro.type) def simple_move(self, cr, uid, file_node, ndir_bro, context=None): """ A preparation for a file move. It will not affect the database, but merely check and perhaps move the realstore file. - + @param ndir_bro a browse object of document.directory, where this file should move to. @return the dict of values that can safely be be stored in the db. @@ -726,10 +726,10 @@ class document_storage(osv.osv): assert sbro, "The file #%d didn't provide storage" % file_node.file_id if not sbro.online: - raise IOError(errno.EREMOTE, 'medium offline') - + raise IOError(errno.EREMOTE, 'Medium offline.') + if sbro.readonly: - raise IOError(errno.EPERM, "Readonly medium") + raise IOError(errno.EPERM, "Readonly medium.") par = ndir_bro psto = None @@ -739,8 +739,8 @@ class document_storage(osv.osv): break par = par.parent_id if file_node.storage_id != psto: - _logger.debug('Cannot move file %r from %r to %r', file_node, file_node.parent, ndir_bro.name) - raise NotImplementedError('Cannot move files between storage media') + _logger.debug('Cannot move file %r from %r to %r.', file_node, file_node.parent, ndir_bro.name) + raise NotImplementedError('Cannot move file(s) between storage media.') if sbro.type in ('filestore', 'db', 'db64'): # nothing to do for a rename, allow to change the db field @@ -752,30 +752,30 @@ class document_storage(osv.osv): fname = ira.store_fname if not fname: - _logger.warning("Trying to rename a non-stored file") + _logger.warning("Trying to rename a non-stored file.") if fname != os.path.join(*opath): - _logger.warning("inconsistency in realstore: %s != %s" , fname, repr(opath)) + _logger.warning("Inconsistency to realstore: %s != %s." , fname, repr(opath)) oldpath = os.path.join(path, opath[-1]) - + npath = [sbro.path,] + (ndir_bro.get_full_path() or []) npath = filter(lambda x: x is not None, npath) newdir = os.path.join(*npath) if not os.path.isdir(newdir): - _logger.debug("Must create dir %s", newdir) + _logger.debug("Must create dir %s.", newdir) os.makedirs(newdir) npath.append(opath[-1]) newpath = os.path.join(*npath) - - _logger.debug("Going to move %s from %s to %s", opath[-1], oldpath, newpath) + + _logger.debug("Going to move %s from %s to %s.", opath[-1], oldpath, newpath) shutil.move(oldpath, newpath) - + store_path = npath[1:] + [opath[-1],] store_fname = os.path.join(*store_path) - + return { 'store_fname': store_fname } else: - raise TypeError("No %s storage" % sbro.type) + raise TypeError("No %s storage." % sbro.type) document_storage() diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 1b1864cabe0..b631583fb27 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <openerp> <data> <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/> @@ -5,7 +6,6 @@ <record model="ir.ui.view" id="view_document_storage_form"> <field name="name">document.storage</field> <field name="model">document.storage</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Storage Media"> <group col="4"> @@ -25,7 +25,6 @@ <record model="ir.ui.view" id="view_document_storage_tree"> <field name="name">document.storage</field> <field name="model">document.storage</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Storage Media" toolbar="1"> <field name="name"/> @@ -37,11 +36,9 @@ <record id="view_document_storage_filter" model="ir.ui.view"> <field name="name">Search View: Document Storage</field> <field name="model">document.storage</field> - <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Document Storage"> <field name="name" string="Document Storage"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> @@ -67,7 +64,6 @@ <record model="ir.ui.view" id="view_document_directory_form"> <field name="name">document.directory</field> <field name="model">document.directory</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Directories" col="4" version="7.0"> <group col="4"> @@ -150,7 +146,6 @@ <record model="ir.ui.view" id="view_document_directory_tree"> <field name="name">document.directory</field> <field name="model">document.directory</field> - <field name="type">tree</field> <field name="field_parent">child_ids</field> <field name="arch" type="xml"> <tree string="Directories" toolbar="1"> @@ -168,24 +163,18 @@ <record id="view_document_directory_filter" model="ir.ui.view"> <field name="name">Search View: Document Directory</field> <field name="model">document.directory</field> - <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Document Directory"> <field name="name" string="Document Directory"/> - <separator orientation="vertical"/> <filter string="Static" domain="[('type','=','directory')]"/> <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/> - <separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/> <field name="storage_id" /> <field name="user_id" /> - <newline/> <group expand="0" string="Group By..."> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> </group> </search> @@ -237,7 +226,6 @@ <field name="name">ir.attachment</field> <field name="model">ir.attachment</field> <field name="priority" eval="1"/> - <field name="type">form</field> <field name="inherit_id" ref="base.view_attachment_form"/> <field name="arch" type="xml"> <field name="url" position="after"> @@ -265,15 +253,10 @@ <record id="view_attach_filter_inherit0" model="ir.ui.view"> <field name="name">IR Attachment0</field> <field name="model">ir.attachment</field> - <field name="type">search</field> <field name="inherit_id" ref="base.view_attachment_search"/> <field name="arch" type="xml"> <xpath expr="//filter[@name='my_documents_filter']" position="replace"> - <filter name="my_documents_filter" - string="My Document(s)" - icon="terp-personal" - domain="[('user_id','=',uid)]" - help="Filter on my documents"/> + <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/> </xpath> <xpath expr="//field[@name='create_uid']" position="replace"> <field name="user_id"/> @@ -288,7 +271,6 @@ <field name="name">IR Attachment2</field> <field name="model">ir.attachment</field> - <field name="type">search</field> <field name="inherit_id" ref="base.view_attachment_search"/> <field name="arch" type="xml"> <filter string="Owner" position="replace"> @@ -303,10 +285,9 @@ <record model="ir.ui.view" id="view_document_file_tree"> <field name="name">ir.attachment</field> <field name="model">ir.attachment</field> - <field name="type">tree</field> <field name="priority" eval="1"/> <field name="arch" type="xml"> - <tree colors="blue:type in ('url',)"> + <tree colors="blue:type in ('url',)" string="Attachments"> <field name="name"/> <field name="parent_id" /> <field name="user_id"/> @@ -325,7 +306,14 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">ir.attachment</field> <field name="view_type">form</field> - <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field> + <field name="help" type="html"> + <p class="oe_view_nocontent_create"> + Click to create a new document. + </p><p> + The Documents repository gives you access to all attachments, such + as mails, project documents, invoices etc. + </p> + </field> </record> <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/> <menuitem @@ -363,8 +351,7 @@ <record model="ir.ui.view" id="view_process_node_form_inherit1"> <field name="name">process.node.form</field> <field name="model">process.node</field> - <field name="type">form</field> - <field name="inherit_id" ref="process.view_process_node_form"/> + <field name="inherit_id" ref="process.view_process_node_form"/> <field name="priority" eval="1"/> <field name="arch" type="xml"> <field name="subflow_id" position="after"> @@ -377,8 +364,7 @@ <record model="ir.ui.view" id="view_process_form_inherit1"> <field name="name">process.process.form</field> <field name="model">process.process</field> - <field name="type">form</field> - <field name="inherit_id" ref="process.view_process_form"/> + <field name="inherit_id" ref="process.view_process_form"/> <field name="priority" eval="1"/> <field name="arch" type="xml"> <field name="subflow_id" position="after"> diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po index 57a52f0fc9e..d2ef2aef2af 100644 --- a/addons/document/i18n/ar.po +++ b/addons/document/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 @@ -40,7 +40,7 @@ msgstr "لوحة المستندات" #. module: document #: model:ir.model,name:document.model_process_node msgid "Process Node" -msgstr "" +msgstr "طرف المعالجات" #. module: document #: view:document.directory:0 diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po index feaebfdfd6d..eca85f00ad7 100644 --- a/addons/document/i18n/bg.po +++ b/addons/document/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po index fa7ddf2ae92..4e68d5aa0f0 100644 --- a/addons/document/i18n/bs.po +++ b/addons/document/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po index dce2fb35da0..5966795072a 100644 --- a/addons/document/i18n/ca.po +++ b/addons/document/i18n/ca.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po index 9409f6a3150..62dd1dde6b0 100644 --- a/addons/document/i18n/cs.po +++ b/addons/document/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" "X-Poedit-Language: Czech\n" #. module: document diff --git a/addons/document/i18n/da.po b/addons/document/i18n/da.po index 7f8fcc15f76..b0aa4b8ab29 100644 --- a/addons/document/i18n/da.po +++ b/addons/document/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po index 63309da23d8..aae303c2bba 100644 --- a/addons/document/i18n/de.po +++ b/addons/document/i18n/de.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po index 2a10c05228c..fb4ff67a53d 100644 --- a/addons/document/i18n/el.po +++ b/addons/document/i18n/el.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po index 794a855563e..56d03fb1b94 100644 --- a/addons/document/i18n/es.po +++ b/addons/document/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po index 5c1db3f5206..fff2544d5be 100644 --- a/addons/document/i18n/es_AR.po +++ b/addons/document/i18n/es_AR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/es_CR.po b/addons/document/i18n/es_CR.po index f5572c48847..65c17cb402a 100644 --- a/addons/document/i18n/es_CR.po +++ b/addons/document/i18n/es_CR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" "Language: \n" #. module: document diff --git a/addons/document/i18n/es_EC.po b/addons/document/i18n/es_EC.po index 03763353bc0..6cf54ff2182 100644 --- a/addons/document/i18n/es_EC.po +++ b/addons/document/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/es_PY.po b/addons/document/i18n/es_PY.po index 88b87eb62fc..9871351d1c4 100644 --- a/addons/document/i18n/es_PY.po +++ b/addons/document/i18n/es_PY.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po index 8686ce9a86b..ef4c30f5cf5 100644 --- a/addons/document/i18n/et.po +++ b/addons/document/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po index 4509b7d42bf..26d2bd11b39 100644 --- a/addons/document/i18n/fi.po +++ b/addons/document/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po index 06e3c7ea05a..c4b6d0b4d5f 100644 --- a/addons/document/i18n/fr.po +++ b/addons/document/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po index 191759e9deb..26dadbbfb9d 100644 --- a/addons/document/i18n/gl.po +++ b/addons/document/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/gu.po b/addons/document/i18n/gu.po index d61b0111f4a..d96e2dbcdd6 100644 --- a/addons/document/i18n/gu.po +++ b/addons/document/i18n/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po index 37aa19a74c9..0e5af91b729 100644 --- a/addons/document/i18n/hi.po +++ b/addons/document/i18n/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po index 1575c33f059..1b089c87c5c 100644 --- a/addons/document/i18n/hr.po +++ b/addons/document/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" "Language: hr\n" #. module: document diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po index 979fd05f0a4..fbb576107a3 100644 --- a/addons/document/i18n/hu.po +++ b/addons/document/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po index 9c7eef21ed0..2c562e9ed95 100644 --- a/addons/document/i18n/id.po +++ b/addons/document/i18n/id.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po index 6c65a2061d9..dd97c943c1f 100644 --- a/addons/document/i18n/it.po +++ b/addons/document/i18n/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/ja.po b/addons/document/i18n/ja.po index 7b408dd7546..f2c12bd7209 100644 --- a/addons/document/i18n/ja.po +++ b/addons/document/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po index 29823323c24..9faf8699a5e 100644 --- a/addons/document/i18n/ko.po +++ b/addons/document/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po index 69356897c6b..fc958406b2a 100644 --- a/addons/document/i18n/lt.po +++ b/addons/document/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/lv.po b/addons/document/i18n/lv.po index 46c3901f86d..a84a9d5ed56 100644 --- a/addons/document/i18n/lv.po +++ b/addons/document/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po index e235e41359f..28ea8eadb76 100644 --- a/addons/document/i18n/mn.po +++ b/addons/document/i18n/mn.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po index 0f073355adb..cb78afbdb86 100644 --- a/addons/document/i18n/nl.po +++ b/addons/document/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po index 2d5dfd4ee07..2985401bf32 100644 --- a/addons/document/i18n/nl_BE.po +++ b/addons/document/i18n/nl_BE.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po index 24091c7d2bd..227e07eb2d0 100644 --- a/addons/document/i18n/pl.po +++ b/addons/document/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po index c74c36db7a4..40b86960004 100644 --- a/addons/document/i18n/pt.po +++ b/addons/document/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po index 3287ce425aa..695f106083a 100644 --- a/addons/document/i18n/pt_BR.po +++ b/addons/document/i18n/pt_BR.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-05-10 17:58+0000\n" -"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2012-07-28 18:51+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"<webmaster@guaru.net>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 @@ -385,6 +386,8 @@ msgid "" "When executing this wizard, it will configure your directories automatically " "according to modules installed." msgstr "" +"Quando executar este assistente, ele irá configurar seus diretórios " +"automaticamente de acordo com os módulos instalados." #. module: document #: field:document.directory.content,directory_id:0 @@ -558,6 +561,8 @@ msgid "" "Along with Parent Model, this ID attaches this folder to a specific record " "of Parent Model." msgstr "" +"Junto com o Modelo Parente, este ID anexa esta pasta para um registro " +"específico ou um Modelo Parente" #. module: document #: selection:report.document.user,month:0 @@ -613,6 +618,10 @@ msgid "" "record, just like attachments. Don't put a parent directory if you select a " "parent model." msgstr "" +"Se você colocar um objeto aqui, este modelo de diretório aparecerá abaixo " +"desses objetos. Alguns diretórios são \"Anexados\" a um modelo ou registro " +"específico, como anexos. Não coloque um diretório parente se você " +"selecionar um modelo parente." #. module: document #: view:document.directory:0 @@ -695,6 +704,11 @@ msgid "" "attached to the document, or to print and download any report. This tool " "will create directories automatically according to modules installed." msgstr "" +"O sistema de controle de documentos do OpenErp suporta mapear pastas " +"virtuais com documentos. A pasta virtual de um documento pode ser usada para " +"gerenciar os arquivos anexados ao documento, os para exibir ou fazer " +"download de qualquer relatório. Esta ferramenta irá criar diretórios " +"automaticamente de acordo com os módulos instalados." #. module: document #: view:board.board:0 @@ -744,12 +758,12 @@ msgstr "Armazenamento externo de arquivo" #: model:ir.actions.act_window,name:document.action_view_wall #: view:report.document.wall:0 msgid "Wall of Shame" -msgstr "" +msgstr "Mural da Vergonha" #. module: document #: help:document.storage,path:0 msgid "For file storage, the root path of the storage" -msgstr "" +msgstr "Para armazenamento de arquivos, o caminho raiz do armazenamento" #. module: document #: model:ir.model,name:document.model_report_files_partner @@ -764,7 +778,7 @@ msgstr "Campo" #. module: document #: model:ir.model,name:document.model_document_directory_dctx msgid "Directory Dynamic Context" -msgstr "" +msgstr "Diretório Dinâmico" #. module: document #: field:document.directory,ressource_parent_type_id:0 @@ -814,7 +828,7 @@ msgstr "Todos Arquivos do Usuário" #. module: document #: model:ir.model,name:document.model_report_document_wall msgid "Users that did not inserted documents since one month" -msgstr "" +msgstr "Usuários não inseriram documentos a mais de um mês" #. module: document #: model:ir.actions.act_window,help:document.action_document_file_form @@ -822,11 +836,13 @@ msgid "" "The Documents repository gives you access to all attachments, such as mails, " "project documents, invoices etc." msgstr "" +"O repositório de documentos lhe dá acesso a todos os anexos, como emails, " +"documentos de projetos, faturas, etc" #. module: document #: view:document.directory:0 msgid "For each entry here, virtual files will appear in this folder." -msgstr "" +msgstr "Para cada entrada aqui, arquivos virtuais irão aparecer nesta pasta" #. module: document #: model:ir.model,name:document.model_ir_attachment @@ -851,7 +867,7 @@ msgstr "Arquivos Por Parceiro" #. module: document #: view:ir.attachment:0 msgid "Indexed Content - experimental" -msgstr "" +msgstr "Conteúdo Indexado - experimental" #. module: document #: view:report.document.user:0 @@ -877,6 +893,11 @@ msgid "" "resources automatically possess sub-directories for each of resource types " "defined in the parent directory." msgstr "" +"Cada diretório pode ter o tipo Estático ou ser anexado a um outro recurso. " +"Um diretório estático, como em sistemas operacionais, é o formato clássico " +"que contém um conjunto de arquivos. Os diretórios anexados em recursos de " +"sistema automaticamente possuem sub-diretórios para cada tipo de recurso " +"definido no diretório pai" #. module: document #: selection:report.document.user,month:0 @@ -896,6 +917,8 @@ msgid "" "The name of the field. Note that the prefix \"dctx_\" will be prepended to " "what is typed here." msgstr "" +"Nome do campo. Note que o prefixo \"dctx_\" será preposto ao que for " +"digitado aqui." #. module: document #: field:document.directory,name:0 @@ -951,6 +974,8 @@ msgid "" "These groups, however, do NOT apply to children directories, which must " "define their own groups." msgstr "" +"Estes grupos, no entanto, NÃO se aplicam a diretórios filhos, que precisam " +"definir seus próprios grupos." #. module: document #: field:document.directory.content.type,mimetype:0 @@ -960,7 +985,7 @@ msgstr "Mime Type" #. module: document #: view:report.document.user:0 msgid "All Months Files" -msgstr "" +msgstr "Arquivos de todos os meses" #. module: document #: field:document.directory.content,name:0 @@ -982,7 +1007,7 @@ msgstr "Armazenamento interno de arquivo" #. module: document #: sql_constraint:document.directory:0 msgid "Directory must have a parent or a storage" -msgstr "" +msgstr "O diretório precisa ter um pai ou um armazenamento" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_tree diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po index ddf1fda034f..db47b206b59 100644 --- a/addons/document/i18n/ro.po +++ b/addons/document/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po index eb1fe9de414..2705617a161 100644 --- a/addons/document/i18n/ru.po +++ b/addons/document/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/sk.po b/addons/document/i18n/sk.po index 72e57360c79..0cc487b6548 100644 --- a/addons/document/i18n/sk.po +++ b/addons/document/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po index 54ab0b52198..eb12a442bfa 100644 --- a/addons/document/i18n/sl.po +++ b/addons/document/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/sq.po b/addons/document/i18n/sq.po index e86e15545bf..8356f5f9a20 100644 --- a/addons/document/i18n/sq.po +++ b/addons/document/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po index c2a5faae5d7..72acfdddd06 100644 --- a/addons/document/i18n/sr.po +++ b/addons/document/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/sr@latin.po b/addons/document/i18n/sr@latin.po index 9604310a685..a096766532b 100644 --- a/addons/document/i18n/sr@latin.po +++ b/addons/document/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po index 7c79bf357cf..c8eaa4357b2 100644 --- a/addons/document/i18n/sv.po +++ b/addons/document/i18n/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po index 9dbb2aa8540..41b373f151e 100644 --- a/addons/document/i18n/tlh.po +++ b/addons/document/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po index fef07952f46..e9e94073d66 100644 --- a/addons/document/i18n/tr.po +++ b/addons/document/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 @@ -385,6 +385,8 @@ msgid "" "When executing this wizard, it will configure your directories automatically " "according to modules installed." msgstr "" +"Bu sihirbazı yürütürken, dizinlerinizi otomatikmen kurulu bulunan modüllere " +"göre yapılandıracaktır." #. module: document #: field:document.directory.content,directory_id:0 @@ -697,6 +699,11 @@ msgid "" "attached to the document, or to print and download any report. This tool " "will create directories automatically according to modules installed." msgstr "" +"OpenERP Belge Yönetim Sistemi sanal klasörlerin belgelerle " +"eşleştirilmelerini destekler. Bir belgenin sanal klasörü belgelere ekli " +"dosyaların yönetilmesi ya da herhangi bir raporu yazdırmak ve indirmek için " +"kullanılır. Bu araç, kurulu bulunan modüllere göre dizinleri otomatikmen " +"oluşturacaktır." #. module: document #: view:board.board:0 @@ -881,6 +888,10 @@ msgid "" "resources automatically possess sub-directories for each of resource types " "defined in the parent directory." msgstr "" +"Her dizin hem Statik türde hem de başka bir kaynağa bağlantılı olabilir. Bir " +"statik dizin, İşletim Sisteminde olduğu gibi, bir takım dosyaların bulunduğu " +"klasik dizindir. Sistem kaynaklarına bağlantılı dizinler, ana dizinde " +"tanımlanan her kaynak türü için otomatikman alt dizinlere sahiptir." #. module: document #: selection:report.document.user,month:0 diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po index 419dd6519e3..03fff842b39 100644 --- a/addons/document/i18n/uk.po +++ b/addons/document/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/vi.po b/addons/document/i18n/vi.po index 419ce89872e..b286c555c10 100644 --- a/addons/document/i18n/vi.po +++ b/addons/document/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po index 2a39b8be1e8..4521ee4d950 100644 --- a/addons/document/i18n/zh_CN.po +++ b/addons/document/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/zh_HK.po b/addons/document/i18n/zh_HK.po index 383fe8bea95..32690ccb60e 100644 --- a/addons/document/i18n/zh_HK.po +++ b/addons/document/i18n/zh_HK.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n" +"X-Generator: Launchpad (build 15864)\n" #. module: document #: field:document.directory,parent_id:0 diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po index 241f7d772a9..84e7f3c7cfa 100644 --- a/addons/document/i18n/zh_TW.po +++ b/addons/document/i18n/zh_TW.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2011-01-28 03:53+0000\n" -"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n" -"Language-Team: \n" +"PO-Revision-Date: 2012-08-30 11:51+0000\n" +"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n" +"Language-Team: Cenoq Corp.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:12+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n" +"X-Generator: Launchpad (build 15887)\n" #. module: document #: field:document.directory,parent_id:0 @@ -35,7 +35,7 @@ msgstr "名稱欄位" #. module: document #: view:board.board:0 msgid "Document board" -msgstr "" +msgstr "文件佈告欄" #. module: document #: model:ir.model,name:document.model_process_node @@ -58,7 +58,7 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。 #: view:document.directory:0 #: view:document.storage:0 msgid "Group By..." -msgstr "分組根據..." +msgstr "分類方式..." #. module: document #: model:ir.model,name:document.model_document_directory_content_type @@ -79,7 +79,7 @@ msgstr "檔案" #. module: document #: view:report.files.partner:0 msgid "Files per Month" -msgstr "" +msgstr "當月文件" #. module: document #: selection:report.document.user,month:0 @@ -90,12 +90,12 @@ msgstr "三月" #. module: document #: view:document.configuration:0 msgid "title" -msgstr "" +msgstr "抬頭" #. module: document #: field:document.directory.dctx,expr:0 msgid "Expression" -msgstr "表達式" +msgstr "表達方式" #. module: document #: view:document.directory:0 @@ -111,7 +111,7 @@ msgstr "目錄內容" #. module: document #: view:document.directory:0 msgid "Dynamic context" -msgstr "" +msgstr "動態背景" #. module: document #: model:ir.ui.menu,name:document.menu_document_management_configuration @@ -125,11 +125,14 @@ msgid "" "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference " "to the current record, in dynamic folders" msgstr "" +"A python expression used to evaluate the field.\n" +"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference " +"to the current record, in dynamic folders" #. module: document #: view:report.document.user:0 msgid "This Year" -msgstr "本年" +msgstr "今年" #. module: document #: field:document.storage,path:0 @@ -146,7 +149,7 @@ msgstr "目錄名不能重覆！" #. module: document #: view:ir.attachment:0 msgid "Filter on my documents" -msgstr "" +msgstr "過濾我的文件" #. module: document #: field:ir.attachment,index_content:0 @@ -158,12 +161,12 @@ msgstr "已索引內容" msgid "" "If true, all attachments that match this resource will be located. If " "false, only ones that have this as parent." -msgstr "" +msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，只有符合資源的附件會被歸屬。" #. module: document #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config msgid "Knowledge Management" -msgstr "" +msgstr "知識管理" #. module: document #: view:document.directory:0 @@ -175,7 +178,7 @@ msgstr "目錄" #. module: document #: model:ir.model,name:document.model_report_document_user msgid "Files details by Users" -msgstr "各用戶檔案詳情" +msgstr "各使用者檔案詳情" #. module: document #: code:addons/document/document_storage.py:573 @@ -187,17 +190,17 @@ msgstr "錯誤！" #. module: document #: field:document.directory,resource_find_all:0 msgid "Find all resources" -msgstr "" +msgstr "尋找所有資源" #. module: document #: selection:document.directory,type:0 msgid "Folders per resource" -msgstr "" +msgstr "按資源歸類檔案夾" #. module: document #: field:document.directory.content,suffix:0 msgid "Suffix" -msgstr "後綴" +msgstr "字尾" #. module: document #: field:report.document.user,change_date:0 @@ -207,7 +210,7 @@ msgstr "修改日期" #. module: document #: view:document.configuration:0 msgid "Knowledge Application Configuration" -msgstr "" +msgstr "文管設定" #. module: document #: view:ir.attachment:0 @@ -219,7 +222,7 @@ msgstr "伙伴" #. module: document #: view:board.board:0 msgid "Files by Users" -msgstr "各用戶檔案" +msgstr "使用者檔案" #. module: document #: field:process.node,directory_id:0 @@ -239,7 +242,7 @@ msgstr "檢驗錯誤" #. module: document #: model:ir.model,name:document.model_ir_actions_report_xml msgid "ir.actions.report.xml" -msgstr "" +msgstr "ir.actions.report.xml" #. module: document #: model:ir.actions.act_window,name:document.action_document_file_form @@ -252,13 +255,13 @@ msgstr "文件" #. module: document #: constraint:document.directory:0 msgid "Error! You can not create recursive Directories." -msgstr "" +msgstr "錯誤! 您不可以建立循環目錄。" #. module: document #: view:document.directory:0 #: field:document.directory,storage_id:0 msgid "Storage" -msgstr "" +msgstr "存儲器" #. module: document #: field:document.directory,ressource_type_id:0 @@ -292,28 +295,28 @@ msgstr "類型" msgid "" "Select an object here and there will be one folder per record of that " "resource." -msgstr "" +msgstr "在這裡選擇一個目標，這個資源將會是一筆記錄一個檔案夾" #. module: document #: help:document.directory,domain:0 msgid "" "Use a domain if you want to apply an automatic filter on visible resources." -msgstr "" +msgstr "請使用一個領域，如果您要將可見的資源自動過濾。" #. module: document #: model:ir.actions.act_window,name:document.action_view_files_by_partner msgid "Files Per Partner" -msgstr "" +msgstr "夥伴文件" #. module: document #: field:document.directory,dctx_ids:0 msgid "Context fields" -msgstr "脈絡欄位" +msgstr "內文欄位" #. module: document #: field:ir.attachment,store_fname:0 msgid "Stored Filename" -msgstr "" +msgstr "儲存名稱" #. module: document #: view:document.directory:0 @@ -336,7 +339,7 @@ msgstr "七月" #: model:ir.actions.act_window,name:document.open_board_document_manager #: model:ir.ui.menu,name:document.menu_reports_document_manager msgid "Document Dashboard" -msgstr "文件儀錶板" +msgstr "文件控制台" #. module: document #: field:document.directory.content.type,code:0 @@ -346,7 +349,7 @@ msgstr "延伸檔案" #. module: document #: view:ir.attachment:0 msgid "Created" -msgstr "" +msgstr "已建立" #. module: document #: field:document.directory,content_ids:0 @@ -356,25 +359,25 @@ msgstr "虛擬檔案" #. module: document #: view:ir.attachment:0 msgid "Modified" -msgstr "" +msgstr "已修改" #. module: document #: code:addons/document/document_storage.py:639 #, python-format msgid "Error at doc write!" -msgstr "" +msgstr "文件書寫錯誤!" #. module: document #: view:document.directory:0 msgid "Generated Files" -msgstr "" +msgstr "已產生檔案" #. module: document #: view:document.configuration:0 msgid "" "When executing this wizard, it will configure your directories automatically " "according to modules installed." -msgstr "" +msgstr "執行這個精靈，它會根據已安裝的模組自動組態您的目錄。" #. module: document #: field:document.directory.content,directory_id:0 @@ -397,7 +400,7 @@ msgstr "安全" #: field:document.storage,write_uid:0 #: field:ir.attachment,write_uid:0 msgid "Last Modification User" -msgstr "最後修改用戶" +msgstr "最後修改使用者" #. module: document #: model:ir.actions.act_window,name:document.act_res_partner_document @@ -425,7 +428,7 @@ msgstr "各目錄檔案詳情" #. module: document #: view:report.document.user:0 msgid "All users files" -msgstr "所有用戶檔案" +msgstr "所有使用者檔案" #. module: document #: view:board.board:0 @@ -453,18 +456,18 @@ msgstr "靜態目錄" #. module: document #: field:document.directory,child_ids:0 msgid "Children" -msgstr "" +msgstr "子目錄" #. module: document #: view:document.directory:0 msgid "Define words in the context, for all child directories and files" -msgstr "" +msgstr "在內文中定義所有的子目錄及檔案" #. module: document #: help:document.storage,online:0 msgid "" "If not checked, media is currently offline and its contents not available" -msgstr "" +msgstr "如果未檢查，媒體已離線且其內容也無法使用。" #. module: document #: view:document.directory:0 @@ -475,7 +478,7 @@ msgstr "" #: field:report.document.user,user_id:0 #: field:report.document.wall,user_id:0 msgid "Owner" -msgstr "" +msgstr "擁有人" #. module: document #: view:document.directory:0 @@ -492,7 +495,7 @@ msgstr "內容" #: field:document.storage,create_date:0 #: field:report.document.user,create_date:0 msgid "Date Created" -msgstr "" +msgstr "產生的日期" #. module: document #: help:document.directory.content,include_name:0 @@ -501,12 +504,14 @@ msgid "" "name.\n" "If set, the directory will have to be a resource one." msgstr "" +"如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n" +"如果設定, 這個目錄將會是第一個資源" #. module: document #: view:document.configuration:0 #: model:ir.actions.act_window,name:document.action_config_auto_directory msgid "Configure Directories" -msgstr "" +msgstr "目錄組態" #. module: document #: field:document.directory.content,include_name:0 @@ -521,26 +526,26 @@ msgstr "附件" #. module: document #: field:ir.actions.report.xml,model_id:0 msgid "Model Id" -msgstr "" +msgstr "模型 Id" #. module: document #: field:document.storage,online:0 msgid "Online" -msgstr "" +msgstr "在線上" #. module: document #: help:document.directory,ressource_tree:0 msgid "" "Check this if you want to use the same tree structure as the object selected " "in the system." -msgstr "" +msgstr "檢查這個項目，如果您要在系統中使用相同的樹狀結構當作選擇的目標。" #. module: document #: help:document.directory,ressource_id:0 msgid "" "Along with Parent Model, this ID attaches this folder to a specific record " "of Parent Model." -msgstr "" +msgstr "隨著母模型，這個ID在這個檔案夾附屬在母模型的特定記錄上。" #. module: document #: selection:report.document.user,month:0 @@ -551,7 +556,7 @@ msgstr "八月" #. module: document #: sql_constraint:document.directory:0 msgid "Directory cannot be parent of itself!" -msgstr "" +msgstr "目錄不能作自己的母目錄!" #. module: document #: selection:report.document.user,month:0 @@ -563,7 +568,7 @@ msgstr "六月" #: field:report.document.user,user:0 #: field:report.document.wall,user:0 msgid "User" -msgstr "用戶" +msgstr "使用者" #. module: document #: field:document.directory,group_ids:0 @@ -574,7 +579,7 @@ msgstr "群組" #. module: document #: field:document.directory.content.type,active:0 msgid "Active" -msgstr "" +msgstr "啟用" #. module: document #: selection:report.document.user,month:0 @@ -596,6 +601,8 @@ msgid "" "record, just like attachments. Don't put a parent directory if you select a " "parent model." msgstr "" +"如果您在這裡放置一個目標，這個目錄範本將會出現下列所有目標。這種目錄是 \"附件\" " +"於特定的模型或記錄，就像附屬文件。如果您選擇一個母模型，就不要放置母目錄。" #. module: document #: view:document.directory:0 @@ -611,7 +618,7 @@ msgstr "十月" #. module: document #: view:document.directory:0 msgid "Seq." -msgstr "" +msgstr "Seq." #. module: document #: selection:document.storage,type:0 @@ -637,12 +644,12 @@ msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_reports_document msgid "Dashboard" -msgstr "儀錶板" +msgstr "控制台" #. module: document #: model:ir.actions.act_window,name:document.action_view_user_graph msgid "Files By Users" -msgstr "各用戶檔案" +msgstr "各使用者檔案" #. module: document #: field:document.storage,readonly:0 @@ -652,7 +659,7 @@ msgstr "唯讀" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_form msgid "Document Directory" -msgstr "" +msgstr "文件目錄" #. module: document #: sql_constraint:document.directory:0 @@ -663,12 +670,12 @@ msgstr "目錄名不能重覆！" #: field:document.directory,create_uid:0 #: field:document.storage,create_uid:0 msgid "Creator" -msgstr "" +msgstr "建置者" #. module: document #: field:document.directory.content,sequence:0 msgid "Sequence" -msgstr "" +msgstr "順序" #. module: document #: view:document.configuration:0 @@ -678,6 +685,8 @@ msgid "" "attached to the document, or to print and download any report. This tool " "will create directories automatically according to modules installed." msgstr "" +"OpenERP's " +"文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。" #. module: document #: view:board.board:0 @@ -695,7 +704,7 @@ msgstr "九月" #. module: document #: field:document.directory.content,prefix:0 msgid "Prefix" -msgstr "前綴" +msgstr "字尾" #. module: document #: field:report.document.wall,last:0 @@ -710,7 +719,7 @@ msgstr "檔案名稱" #. module: document #: view:document.configuration:0 msgid "res_config_contents" -msgstr "" +msgstr "res_config_contents" #. module: document #: field:document.directory,ressource_id:0 @@ -720,19 +729,19 @@ msgstr "資源ID" #. module: document #: selection:document.storage,type:0 msgid "External file storage" -msgstr "" +msgstr "外部檔案儲存" #. module: document #: view:board.board:0 #: model:ir.actions.act_window,name:document.action_view_wall #: view:report.document.wall:0 msgid "Wall of Shame" -msgstr "" +msgstr "排行榜" #. module: document #: help:document.storage,path:0 msgid "For file storage, the root path of the storage" -msgstr "" +msgstr "關於檔案儲存，儲存的根路徑" #. module: document #: model:ir.model,name:document.model_report_files_partner @@ -747,17 +756,17 @@ msgstr "欄位" #. module: document #: model:ir.model,name:document.model_document_directory_dctx msgid "Directory Dynamic Context" -msgstr "" +msgstr "目錄動態內文" #. module: document #: field:document.directory,ressource_parent_type_id:0 msgid "Parent Model" -msgstr "" +msgstr "母模型" #. module: document #: view:report.document.user:0 msgid "Files by users" -msgstr "各用戶檔案" +msgstr "各使用者檔案" #. module: document #: field:report.document.file,month:0 @@ -771,12 +780,12 @@ msgstr "月" #. module: document #: view:report.document.user:0 msgid "This Months Files" -msgstr "" +msgstr "當月檔案" #. module: document #: model:ir.ui.menu,name:document.menu_reporting msgid "Reporting" -msgstr "報告" +msgstr "報表" #. module: document #: field:document.directory,ressource_tree:0 @@ -792,29 +801,29 @@ msgstr "五月" #. module: document #: model:ir.actions.act_window,name:document.action_view_all_document_tree1 msgid "All Users files" -msgstr "所有用戶檔案" +msgstr "所有使用者檔案" #. module: document #: model:ir.model,name:document.model_report_document_wall msgid "Users that did not inserted documents since one month" -msgstr "" +msgstr "使用者已經一個月未插入文件" #. module: document #: model:ir.actions.act_window,help:document.action_document_file_form msgid "" "The Documents repository gives you access to all attachments, such as mails, " "project documents, invoices etc." -msgstr "" +msgstr "文件儲存室讓您可以存取所有附件，如電郵、專案文件、商業發票等" #. module: document #: view:document.directory:0 msgid "For each entry here, virtual files will appear in this folder." -msgstr "" +msgstr "對於每一輸入，虛擬檔案在檔案夾中出現" #. module: document #: model:ir.model,name:document.model_ir_attachment msgid "ir.attachment" -msgstr "" +msgstr "ir.attachment" #. module: document #: view:board.board:0 @@ -834,7 +843,7 @@ msgstr "各伙伴檔案" #. module: document #: view:ir.attachment:0 msgid "Indexed Content - experimental" -msgstr "" +msgstr "已索引內容 - 實驗性質" #. module: document #: view:report.document.user:0 @@ -844,12 +853,12 @@ msgstr "本月" #. module: document #: view:ir.attachment:0 msgid "Notes" -msgstr "注解" +msgstr "備註" #. module: document #: model:ir.model,name:document.model_document_configuration msgid "Directory Configuration" -msgstr "" +msgstr "目錄組態" #. module: document #: help:document.directory,type:0 @@ -860,6 +869,8 @@ msgid "" "resources automatically possess sub-directories for each of resource types " "defined in the parent directory." msgstr "" +"每一個目錄可以是靜態或連接於另一個資源。一個靜態的目錄與其作業系統，是一個典型的目錄可以包含一組檔案。這個目錄連接於系統資源，在母目錄中按資源別自動持有次" +"目錄。" #. module: document #: selection:report.document.user,month:0 @@ -871,14 +882,14 @@ msgstr "二月" #: model:ir.actions.act_window,name:document.open_board_document_manager1 #: model:ir.ui.menu,name:document.menu_reports_document_manager1 msgid "Statistics by User" -msgstr "各用戶統計" +msgstr "各使用者統計" #. module: document #: help:document.directory.dctx,field:0 msgid "" "The name of the field. Note that the prefix \"dctx_\" will be prepended to " "what is typed here." -msgstr "" +msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。" #. module: document #: field:document.directory,name:0 @@ -889,7 +900,7 @@ msgstr "名稱" #. module: document #: sql_constraint:document.storage:0 msgid "The storage path must be unique!" -msgstr "" +msgstr "儲存路徑不能重複!" #. module: document #: view:document.directory:0 @@ -899,7 +910,7 @@ msgstr "欄位" #. module: document #: help:document.storage,readonly:0 msgid "If set, media is for reading only" -msgstr "" +msgstr "如果設定，媒體只能唯讀。" #. module: document #: selection:report.document.user,month:0 @@ -918,21 +929,21 @@ msgstr "檔案數" #: code:addons/document/document.py:209 #, python-format msgid "(copy)" -msgstr "" +msgstr "(copy)" #. module: document #: view:document.directory:0 msgid "" "Only members of these groups will have access to this directory and its " "files." -msgstr "" +msgstr "只有這個群組中的數字，才能存取這個目錄及其檔案。" #. module: document #: view:document.directory:0 msgid "" "These groups, however, do NOT apply to children directories, which must " "define their own groups." -msgstr "" +msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。" #. module: document #: field:document.directory.content.type,mimetype:0 @@ -942,7 +953,7 @@ msgstr "Mime 類型" #. module: document #: view:report.document.user:0 msgid "All Months Files" -msgstr "" +msgstr "所有月份文件" #. module: document #: field:document.directory.content,name:0 @@ -959,12 +970,12 @@ msgstr "檔案名不能重覆！" #. module: document #: selection:document.storage,type:0 msgid "Internal File storage" -msgstr "" +msgstr "內部文件儲存" #. module: document #: sql_constraint:document.directory:0 msgid "Directory must have a parent or a storage" -msgstr "" +msgstr "目錄必須要有母目錄或儲存" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_tree @@ -1030,3 +1041,6 @@ msgstr "文件類型" #~ msgid "Product" #~ msgstr "產品" + +#~ msgid "Attached To" +#~ msgstr "附屬於" diff --git a/addons/document/nodes.py b/addons/document/nodes.py index 273be7effa4..f1c3c71a8e6 100644 --- a/addons/document/nodes.py +++ b/addons/document/nodes.py @@ -45,7 +45,7 @@ _logger = logging.getLogger(__name__) def _str2time(cre): """ Convert a string with time representation (from db) into time (float) - + Note: a place to fix if datetime is used in db. """ if not cre: @@ -62,7 +62,7 @@ def get_node_context(cr, uid, context): class node_context(object): """ This is the root node, representing access to some particular context - + A context is a set of persistent data, which may influence the structure of the nodes. All other transient information during a data query should be passed down with function arguments. @@ -99,7 +99,7 @@ class node_context(object): def __ne__(self, other): return not self.__eq__(other) - + def get(self, name, default=None): return self.context.get(name, default) @@ -119,7 +119,7 @@ class node_context(object): """Create (or locate) a node for a directory @param dbro a browse object of document.directory """ - + fullpath = dbro.get_full_path(context=self.context) klass = dbro.get_node_class(dbro, context=self.context) return klass(fullpath, None ,self, dbro) @@ -183,7 +183,7 @@ class node_descriptor(object): def __nonzero__(self): """ Ensure that a node_descriptor will never equal False - + Since we do define __len__ and __iter__ for us, we must avoid being regarded as non-true objects. """ @@ -244,7 +244,7 @@ class node_class(object): else: s.append(self.path) return s #map(lambda x: '/' +x, s) - + def __repr__(self): return "%s@/%s" % (self.our_type, '/'.join(self.full_path())) @@ -271,7 +271,7 @@ class node_class(object): return False def get_data(self,cr): - raise TypeError('no data for %s'% self.type) + raise TypeError('No data for %s.'% self.type) def open_data(self, cr, mode): """ Open a node_descriptor object for this node. @@ -285,10 +285,10 @@ class node_class(object): For this class, there is no data, so no implementation. Each child class that has data should override this. """ - raise TypeError('no data for %s' % self.type) + raise TypeError('No data for %s.' % self.type) def _get_storage(self,cr): - raise RuntimeError("no storage for base class") + raise RuntimeError("No storage for base class.") def get_etag(self,cr): """ Get a tag, unique per object + modification. @@ -323,11 +323,11 @@ class node_class(object): def get_dav_eprop(self, cr, ns, prop): if not self.DAV_M_NS: return None - + if self.DAV_M_NS.has_key(ns): prefix = self.DAV_M_NS[ns] else: - _logger.debug('No namespace: %s ("%s")',ns, prop) + _logger.debug('No namespace: %s ("%s").',ns, prop) return None mname = prefix + "_" + prop.replace('-','_') @@ -340,12 +340,12 @@ class node_class(object): r = m(cr) return r except AttributeError: - _logger.debug('Property %s not supported' % prop, exc_info=True) + _logger.debug('The property %s is not supported.' % prop, exc_info=True) return None def get_dav_resourcetype(self, cr): """ Get the DAV resource type. - + Is here because some nodes may exhibit special behaviour, like CalDAV/GroupDAV collections """ @@ -375,7 +375,7 @@ class node_class(object): could do various things. Should also consider node<->content, dir<->dir moves etc. - Move operations, as instructed from APIs (eg. request from DAV) could + Move operations, as instructed from APIs (e.g. request from DAV) could use this function. """ raise NotImplementedError(repr(self)) @@ -384,13 +384,13 @@ class node_class(object): """ Create a regular file under this node """ _logger.warning("Attempted to create a file under %r, not possible.", self) - raise IOError(errno.EPERM, "Not allowed to create files here") - + raise IOError(errno.EPERM, "Not allowed to create file(s) here.") + def create_child_collection(self, cr, objname): """ Create a child collection (directory) under self """ _logger.warning("Attempted to create a collection under %r, not possible.", self) - raise IOError(errno.EPERM, "Not allowed to create folders here") + raise IOError(errno.EPERM, "Not allowed to create folder(s) here.") def rm(self, cr): raise NotImplementedError(repr(self)) @@ -404,7 +404,7 @@ class node_class(object): def check_perms(self, perms): """ Check the permissions of the current node. - + @param perms either an integers of the bits to check, or a string with the permission letters @@ -414,7 +414,7 @@ class node_class(object): 4, r : allow read of file, or listing of dir contents 8, u : allow remove (unlink) """ - + if isinstance(perms, str): pe2 = 0 chars = { 'x': 1, 'w': 2, 'r': 4, 'u': 8 } @@ -423,10 +423,10 @@ class node_class(object): perms = pe2 elif isinstance(perms, int): if perms < 0 or perms > 15: - raise ValueError("Invalid permission bits") + raise ValueError("Invalid permission bits.") else: - raise ValueError("Invalid permission attribute") - + raise ValueError("Invalid permission attribute.") + return ((self.uidperms & perms) == perms) class node_database(node_class): @@ -463,9 +463,9 @@ class node_database(node_class): is_allowed = self.check_perms(1) else: is_allowed = self.check_perms(5) - + if not is_allowed: - raise IOError(errno.EPERM, "Permission into directory denied") + raise IOError(errno.EPERM, "Permission into directory denied.") if domain: where = where + domain @@ -493,7 +493,7 @@ def mkdosname(company_name, default='noname'): for c in company_name[:8]: n += (c in badchars and '_') or c return n - + def _uid2unixperms(perms, has_owner): """ Convert the uidperms and the owner flag to full unix bits @@ -543,7 +543,7 @@ class node_dir(node_database): try: self.dctx['dctx_' + dfld.field] = safe_eval(dfld.expr,dc2) except Exception,e: - print "Cannot eval %s" % dfld.expr + print "Cannot eval %s." % dfld.expr print e pass @@ -566,10 +566,10 @@ class node_dir(node_database): def _file_get(self, cr, nodename=False): res = super(node_dir,self)._file_get(cr, nodename) - + is_allowed = self.check_perms(nodename and 1 or 5) if not is_allowed: - raise IOError(errno.EPERM, "Permission into directory denied") + raise IOError(errno.EPERM, "Permission into directory denied.") cntobj = self.context._dirobj.pool.get('document.directory.content') uid = self.context.uid @@ -583,7 +583,7 @@ class node_dir(node_database): res.extend(res3) return res - + def _child_get(self, cr, name=None, domain=None): dirobj = self.context._dirobj uid = self.context.uid @@ -595,9 +595,9 @@ class node_dir(node_database): is_allowed = self.check_perms(1) else: is_allowed = self.check_perms(5) - + if not is_allowed: - raise IOError(errno.EPERM, "Permission into directory denied") + raise IOError(errno.EPERM, "Permission into directory denied.") if not domain: domain = [] @@ -633,20 +633,20 @@ class node_dir(node_database): if not directory: raise OSError(2, 'Not such file or directory.') if not self.check_perms('u'): - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") if directory._table_name=='document.directory': if self.children(cr): raise OSError(39, 'Directory not empty.') res = self.context._dirobj.unlink(cr, uid, [directory.id]) else: - raise OSError(1, 'Operation not permited.') + raise OSError(1, 'Operation is not permitted.') return res def create_child_collection(self, cr, objname): object2 = False if not self.check_perms(2): - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") dirobj = self.context._dirobj uid = self.context.uid @@ -654,7 +654,7 @@ class node_dir(node_database): ctx.update(self.dctx) obj = dirobj.browse(cr, uid, self.dir_id) if obj and (obj.type == 'ressource') and not object2: - raise OSError(1, 'Operation not permited.') + raise OSError(1, 'Operation is not permitted.') #objname = uri2[-1] val = { @@ -672,7 +672,7 @@ class node_dir(node_database): Return the node_* created """ if not self.check_perms(2): - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") dirobj = self.context._dirobj uid = self.context.uid @@ -702,10 +702,10 @@ class node_dir(node_database): Note /may/ be called with ndir_node = None, to rename the document root. """ if ndir_node and (ndir_node.context != self.context): - raise NotImplementedError("Cannot move directories between contexts") + raise NotImplementedError("Cannot move directories between contexts.") if (not self.check_perms('u')) or (not ndir_node.check_perms('w')): - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") dir_obj = self.context._dirobj if not fil_obj: @@ -724,13 +724,13 @@ class node_dir(node_database): assert self.parent if self.parent != ndir_node: - _logger.debug('Cannot move dir %r from %r to %r', self, self.parent, ndir_node) - raise NotImplementedError('Cannot move dir to another dir') + _logger.debug('Cannot move dir %r from %r to %r.', self, self.parent, ndir_node) + raise NotImplementedError('Cannot move dir to another dir.') ret = {} if new_name and (new_name != dbro.name): if ndir_node.child(cr, new_name): - raise IOError(errno.EEXIST, "Destination path already exists") + raise IOError(errno.EEXIST, "Destination path already exists.") ret['name'] = new_name del dbro @@ -832,7 +832,7 @@ class node_res_dir(node_class): elif isinstance(app, tuple): where.append(app) else: - raise RuntimeError("incorrect domain expr: %s" % self.domain) + raise RuntimeError("Incorrect domain expr: %s." % self.domain) if self.resm_id: where.append(('id','=',self.resm_id)) @@ -845,7 +845,7 @@ class node_res_dir(node_class): is_allowed = self.check_perms(5) if not is_allowed: - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") # print "Where clause for %s" % self.res_model, where if self.ressource_tree: @@ -864,10 +864,10 @@ class node_res_dir(node_class): if not res_name: continue # Yes! we can't do better but skip nameless records. - + # Escape the name for characters not supported in filenames res_name = res_name.replace('/','_') # any other weird char? - + if name and (res_name != ustr(name)): # we have matched _ to any character, but we only meant to match # the special ones. @@ -923,7 +923,7 @@ class node_res_obj(node_class): try: self.dctx[fld] = safe_eval(expr, dc2) except Exception,e: - print "Cannot eval %s for %s" % (expr, fld) + print "Cannot eval %s for %s." % (expr, fld) print e pass else: @@ -962,7 +962,7 @@ class node_res_obj(node_class): res = [] is_allowed = self.check_perms((nodename and 1) or 5) if not is_allowed: - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") cntobj = self.context._dirobj.pool.get('document.directory.content') uid = self.context.uid @@ -997,7 +997,7 @@ class node_res_obj(node_class): def get_dav_eprop_DEPR(self, cr, ns, prop): # Deprecated! if ns != 'http://groupdav.org/' or prop != 'resourcetype': - _logger.warning("Who asked for %s:%s?" % (ns, prop)) + _logger.warning("Who asks for %s:%s?" % (ns, prop)) return None cntobj = self.context._dirobj.pool.get('document.directory.content') uid = self.context.uid @@ -1016,7 +1016,7 @@ class node_res_obj(node_class): is_allowed = self.check_perms((name and 1) or 5) if not is_allowed: - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") uid = self.context.uid ctx = self.context.context.copy() @@ -1057,7 +1057,7 @@ class node_res_obj(node_class): where2 = where + [('parent_id','=',self.dir_id) ] ids = dirobj.search(cr, uid, where2, context=ctx) bo = obj.browse(cr, uid, self.res_id, context=ctx) - + for dirr in dirobj.browse(cr, uid, ids, context=ctx): if name and (name != dirr.name): continue @@ -1103,7 +1103,7 @@ class node_res_obj(node_class): dirobj = self.context._dirobj is_allowed = self.check_perms(2) if not is_allowed: - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") uid = self.context.uid ctx = self.context.context.copy() @@ -1114,7 +1114,7 @@ class node_res_obj(node_class): obj = dirobj.browse(cr, uid, self.dir_id) if obj and (obj.type == 'ressource') and not object2: - raise OSError(1, 'Operation not permited.') + raise OSError(1, 'Operation is not permitted.') val = { @@ -1135,7 +1135,7 @@ class node_res_obj(node_class): """ is_allowed = self.check_perms(2) if not is_allowed: - raise IOError(errno.EPERM,"Permission denied") + raise IOError(errno.EPERM,"Permission denied.") dirobj = self.context._dirobj uid = self.context.uid @@ -1177,14 +1177,14 @@ class node_file(node_class): self.write_date = fil.write_date or fil.create_date self.content_length = fil.file_size self.displayname = fil.name - + self.uidperms = 14 if parent: if not parent.check_perms('x'): self.uidperms = 0 elif not parent.check_perms('w'): self.uidperms = 4 - + try: self.uuser = (fil.user_id and fil.user_id.login) or 'nobody' except Exception: @@ -1213,9 +1213,9 @@ class node_file(node_class): def open_data(self, cr, mode): stor = self.storage_id - assert stor, "No storage for file #%s" % self.file_id + assert stor, "No storage for file #%s." % self.file_id if not self.check_perms(4): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") # If storage is not set properly, we are just screwed here, don't # try to get it from default. @@ -1225,7 +1225,7 @@ class node_file(node_class): def rm(self, cr): uid = self.context.uid if not self.check_perms(8): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") document_obj = self.context._dirobj.pool.get('ir.attachment') if self.type in ('collection','database'): return False @@ -1271,7 +1271,7 @@ class node_file(node_class): stor = self.storage_id assert stor, "No storage for file #%s" % self.file_id if not self.check_perms(4): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") # If storage is not set properly, we are just screwed here, don't # try to get it from default. @@ -1294,7 +1294,7 @@ class node_file(node_class): stor = self.storage_id assert stor, "No storage for file #%s" % self.file_id if not self.check_perms(2): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") stobj = self.context._dirobj.pool.get('document.storage') return stobj.set_data(cr, self.context.uid,stor, self, data, self.context.context, fil_obj) @@ -1304,31 +1304,31 @@ class node_file(node_class): def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False): if ndir_node and ndir_node.context != self.context: - raise NotImplementedError("Cannot move files between contexts") + raise NotImplementedError("Cannot move files between contexts.") if (not self.check_perms(8)) and ndir_node.check_perms(2): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") doc_obj = self.context._dirobj.pool.get('ir.attachment') if not fil_obj: dbro = doc_obj.browse(cr, self.context.uid, self.file_id, context=self.context.context) else: dbro = fil_obj - assert dbro.id == self.file_id, "%s != %s for %r" % (dbro.id, self.file_id, self) + assert dbro.id == self.file_id, "%s != %s for %r." % (dbro.id, self.file_id, self) if not dbro: - raise IndexError("Cannot locate doc %d", self.file_id) + raise IndexError("Cannot locate doc %d.", self.file_id) if (not self.parent): # there *must* be a parent node for this one self.parent = self.context.get_dir_node(cr, dbro.parent_id) assert self.parent - + ret = {} if ndir_node and self.parent != ndir_node: if not (isinstance(self.parent, node_dir) and isinstance(ndir_node, node_dir)): - _logger.debug('Cannot move file %r from %r to %r', self, self.parent, ndir_node) - raise NotImplementedError('Cannot move files between dynamic folders') + _logger.debug('Cannot move file %r from %r to %r.', self, self.parent, ndir_node) + raise NotImplementedError('Cannot move files between dynamic folders.') if not ndir_obj: ndir_obj = self.context._dirobj.browse(cr, self.context.uid, \ @@ -1343,7 +1343,7 @@ class node_file(node_class): if new_name and (new_name != dbro.name): if len(ret): - raise NotImplementedError("Cannot rename and move") # TODO + raise NotImplementedError("Cannot rename and move.") # TODO stobj = self.context._dirobj.pool.get('document.storage') r2 = stobj.simple_rename(cr, self.context.uid, self, new_name, self.context.context) ret.update(r2) @@ -1373,7 +1373,7 @@ class node_content(node_class): self.uidperms = parent.uidperms & 14 self.uuser = parent.uuser self.ugroup = parent.ugroup - + self.extension = cnt.extension self.report_id = cnt.report_id and cnt.report_id.id #self.mimetype = cnt.extension. @@ -1399,7 +1399,7 @@ class node_content(node_class): def get_data(self, cr, fil_obj = None): cntobj = self.context._dirobj.pool.get('document.directory.content') if not self.check_perms(4): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") ctx = self.context.context.copy() ctx.update(self.dctx) @@ -1416,14 +1416,14 @@ class node_content(node_class): elif mode in ('r+', 'w+'): cperms = 'rw' else: - raise IOError(errno.EINVAL, "Cannot open at mode %s" % mode) - + raise IOError(errno.EINVAL, "Cannot open at mode %s." % mode) + if not self.check_perms(cperms): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") ctx = self.context.context.copy() ctx.update(self.dctx) - + return nodefd_content(self, cr, mode, ctx) def get_data_len(self, cr, fil_obj = None): @@ -1438,7 +1438,7 @@ class node_content(node_class): def set_data(self, cr, data, fil_obj = None): cntobj = self.context._dirobj.pool.get('document.directory.content') if not self.check_perms(2): - raise IOError(errno.EPERM, "Permission denied") + raise IOError(errno.EPERM, "Permission denied.") ctx = self.context.context.copy() ctx.update(self.dctx) @@ -1451,7 +1451,7 @@ class node_content(node_class): return '' class nodefd_content(StringIO, node_descriptor): - + """ A descriptor to content nodes """ def __init__(self, parent, cr, mode, ctx): @@ -1473,8 +1473,8 @@ class nodefd_content(StringIO, node_descriptor): elif mode == 'a': StringIO.__init__(self, None) else: - _logger.error("Incorrect mode %s specified", mode) - raise IOError(errno.EINVAL, "Invalid file mode") + _logger.error("Incorrect mode %s is specified.", mode) + raise IOError(errno.EINVAL, "Invalid file mode.") self.mode = mode def size(self): @@ -1499,14 +1499,14 @@ class nodefd_content(StringIO, node_descriptor): raise NotImplementedError cr.commit() except Exception: - _logger.exception('Cannot update db content #%d for close:', par.cnt_id) + _logger.exception('Cannot update db content #%d for close.', par.cnt_id) raise finally: cr.close() StringIO.close(self) class nodefd_static(StringIO, node_descriptor): - + """ A descriptor to nodes with static data. """ def __init__(self, parent, cr, mode, ctx=None): @@ -1527,8 +1527,8 @@ class nodefd_static(StringIO, node_descriptor): elif mode == 'a': StringIO.__init__(self, None) else: - _logger.error("Incorrect mode %s specified", mode) - raise IOError(errno.EINVAL, "Invalid file mode") + _logger.error("Incorrect mode %s is specified.", mode) + raise IOError(errno.EINVAL, "Invalid file mode.") self.mode = mode def size(self): @@ -1552,7 +1552,7 @@ class nodefd_static(StringIO, node_descriptor): raise NotImplementedError cr.commit() except Exception: - _logger.exception('Cannot update db content #%d for close:', par.cnt_id) + _logger.exception('Cannot update db content #%d for close.', par.cnt_id) raise finally: cr.close() diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py index 7b09f131178..92e33c13746 100644 --- a/addons/document/report/document_report.py +++ b/addons/document/report/document_report.py @@ -32,7 +32,7 @@ class report_document_user(osv.osv): 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), 'user_id':fields.integer('Owner', readonly=True), - 'user':fields.char('User',size=64,readonly=True), + 'user': fields.related('user_id', 'name', type='char', size=64, readonly=True), 'directory': fields.char('Directory',size=64,readonly=True), 'datas_fname': fields.char('File Name',size=64,readonly=True), 'create_date': fields.datetime('Date Created', readonly=True), @@ -50,7 +50,6 @@ class report_document_user(osv.osv): to_char(f.create_date, 'YYYY') as name, to_char(f.create_date, 'MM') as month, f.user_id as user_id, - u.name as user, count(*) as nbr, d.name as directory, f.datas_fname as datas_fname, @@ -60,8 +59,7 @@ class report_document_user(osv.osv): f.write_date as change_date FROM ir_attachment f left join document_directory d on (f.parent_id=d.id and d.name<>'') - inner join res_users u on (f.user_id=u.id) - group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname + group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,d.type,f.write_date,f.datas_fname ) """) diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 98016d2fee2..2740967d53a 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -4,7 +4,6 @@ <record model="ir.ui.view" id="view_document_user_form"> <field name="name">report.document.user.form</field> <field name="model">report.document.user</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Files"> <field name="name"/> @@ -21,7 +20,6 @@ <record model="ir.ui.view" id="view_document_user_tree"> <field name="name">report.document.user.tree</field> <field name="model">report.document.user</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Files"> <field name="name"/> @@ -38,16 +36,10 @@ <record id="view_report_document_user_search" model="ir.ui.view"> <field name="name">report.document.user.search</field> <field name="model">report.document.user</field> - <field name="type">search</field> <field name="arch" type="xml"> <search string="All users files"> - <group> - <field name="name" - filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" - string="Users File"/> - <separator orientation="vertical"/> - <field name="month"/> - </group> + <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/> + <field name="month"/> </search> </field> </record> @@ -66,7 +58,6 @@ <record model="ir.ui.view" id="view_size_month"> <field name="name">report.document.user.graph</field> <field name="model">report.document.file</field> - <field name="type">graph</field> <field name="arch" type="xml"> <graph string="File Size by Month" type="line"> <field name="month"/> @@ -78,7 +69,6 @@ <record model="ir.ui.view" id="view_size_month_tree"> <field name="name">report.document.user.tree</field> <field name="model">report.document.file</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="File Size by Month"> <field name="month" /> @@ -99,7 +89,6 @@ <record model="ir.ui.view" id="view_files_by_month_graph"> <field name="name">report.file.month.graph</field> <field name="model">report.document.user</field> - <field name="type">graph</field> <field name="arch" type="xml"> <graph string="Files by Month" type="pie"> <field name="month" /> @@ -111,7 +100,6 @@ <record model="ir.ui.view" id="view_files_by_month_tree"> <field name="name">report.file.month.tree</field> <field name="model">report.document.user</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Files by Month"> <field name="name"/> @@ -124,10 +112,9 @@ <record model="ir.ui.view" id="view_files_by_user_graph"> <field name="name">report.file.user.graph</field> <field name="model">report.document.user</field> - <field name="type">graph</field> <field name="arch" type="xml"> <graph string="Files by User" type="pie"> - <field name="user" /> + <field name="user_id" /> <field name="nbr" operator="+"/> </graph> </field> diff --git a/addons/document/std_index.py b/addons/document/std_index.py index 49ac9a5c906..422590e127f 100644 --- a/addons/document/std_index.py +++ b/addons/document/std_index.py @@ -104,7 +104,7 @@ class DocIndex(indexer): except OSError: _logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0]) - _logger.debug("Trace of the failed file indexing attempt: ", exc_info=True) + _logger.debug("Trace of the failed file indexing attempt.", exc_info=True) return False cntIndex.register(DocIndex()) diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index d924e471aca..48b41f94500 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -1,9 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <record id="view_auto_config_form" model="ir.ui.view"> <field name="name">Auto Configure Directories</field> <field name="model">document.configuration</field> - <field name="type">form</field> <field name="inherit_id" ref="base.res_config_view_base"/> <field name="arch" type="xml"> <data> @@ -29,15 +29,9 @@ <field name="view_mode">form</field> <field name="target">new</field> </record> - - <record id="category_knowledge_mgmt_config" model="ir.actions.todo.category"> - <field name="name">Knowledge Management</field> - <field name="sequence">5</field> - </record> <record model="ir.actions.todo" id="config_auto_directory"> <field name="action_id" ref="action_config_auto_directory"/> - <field name="category_id" ref="category_knowledge_mgmt_config"/> <field name="type">automatic</field> </record> </data> |