From 680c1231bd5bc3e6b68a3929644b30d29173de57 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 23 Jun 2010 11:13:14 +0530 Subject: [PATCH] [REVERT]: document: Reverted wrong changes in document in merge with trunk addons bzr revid: rpa@tinyerp.com-20100623054314-t3sb40ltid1sbadv --- addons/document/i18n/ru.po | 95 ++++++++++--------- .../document/wizard/document_configuration.py | 35 +++---- 2 files changed, 59 insertions(+), 71 deletions(-) diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po index 59a51cb9666..7f05e84d881 100644 --- a/addons/document/i18n/ru.po +++ b/addons/document/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-22 14:24+0000\n" -"Last-Translator: Чистый \n" +"PO-Revision-Date: 2010-04-13 05:32+0000\n" +"Last-Translator: grisha \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: 2010-06-23 03:53+0000\n" +"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document @@ -36,6 +36,8 @@ msgstr "" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: document #: field:ir.actions.report.xml,model_id:0 @@ -45,17 +47,17 @@ msgstr "" #. module: document #: constraint:document.directory:0 msgid "Error! You can not create recursive Directories." -msgstr "Ошибка! Вы не можете созадавать вложенные Директории." +msgstr "Ошибка! Вы не можете созадавать вложенные друг в друга директории." #. module: document #: model:ir.ui.menu,name:document.menu_document_configuration msgid "Document Configuration" -msgstr "Настройки документа" +msgstr "" #. module: document #: view:ir.attachment:0 msgid "Preview" -msgstr "Предварительный просмотр" +msgstr "Предпросмотр" #. module: document #: field:ir.attachment,store_method:0 @@ -82,7 +84,7 @@ msgstr "" #. module: document #: selection:document.directory,type:0 msgid "Other Resources" -msgstr "Другие ресурсы" +msgstr "" #. module: document #: field:document.directory,ressource_parent_type_id:0 @@ -102,7 +104,7 @@ msgstr "" #. module: document #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия." +msgstr "" #. module: document #: selection:document.directory,type:0 @@ -130,13 +132,13 @@ msgstr "" #. module: document #: field:document.directory,type:0 msgid "Type" -msgstr "Тип" +msgstr "" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_tree #: model:ir.ui.menu,name:document.menu_document_directories_tree msgid "Directorie's Structure" -msgstr "Структура папок" +msgstr "" #. module: document #: field:document.directory,parent_id:0 @@ -146,13 +148,13 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "File Information" -msgstr "Информация о файле" +msgstr "" #. module: document #: field:document.directory,file_ids:0 #: view:ir.attachment:0 msgid "Files" -msgstr "Файлы" +msgstr "" #. module: document #: field:ir.attachment,store_fname:0 @@ -163,17 +165,17 @@ msgstr "" #: field:document.directory,write_uid:0 #: field:ir.attachment,write_uid:0 msgid "Last Modification User" -msgstr "Последние изменения пользователя" +msgstr "" #. module: document #: view:document.configuration.wizard:0 msgid "Configure" -msgstr "Настройка" +msgstr "" #. module: document #: field:document.directory,ressource_tree:0 msgid "Tree Structure" -msgstr "Древовидная структура" +msgstr "" #. module: document #: field:ir.attachment,title:0 @@ -190,7 +192,7 @@ msgstr "" #. module: document #: model:ir.model,name:document.model_document_directory_content msgid "Directory Content" -msgstr "Содержимое папки" +msgstr "" #. module: document #: help:document.directory,ressource_parent_type_id:0 @@ -202,28 +204,28 @@ msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_document msgid "Document Management" -msgstr "Управление документами" +msgstr "" #. module: document #: selection:ir.attachment,store_method:0 msgid "Link" -msgstr "Ссылка" +msgstr "" #. module: document #: view:document.directory:0 msgid "Directory Type" -msgstr "Тип папки" +msgstr "" #. module: document #: field:document.directory,group_ids:0 #: field:ir.attachment,group_ids:0 msgid "Groups" -msgstr "Группы" +msgstr "" #. module: document #: field:document.directory.content,report_id:0 msgid "Report" -msgstr "Отчёт" +msgstr "" #. module: document #: help:document.configuration.wizard,host:0 @@ -231,7 +233,6 @@ msgid "" "Put here the server address or IP. Keep localhost if you don't know what to " "write." msgstr "" -"Укажите адрес сервера или IP. Укажите localhost если не знаете что писать." #. module: document #: view:document.configuration.wizard:0 @@ -259,12 +260,12 @@ msgstr "" #. module: document #: view:document.directory:0 msgid "Definition" -msgstr "Описание" +msgstr "" #. module: document #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра структуры!" +msgstr "Неправильный XML для просмотра архитектуры!" #. module: document #: model:ir.module.module,description:document.module_meta_information @@ -278,17 +279,17 @@ msgstr "" #. module: document #: field:document.directory,name:0 msgid "Name" -msgstr "Имя" +msgstr "" #. module: document #: field:document.directory.content.type,code:0 msgid "Extension" -msgstr "Расширение" +msgstr "" #. module: document #: selection:ir.attachment,store_method:0 msgid "Database" -msgstr "База данных" +msgstr "" #. module: document #: field:document.directory,content_ids:0 @@ -331,30 +332,30 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "Attached To" -msgstr "Вложено в" +msgstr "" #. module: document #: selection:ir.attachment,store_method:0 msgid "Filesystem" -msgstr "Файловая система" +msgstr "" #. module: document #: field:document.directory,file_type:0 #: field:document.directory.content.type,name:0 #: field:ir.attachment,file_type:0 msgid "Content Type" -msgstr "Тип данных" +msgstr "" #. module: document #: view:document.directory:0 #: view:ir.attachment:0 msgid "Security" -msgstr "Безопасность" +msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_document_browse msgid "Browse Files Using FTP" -msgstr "Просмотр файлов используя FTP" +msgstr "" #. module: document #: field:document.directory,ressource_type_id:0 @@ -364,7 +365,7 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "History" -msgstr "История" +msgstr "" #. module: document #: help:document.directory,ressource_type_id:0 @@ -376,33 +377,33 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "Others Info" -msgstr "Дополнительная информация" +msgstr "" #. module: document #: field:document.directory,domain:0 msgid "Domain" -msgstr "Домен" +msgstr "" #. module: document #: field:document.directory,write_date:0 #: field:ir.attachment,write_date:0 msgid "Date Modified" -msgstr "Дата изменения" +msgstr "" #. module: document #: field:document.directory.content,suffix:0 msgid "Suffix" -msgstr "Суффикс" +msgstr "" #. module: document #: field:document.configuration.wizard,host:0 msgid "Server Address" -msgstr "Адрес сервера" +msgstr "" #. module: document #: model:ir.actions.url,name:document.action_document_browse msgid "Browse Files" -msgstr "Обзор файлов" +msgstr "" #. module: document #: field:document.directory.content,name:0 @@ -418,7 +419,7 @@ msgstr "" #. module: document #: field:document.directory,create_uid:0 msgid "Creator" -msgstr "Автор" +msgstr "" #. module: document #: view:document.directory:0 @@ -428,22 +429,22 @@ msgstr "" #. module: document #: field:document.directory.content,sequence:0 msgid "Sequence" -msgstr "Сортировать" +msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_document_files msgid "Search a File" -msgstr "Поиск файла" +msgstr "" #. module: document #: view:document.configuration.wizard:0 msgid "Auto Configure" -msgstr "Авто настройка" +msgstr "" #. module: document #: view:document.configuration.wizard:0 msgid "Cancel" -msgstr "Отмена" +msgstr "" #. module: document #: field:ir.attachment,partner_id:0 @@ -453,12 +454,12 @@ msgstr "" #. module: document #: view:document.directory:0 msgid "PDF Report" -msgstr "PDF Отчёт" +msgstr "" #. module: document #: field:document.directory.content,extension:0 msgid "Document Type" -msgstr "Тип документа" +msgstr "" #. module: document #: field:document.directory,child_ids:0 @@ -468,4 +469,4 @@ msgstr "" #. module: document #: view:document.directory:0 msgid "Contents" -msgstr "Содержание" +msgstr "" diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py index c9e0e525dd4..e7966c2e3a4 100644 --- a/addons/document/wizard/document_configuration.py +++ b/addons/document/wizard/document_configuration.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,31 +15,23 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see +# along with this program. If not, see . # ############################################################################## from osv import osv, fields -from osv.orm import except_orm -from tools import config -import urlparse +from document_ftp import ftpserver +class document_configuration(osv.osv_memory): -import os - -class document_configuration_wizard(osv.osv_memory): - - _name='document.configuration.wizard' + _name='document.configuration' _description = 'Auto Directory Configuration' _inherit = 'res.config' _columns = { - 'host': fields.char('Address', size=64, - help="Server address or IP and port to which users should connect to for DMS access", - required=True), - } - - _defaults = { - 'host': config.get('ftp_server_host', 'localhost') + ':' + config.get('ftp_server_port', '8021'), + 'sale_order' : fields.boolean('Sale Order', help="Auto directory configuration for Sale Orders and Quotation with report."), + 'product' : fields.boolean('Product', help="Auto directory configuration for Products."), + 'project': fields.boolean('Project', help="Auto directory configuration for Projects."), } + def execute(self, cr, uid, ids, context=None): conf_id = ids and ids[0] or False @@ -125,10 +117,5 @@ class document_configuration_wizard(osv.osv_memory): 'ressource_type_id': mid[0], 'domain': '[]', 'ressource_tree': 1 - }) - - # Update the action for FTP browse. - aid = objid._get_id(cr, uid, 'document_ftp', 'action_document_browse') - aid = objid.browse(cr, uid, aid, context=context).res_id - self.pool.get('ir.actions.url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/'}) -document_configuration_wizard() + }) +document_configuration()