diff --git a/.bzrignore b/.bzrignore index b83a43bf1d4..62f8a05c90f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,11 +1,23 @@ -.* -*.egg-info -*.orig +*.pyc +.*.swp +.bzrignore +openerp/addons/* +openerp/filestore* +.Python +include +lib +bin/activate +bin/activate_this.py +bin/easy_install +bin/easy_install-2.6 +bin/pip +bin/python +bin/python2.6 +*.pyc +*.pyo build/ -RE:^bin/ -RE:^dist/ -RE:^include/ - -RE:^share/ -RE:^man/ -RE:^lib/ +bin/yolk +bin/pil*.py +.project +.pydevproject +.settings diff --git a/openerp-server b/openerp-server index f17627906f1..71a52d5f06b 100755 --- a/openerp-server +++ b/openerp-server @@ -179,9 +179,12 @@ def dumpstacks(sig, frame): def setup_signal_handlers(): """ Register the signal handler defined above. """ SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split()) - map(lambda sig: signal.signal(sig, signal_handler), SIGNALS) if os.name == 'posix': + map(lambda sig: signal.signal(sig, signal_handler), SIGNALS) signal.signal(signal.SIGQUIT, dumpstacks) + elif os.name == 'nt': + import win32api + win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1) def quit_on_signals(): """ Wait for one or two signals then shutdown the server. @@ -191,9 +194,12 @@ def quit_on_signals(): """ # Wait for a first signal to be handled. (time.sleep will be interrupted - # by the signal handler.) - while quit_signals_received == 0: - time.sleep(60) + # by the signal handler.) The try/except is for the win32 case. + try: + while quit_signals_received == 0: + time.sleep(60) + except KeyboardInterrupt, e: + pass if config['pidfile']: os.unlink(config['pidfile']) diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 9615506a7c6..d7190b8b5ef 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -1,10 +1,6 @@ - - web.base.url - http://localhost:8069 - ir.ui.menu.tree ir.ui.menu @@ -1671,5 +1667,19 @@ + + + + CLP + $ + 0.01 + 4 + + + + 710 + + + diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index eb1b1611c66..f9f46d1f520 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -2,7 +2,7 @@ diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index 3c5d2fb0117..f99afdd5d3d 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.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: 2011-10-01 05:00+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po index 3e4289b0e47..f556682977a 100644 --- a/openerp/addons/base/i18n/am.po +++ b/openerp/addons/base/i18n/am.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: 2011-10-01 05:00+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po index d11ff8d8dea..6fb848c1ca5 100644 --- a/openerp/addons/base/i18n/ar.po +++ b/openerp/addons/base/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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -33,7 +33,7 @@ msgstr "سانت هيلينا" #. module: base #: view:ir.actions.report.xml:0 msgid "Other Configuration" -msgstr "عدادت أخري" +msgstr "إعدادات أخرى" #. module: base #: selection:ir.property,type:0 @@ -103,7 +103,7 @@ msgstr "سير العمل نشط" #. module: base #: field:ir.actions.act_window,display_menu_tip:0 msgid "Display Menu Tips" -msgstr "" +msgstr "عرض إرشادات القائمة" #. module: base #: view:ir.module.module:0 @@ -117,6 +117,8 @@ msgid "" "You can not write in this document (%s) ! Be sure your user belongs to one " "of these groups: %s." msgstr "" +"لا يمكنك تعديل هذا المستند (%s)! تأكد من أنك تنتمي إلى إحدى المجموعات " +"التالية: %s." #. module: base #: help:ir.model.fields,domain:0 @@ -134,7 +136,7 @@ msgstr "" #. module: base #: field:ir.actions.act_window,target:0 msgid "Target Window" -msgstr "" +msgstr "نافذة الهدف" #. module: base #: code:addons/base/res/res_user.py:507 @@ -154,7 +156,7 @@ msgstr "" #: code:addons/osv.py:133 #, python-format msgid "Constraint Error" -msgstr "" +msgstr "خطأ تقييد" #. module: base #: model:ir.model,name:base.model_ir_ui_view_custom @@ -171,12 +173,12 @@ msgstr "" #: code:addons/orm.py:3653 #, python-format msgid "created." -msgstr "" +msgstr "تمّ الإنشاء" #. module: base #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0 msgid "Wood Suppliers" -msgstr "" +msgstr "مورّدو الخشب" #. module: base #: code:addons/base/module/module.py:303 @@ -185,6 +187,8 @@ msgid "" "Some installed modules depend on the module you plan to Uninstall :\n" " %s" msgstr "" +"ثمّة وحدات برمجية تعتمد على الوحدة التي تريد إزالتها:\n" +" %s" #. module: base #: field:ir.sequence,number_increment:0 @@ -195,7 +199,7 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_res_company_tree #: model:ir.ui.menu,name:base.menu_action_res_company_tree msgid "Company's Structure" -msgstr "" +msgstr "هيكل الشركة" #. module: base #: selection:base.language.install,lang:0 @@ -211,7 +215,7 @@ msgstr "" #: code:addons/base/res/res_user.py:132 #, python-format msgid "\"smtp_server\" needs to be set to send mails to users" -msgstr "" +msgstr "لا بدّ من تعيين خادم إرسال البريد الإلكتروني \"smtp_server\"" #. module: base #: code:addons/base/module/wizard/base_export_language.py:60 @@ -227,7 +231,7 @@ msgstr "" #. module: base #: field:ir.module.category,module_nr:0 msgid "Number of Modules" -msgstr "" +msgstr "عدد البرامج" #. module: base #: help:multi_company.default,company_dest_id:0 @@ -237,7 +241,7 @@ msgstr "" #. module: base #: field:res.partner.bank.type.field,size:0 msgid "Max. Size" -msgstr "" +msgstr "الحجم الأقصى" #. module: base #: field:res.partner.address,name:0 @@ -255,7 +259,7 @@ msgstr "" #. module: base #: sql_constraint:res.lang:0 msgid "The name of the language must be unique !" -msgstr "" +msgstr "لا بدّ أن يكون اسم اللغة مختلفاً عن اللغات الأخرى" #. module: base #: selection:res.request,state:0 @@ -265,7 +269,7 @@ msgstr "نشط" #. module: base #: field:ir.actions.wizard,wiz_name:0 msgid "Wizard Name" -msgstr "" +msgstr "اسم المعالج" #. module: base #: code:addons/orm.py:2160 @@ -296,7 +300,7 @@ msgstr "" #. module: base #: view:ir.actions.todo:0 msgid "Config Wizard Steps" -msgstr "" +msgstr "خطوات إعداد المعالج" #. module: base #: model:ir.model,name:base.model_ir_ui_view_sc @@ -362,6 +366,8 @@ msgid "" "You can not remove the admin user as it is used internally for resources " "created by OpenERP (updates, module installation, ...)" msgstr "" +"لا يمكنك حذف المستخدم المشرف العام (admin) لأنه يسنخدم داخلياً بواسطة " +"OpenERP في عمليات التحديث و إضافة البرامج الأخري" #. module: base #: model:res.country,name:base.gf @@ -399,7 +405,7 @@ msgstr "" #. module: base #: view:base.module.upgrade:0 msgid "Your system will be updated." -msgstr "" +msgstr "سوف يتمّ تحديث نظامك" #. module: base #: field:ir.actions.todo,note:0 @@ -420,7 +426,7 @@ msgstr "كولومبيا" #. module: base #: view:ir.module.module:0 msgid "Schedule Upgrade" -msgstr "" +msgstr "حدّد موعد الترقية" #. module: base #: code:addons/orm.py:838 @@ -434,6 +440,8 @@ msgid "" "The ISO country code in two chars.\n" "You can use this field for quick search." msgstr "" +"رمز ISO للدولة والمكون من حرفين\n" +"يمكنك استخدام هذا الحقل للبحث السريع." #. module: base #: model:res.country,name:base.pw @@ -461,12 +469,12 @@ msgstr "" #: view:ir.actions.wizard:0 #: model:ir.ui.menu,name:base.menu_ir_action_wizard msgid "Wizards" -msgstr "" +msgstr "المعالجات" #. module: base #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0 msgid "Miscellaneous Suppliers" -msgstr "" +msgstr "مورّدون متنوعون" #. module: base #: code:addons/base/ir/ir_model.py:255 @@ -487,12 +495,12 @@ msgstr "" #. module: base #: view:base.language.export:0 msgid "Export done" -msgstr "" +msgstr "تمّت عملية التصدير" #. module: base #: view:ir.model:0 msgid "Model Description" -msgstr "" +msgstr "وصف النموذج" #. module: base #: help:ir.actions.act_window,src_model:0 @@ -590,7 +598,7 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_base_language_import msgid "Language Import" -msgstr "" +msgstr "استيراد اللغة" #. module: base #: model:ir.model,name:base.model_res_config_users @@ -635,12 +643,12 @@ msgstr "" #. module: base #: view:res.partner:0 msgid "My Partners" -msgstr "" +msgstr "شركائي" #. module: base #: view:ir.actions.report.xml:0 msgid "XML Report" -msgstr "" +msgstr "تقرير XML" #. module: base #: model:res.country,name:base.es @@ -650,7 +658,7 @@ msgstr "" #. module: base #: model:ir.ui.menu,name:base.menu_translation_export msgid "Import / Export" -msgstr "" +msgstr "استيراد / تصدير" #. module: base #: help:ir.actions.act_window,domain:0 @@ -662,7 +670,7 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade #: model:ir.model,name:base.model_base_module_upgrade msgid "Module Upgrade" -msgstr "" +msgstr "ترقية وحدة برمجية" #. module: base #: view:res.config.users:0 diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po index faaa8231ca2..2177474a3c8 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -168,7 +168,7 @@ msgstr "ir.ui.view.custom" #. module: base #: model:res.country,name:base.sz msgid "Swaziland" -msgstr "Швейцария" +msgstr "Свазиленд" #. module: base #: code:addons/orm.py:1993 diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po index 8ac67468fac..6d72e655d95 100644 --- a/openerp/addons/base/i18n/bs.po +++ b/openerp/addons/base/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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po index a0ff5259435..5cf9b043f3a 100644 --- a/openerp/addons/base/i18n/ca.po +++ b/openerp/addons/base/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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index 160cf68e8eb..7f84778d037 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" #. module: base diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po index d8cb77ac991..3a60c74050a 100644 --- a/openerp/addons/base/i18n/da.po +++ b/openerp/addons/base/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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index 1e72e0907df..69a6e81aa08 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -6604,8 +6604,8 @@ msgid "" "You can not read this document (%s) ! Be sure your user belongs to one of " "these groups: %s." msgstr "" -"Sie haben kein Leserecht für diesen Beleg (%s) ! Stellen Sie sicher, dass " -"der Benutzer Mitglied der folgenden Gruppe ist: %s." +"Sie haben kein Leserecht für diesen Satz (%s) ! Stellen Sie sicher, dass der " +"Benutzer Mitglied der folgenden Gruppe ist: %s." #. module: base #: view:res.bank:0 diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po index 4f0102b4a63..56cf6185f12 100644 --- a/openerp/addons/base/i18n/el.po +++ b/openerp/addons/base/i18n/el.po @@ -12,8 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po index c4f9260336f..1fc909a83f4 100644 --- a/openerp/addons/base/i18n/en_GB.po +++ b/openerp/addons/base/i18n/en_GB.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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po index d6ef5d0624b..e1f7181ed51 100644 --- a/openerp/addons/base/i18n/es.po +++ b/openerp/addons/base/i18n/es.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: 2011-10-01 05:05+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index 812eaf625e3..6c6cec964cb 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.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: 2011-10-04 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po index 92d19599418..ebc536d97ae 100644 --- a/openerp/addons/base/i18n/es_EC.po +++ b/openerp/addons/base/i18n/es_EC.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: 2011-10-01 05:07+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:55+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po index 6279b88a68f..1bd7ed9c6e1 100644 --- a/openerp/addons/base/i18n/et.po +++ b/openerp/addons/base/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: 2011-10-11 05:29+0000\n" -"X-Generator: Launchpad (build 14123)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po index af8e2ab0f78..bedab5378d6 100644 --- a/openerp/addons/base/i18n/eu.po +++ b/openerp/addons/base/i18n/eu.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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po index 5d1463fc39e..47461d9d2fd 100644 --- a/openerp/addons/base/i18n/fa.po +++ b/openerp/addons/base/i18n/fa.po @@ -9,8 +9,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" "X-Poedit-Language: Persian\n" diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po index b19ce001779..8d80d7ffd3d 100644 --- a/openerp/addons/base/i18n/fa_AF.po +++ b/openerp/addons/base/i18n/fa_AF.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: 2011-10-01 05:07+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:55+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po index 25048b8c81a..80261f1a672 100644 --- a/openerp/addons/base/i18n/fi.po +++ b/openerp/addons/base/i18n/fi.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: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index 256bfd053c5..fa5af7b2630 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/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: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -131,7 +131,7 @@ msgid "" msgstr "" "Le domaine, optionnel, est utilisé pour limiter les valeurs possibles des " "champs concernés. Il s'exprime en langage Python sous forme de triplets. Par " -"exemple : [('color','=',rouge')]" +"exemple : [('color','=','rouge')]" #. module: base #: field:res.partner,ref:0 @@ -202,7 +202,7 @@ msgstr "" #. module: base #: field:ir.sequence,number_increment:0 msgid "Increment Number" -msgstr "Incrémenter le Numéro" +msgstr "Incrémenter le numéro" #. module: base #: model:ir.actions.act_window,name:base.action_res_company_tree @@ -590,7 +590,7 @@ msgstr "" #. module: base #: field:res.partner,title:0 msgid "Partner Form" -msgstr "Formulaire des partenaires" +msgstr "Forme juridique" #. module: base #: selection:base.language.install,lang:0 @@ -1661,7 +1661,7 @@ msgid "" "do not wish to add more users at this stage, you can always do this later." msgstr "" "Créez des utilisateurs additionnels et assignez-les à des groupes qui leur " -"permettra d'avoir accès à des fonctionnalités choisies dans le système. " +"permettront d'avoir accès à des fonctionnalités choisies dans le système. " "Cliquez sur 'Terminé' si vous ne désirez pas ajouter plus d'utilisateurs " "pour l'instant, vous pourrez toujours en ajouter plus tard." @@ -2177,7 +2177,7 @@ msgstr "terminer" #: selection:ir.ui.view,type:0 #: selection:wizard.ir.model.menu.create.line,view_type:0 msgid "Calendar" -msgstr "Calendrier" +msgstr "Créer un calendrier" #. module: base #: field:res.partner.address,partner_id:0 @@ -2202,9 +2202,6 @@ msgid "" "separated list of valid field names (optionally followed by asc/desc for the " "direction)" msgstr "" -"\"order\" spécifié non valide, une \"ordre\" de spécification est une liste " -"de nom de champs séparé par des virgules (optionnel suivi par le sens " -"croissant/décroissant)" #. module: base #: model:ir.model,name:base.model_ir_module_module_dependency @@ -3550,12 +3547,13 @@ msgid "" "Would your payment have been carried out after this mail was sent, please " "consider the present one as void." msgstr "" -"Veuiller noter que les paiements ci dessous sont maintenant dus. Si votre " -"paiement a été envoyé, nous recevrons rapidement le détail de votre " -"paiements. Si votre paiement est décallé, merci de nous contacter pour en " -"discuter. \n" -"Si votre paiement a déjà réglé après que ce courriel soit parti, veuillez ne " -"pas tenir compte de cet envoi." +"Veuillez noter que les paiements ci-dessous sont maintenant dus. \n" +"Si votre règlement nous a été envoyé, merci de nous en préciser rapidement " +"les modalités.\n" +"Nous vous invitons à nous contacter au cas où ce retard serait volontaire, " +"et cela afin de nous en communiquer les motifs.\n" +"Dans le cas où votre règlement nous parviendrait avant réception de ce " +"courriel, nous vous demandons de considérer cette relance comme non avenue." #. module: base #: model:res.country,name:base.mx @@ -7159,7 +7157,7 @@ msgstr "Filtre" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam msgid "Ms." -msgstr "Mme" +msgstr "Mlle" #. module: base #: model:res.country,name:base.ch @@ -8317,7 +8315,8 @@ msgstr "Administration" #. module: base #: view:base.module.update:0 msgid "Click on Update below to start the process..." -msgstr "Cliquer sur Mise à Jour afin de lancer l'opération..." +msgstr "" +"Cliquer sur le bouton Mettre à jour ci-dessous afin de lancer l'opération..." #. module: base #: model:res.country,name:base.ir @@ -8955,7 +8954,7 @@ msgstr "Relation de l'objet" #: view:ir.rule:0 #: view:res.partner:0 msgid "General" -msgstr "Générale" +msgstr "Général" #. module: base #: model:res.country,name:base.uz diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po index 455785414b8..9f19c9f93e3 100644 --- a/openerp/addons/base/i18n/gl.po +++ b/openerp/addons/base/i18n/gl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-30 21:09+0000\n" -"Last-Translator: Antony Lesuisse (OpenERP) \n" +"PO-Revision-Date: 2011-11-13 17:25+0000\n" +"Last-Translator: Xosé \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-14 05:15+0000\n" +"X-Generator: Launchpad (build 14277)\n" #. module: base #: view:ir.filters:0 @@ -1973,7 +1973,7 @@ msgstr "Mensaxes" #: code:addons/base/module/wizard/base_update_translations.py:38 #, python-format msgid "Error!" -msgstr "¡Erro!" +msgstr "Erro!" #. module: base #: view:res.lang:0 diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po index cbcf2390d80..c14482ac064 100644 --- a/openerp/addons/base/i18n/he.po +++ b/openerp/addons/base/i18n/he.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: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po index 92fad63ac53..5878b8dac29 100644 --- a/openerp/addons/base/i18n/hr.po +++ b/openerp/addons/base/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: 2011-10-01 05:05+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" "Language: hr\n" #. module: base @@ -720,7 +720,7 @@ msgstr "Radni dani" #. module: base #: selection:ir.module.module,license:0 msgid "Other OSI Approved Licence" -msgstr "" +msgstr "Druga OSI odobrena licenca" #. module: base #: help:res.config.users,context_lang:0 @@ -1057,7 +1057,7 @@ msgstr "Jezik \"%s\" ne postoji/ nije definiran" #: code:addons/base/publisher_warranty/publisher_warranty.py:163 #, python-format msgid "Error during communication with the publisher warranty server." -msgstr "" +msgstr "Greška tijekom komunikacije sa serverom nositelja održavanja." #. module: base #: help:ir.actions.server,email:0 @@ -2136,6 +2136,8 @@ msgid "" "separated list of valid field names (optionally followed by asc/desc for the " "direction)" msgstr "" +"Naveden pogrešan \"poredak\". Ispravan \"poredak\" čini lista naziva polja " +"razdvojenih zarezom (opcionalno s asc/desc za smijer)" #. module: base #: model:ir.model,name:base.model_ir_module_module_dependency @@ -2597,7 +2599,7 @@ msgstr "Naurujski" #: code:addons/base/module/module.py:200 #, python-format msgid "The certificate ID of the module must be unique !" -msgstr "" +msgstr "Oznaka certifikata (ID) mora biti jedinstvena !" #. module: base #: model:ir.model,name:base.model_ir_property @@ -2674,7 +2676,7 @@ msgstr "EAN13" #: code:addons/orm.py:1622 #, python-format msgid "Invalid Architecture!" -msgstr "" +msgstr "Pogrešna arhitektura!" #. module: base #: model:res.country,name:base.pt @@ -2686,6 +2688,7 @@ msgstr "Portugal" msgid "" "You cannot have multiple records with the same id for the same module !" msgstr "" +"Nije dozvoljeno imatii više zapisa s istom oznakom (ID) u istom modulu." #. module: base #: field:ir.module.module,certificate:0 @@ -3952,7 +3955,7 @@ msgstr "Zelenortska Republika (Zelenortski otoci)" #. module: base #: view:base.module.import:0 msgid "Select module package to import (.zip file):" -msgstr "" +msgstr "Odaberite zapakirani modul za učitavanje (.zip datoteka):" #. module: base #: model:ir.actions.act_window,name:base.act_res_partner_event @@ -4347,7 +4350,7 @@ msgstr "Želite očistiti ID-ove ? " #: field:publisher_warranty.contract,name:0 #: field:publisher_warranty.contract.wizard,name:0 msgid "Serial Key" -msgstr "" +msgstr "Serijski ključ" #. module: base #: selection:res.request,priority:0 @@ -4424,7 +4427,7 @@ msgstr "Mapiranje polja" #. module: base #: view:publisher_warranty.contract:0 msgid "Refresh Validation Dates" -msgstr "" +msgstr "Osvježite datume važenja" #. module: base #: view:ir.model:0 diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po index eee5301951b..994114c6fc0 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po index 5ed2d1bf9ff..b1648522c5c 100644 --- a/openerp/addons/base/i18n/hy.po +++ b/openerp/addons/base/i18n/hy.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: 2011-10-01 05:01+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index 80ba676aada..eed1619ac28 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po index c0deb80c7b6..8da4874e147 100644 --- a/openerp/addons/base/i18n/is.po +++ b/openerp/addons/base/i18n/is.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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po index c2d137a9e4a..9705d816e50 100644 --- a/openerp/addons/base/i18n/it.po +++ b/openerp/addons/base/i18n/it.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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -8788,9 +8788,9 @@ msgid "" "Check this box if the partner is a supplier. If it's not checked, purchase " "people will not see it when encoding a purchase order." msgstr "" -"Seleziona questa casella se il partner è un fornitore. Se non selezionata, " -"gli acquirenti non la vedranno durante la definizione di un ordine di " -"acquisto." +"Seleziona questa casella se il partner è un fornitore. Se non selezionata, i " +"responsabili acquisti non vedranno il partner durante la definizione di un " +"ordine di acquisto." #. module: base #: field:ir.model.fields,relation_field:0 diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index 38a08080ba7..6c523a91aa4 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po index aec7bf4f3dd..5ff1be47edf 100644 --- a/openerp/addons/base/i18n/kk.po +++ b/openerp/addons/base/i18n/kk.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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -4573,7 +4573,7 @@ msgstr "" #. module: base #: model:res.country,name:base.bt msgid "Bhutan" -msgstr "" +msgstr "Бутан" #. module: base #: help:ir.sequence,number_next:0 @@ -4603,7 +4603,7 @@ msgstr "" #. module: base #: field:base.language.export,format:0 msgid "File Format" -msgstr "" +msgstr "Файл пішімі" #. module: base #: field:res.lang,iso_code:0 @@ -4619,7 +4619,7 @@ msgstr "" #: view:res.log:0 #: field:res.log,read:0 msgid "Read" -msgstr "" +msgstr "Оқылған" #. module: base #: sql_constraint:res.country:0 @@ -4649,7 +4649,7 @@ msgstr "" #: field:res.config.users,password:0 #: field:res.users,password:0 msgid "Password" -msgstr "" +msgstr "Пароль" #. module: base #: model:ir.actions.act_window,name:base.action_model_fields @@ -4705,12 +4705,12 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_partner_address_form #: model:ir.ui.menu,name:base.menu_partner_address_form msgid "Addresses" -msgstr "" +msgstr "Адрестер" #. module: base #: model:res.country,name:base.mm msgid "Myanmar" -msgstr "" +msgstr "Мьянма" #. module: base #: selection:base.language.install,lang:0 @@ -4722,12 +4722,12 @@ msgstr "" #: field:res.partner.address,street:0 #: field:res.partner.bank,street:0 msgid "Street" -msgstr "" +msgstr "Көше" #. module: base #: model:res.country,name:base.yu msgid "Yugoslavia" -msgstr "" +msgstr "Югославия" #. module: base #: field:ir.model.data,name:0 @@ -4737,12 +4737,12 @@ msgstr "" #. module: base #: model:res.country,name:base.ca msgid "Canada" -msgstr "" +msgstr "Канада" #. module: base #: selection:ir.module.module.dependency,state:0 msgid "Unknown" -msgstr "" +msgstr "Беймәлім" #. module: base #: model:ir.actions.act_window,name:base.action_res_users_my @@ -4763,17 +4763,17 @@ msgstr "" #. module: base #: model:res.country,name:base.cm msgid "Cameroon" -msgstr "" +msgstr "Камерун" #. module: base #: model:res.country,name:base.bf msgid "Burkina Faso" -msgstr "" +msgstr "Буркина-Фасо" #. module: base #: selection:ir.actions.todo,state:0 msgid "Skipped" -msgstr "" +msgstr "Қалдырып кетекен" #. module: base #: selection:ir.model.fields,state:0 @@ -4788,7 +4788,7 @@ msgstr "" #. module: base #: model:res.country,name:base.cc msgid "Cocos (Keeling) Islands" -msgstr "" +msgstr "Кокос (Килинг) аралдары" #. module: base #: selection:base.language.install,state:0 @@ -4840,7 +4840,7 @@ msgstr "" #. module: base #: field:ir.module.module,maintainer:0 msgid "Maintainer" -msgstr "" +msgstr "Желілдірушісі" #. module: base #: field:ir.sequence,suffix:0 @@ -4855,7 +4855,7 @@ msgstr "" #. module: base #: model:ir.actions.report.xml,name:base.res_partner_address_report msgid "Labels" -msgstr "" +msgstr "Жарлықтар" #. module: base #: field:partner.wizard.spam,email_from:0 @@ -4935,7 +4935,7 @@ msgstr "" #: selection:res.partner.title,domain:0 #: view:res.users:0 msgid "Contact" -msgstr "" +msgstr "Контакты" #. module: base #: model:ir.model,name:base.model_ir_ui_menu @@ -4945,7 +4945,7 @@ msgstr "" #. module: base #: model:res.country,name:base.us msgid "United States" -msgstr "" +msgstr "АҚШ" #. module: base #: view:ir.module.module:0 @@ -4957,7 +4957,7 @@ msgstr "" #: view:res.partner:0 #: view:res.partner.address:0 msgid "Communication" -msgstr "" +msgstr "Байланыс" #. module: base #: view:ir.actions.report.xml:0 @@ -4978,12 +4978,12 @@ msgstr "" #. module: base #: model:res.country,name:base.kw msgid "Kuwait" -msgstr "" +msgstr "Кувейт" #. module: base #: field:workflow.workitem,inst_id:0 msgid "Instance" -msgstr "" +msgstr "Данасы" #. module: base #: help:ir.actions.report.xml,attachment:0 @@ -5001,7 +5001,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ng msgid "Nigeria" -msgstr "" +msgstr "Нигерия" #. module: base #: code:addons/base/ir/ir_model.py:250 @@ -5037,7 +5037,7 @@ msgstr "" #. module: base #: model:res.country,name:base.hk msgid "Hong Kong" -msgstr "" +msgstr "Гонконг" #. module: base #: help:ir.actions.server,name:0 @@ -5059,12 +5059,12 @@ msgstr "" #. module: base #: model:res.country,name:base.ph msgid "Philippines" -msgstr "" +msgstr "Филиппин" #. module: base #: model:res.country,name:base.ma msgid "Morocco" -msgstr "" +msgstr "Марокко" #. module: base #: view:res.lang:0 @@ -5074,7 +5074,7 @@ msgstr "" #. module: base #: field:res.widget,content:0 msgid "Content" -msgstr "" +msgstr "Мазмұны" #. module: base #: help:ir.rule,global:0 @@ -5084,7 +5084,7 @@ msgstr "" #. module: base #: model:res.country,name:base.td msgid "Chad" -msgstr "" +msgstr "Чад" #. module: base #: model:ir.model,name:base.model_workflow_transition @@ -5109,7 +5109,7 @@ msgstr "" #. module: base #: model:res.country,name:base.dm msgid "Dominica" -msgstr "" +msgstr "Доминика" #. module: base #: sql_constraint:publisher_warranty.contract:0 @@ -5131,7 +5131,7 @@ msgstr "" #. module: base #: model:res.country,name:base.np msgid "Nepal" -msgstr "" +msgstr "Непал" #. module: base #: code:addons/orm.py:2307 @@ -5196,7 +5196,7 @@ msgstr "" #. module: base #: view:ir.actions.configuration.wizard:0 msgid "Continue" -msgstr "" +msgstr "Жалғастыру" #. module: base #: selection:base.language.install,lang:0 @@ -5222,7 +5222,7 @@ msgstr "" #. module: base #: model:res.country,name:base.bv msgid "Bouvet Island" -msgstr "" +msgstr "Буве аралдары" #. module: base #: field:ir.attachment,name:0 @@ -5233,12 +5233,12 @@ msgstr "" #: field:base.language.export,data:0 #: field:base.language.import,data:0 msgid "File" -msgstr "" +msgstr "Файл" #. module: base #: view:res.config.users:0 msgid "Add User" -msgstr "" +msgstr "Пайдаланушыны қосу" #. module: base #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install @@ -5274,7 +5274,7 @@ msgstr "" #: view:base.language.import:0 #: view:wizard.ir.model.menu.create:0 msgid "_Close" -msgstr "" +msgstr "_Жабу" #. module: base #: field:multi_company.default,company_dest_id:0 @@ -5300,7 +5300,7 @@ msgstr "" #. module: base #: model:res.country,name:base.as msgid "American Samoa" -msgstr "" +msgstr "Шығыс Самоа" #. module: base #: help:ir.actions.act_window,res_model:0 @@ -5327,7 +5327,7 @@ msgstr "" #: selection:ir.attachment,type:0 #: field:ir.module.module,url:0 msgid "URL" -msgstr "" +msgstr "URL-адресі" #. module: base #: help:res.country,name:0 @@ -5349,7 +5349,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ae msgid "United Arab Emirates" -msgstr "" +msgstr "Біріккен Араб Әмірліктері" #. module: base #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main @@ -5373,17 +5373,17 @@ msgstr "" #: view:ir.rule:0 #: field:ir.rule,global:0 msgid "Global" -msgstr "" +msgstr "Жалпы-жүйелік" #. module: base #: model:res.country,name:base.mp msgid "Northern Mariana Islands" -msgstr "" +msgstr "Солтүстік Мариана ар-ы" #. module: base #: model:res.country,name:base.sb msgid "Solomon Islands" -msgstr "" +msgstr "Соломон аралдары" #. module: base #: code:addons/base/ir/ir_model.py:490 @@ -5399,7 +5399,7 @@ msgstr "" #. module: base #: view:res.request:0 msgid "Waiting" -msgstr "" +msgstr "Күту" #. module: base #: code:addons/__init__.py:834 @@ -5421,13 +5421,13 @@ msgstr "" #. module: base #: field:res.log,create_date:0 msgid "Creation Date" -msgstr "" +msgstr "Жасалған күні" #. module: base #: view:ir.translation:0 #: model:ir.ui.menu,name:base.menu_translation msgid "Translations" -msgstr "" +msgstr "Аудармалар" #. module: base #: field:ir.sequence,padding:0 @@ -5437,17 +5437,17 @@ msgstr "" #. module: base #: view:ir.actions.report.xml:0 msgid "Report" -msgstr "" +msgstr "Есеп" #. module: base #: model:res.country,name:base.ua msgid "Ukraine" -msgstr "" +msgstr "Украина" #. module: base #: model:res.country,name:base.to msgid "Tonga" -msgstr "" +msgstr "Тонга" #. module: base #: model:ir.model,name:base.model_ir_module_category @@ -5458,7 +5458,7 @@ msgstr "" #. module: base #: view:partner.wizard.ean.check:0 msgid "Ignore" -msgstr "" +msgstr "Елемеу" #. module: base #: report:ir.module.reference.graph:0 @@ -5473,7 +5473,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ml msgid "Mali" -msgstr "" +msgstr "Мали" #. module: base #: help:res.config.users,email:0 @@ -5498,7 +5498,7 @@ msgstr "" #. module: base #: model:res.country,name:base.tk msgid "Tokelau" -msgstr "" +msgstr "Токелау" #. module: base #: field:ir.actions.report.xml,report_xsl:0 @@ -5508,7 +5508,7 @@ msgstr "" #. module: base #: model:res.country,name:base.bn msgid "Brunei Darussalam" -msgstr "" +msgstr "Бруней Даруссалам" #. module: base #: view:ir.actions.act_window:0 @@ -5517,12 +5517,12 @@ msgstr "" #: field:ir.ui.view,type:0 #: field:wizard.ir.model.menu.create.line,view_type:0 msgid "View Type" -msgstr "" +msgstr "Көрініс түрі" #. module: base #: model:ir.ui.menu,name:base.next_id_2 msgid "User Interface" -msgstr "" +msgstr "Пайдаланушы интерфейсі" #. module: base #: field:ir.attachment,create_date:0 @@ -5543,12 +5543,12 @@ msgstr "" #. module: base #: view:ir.actions.act_window:0 msgid "General Settings" -msgstr "" +msgstr "Жалпы баптаулар" #. module: base #: model:ir.ui.menu,name:base.menu_administration_shortcut msgid "Custom Shortcuts" -msgstr "" +msgstr "Өзінің тіркесімдері" #. module: base #: selection:base.language.install,lang:0 @@ -5558,12 +5558,12 @@ msgstr "" #. module: base #: model:res.country,name:base.dz msgid "Algeria" -msgstr "" +msgstr "Алжир" #. module: base #: model:res.country,name:base.be msgid "Belgium" -msgstr "" +msgstr "Бельгия" #. module: base #: model:ir.model,name:base.model_osv_memory_autovacuum @@ -5579,12 +5579,12 @@ msgstr "" #: field:res.partner,lang:0 #: field:res.users,context_lang:0 msgid "Language" -msgstr "" +msgstr "Тіл" #. module: base #: model:res.country,name:base.gm msgid "Gambia" -msgstr "" +msgstr "Гамбия" #. module: base #: model:ir.actions.act_window,name:base.action_res_company_form @@ -5656,7 +5656,7 @@ msgstr "" #: view:publisher_warranty.contract.wizard:0 #: view:res.widget.wizard:0 msgid "Cancel" -msgstr "" +msgstr "Бас тарту" #. module: base #: selection:base.language.export,format:0 @@ -5666,7 +5666,7 @@ msgstr "" #. module: base #: model:res.country,name:base.nt msgid "Neutral Zone" -msgstr "" +msgstr "Нейтралды аймақ" #. module: base #: selection:base.language.install,lang:0 @@ -5676,12 +5676,12 @@ msgstr "" #. module: base #: view:ir.model:0 msgid "Custom" -msgstr "" +msgstr "Өзгеше" #. module: base #: view:res.request:0 msgid "Current" -msgstr "" +msgstr "Қазіргісі" #. module: base #: model:res.partner.category,name:base.res_partner_category_9 @@ -5697,7 +5697,7 @@ msgstr "" #: field:res.groups,users:0 #: view:res.users:0 msgid "Users" -msgstr "" +msgstr "Пайдаланушылар" #. module: base #: field:ir.module.module,published_version:0 @@ -5707,7 +5707,7 @@ msgstr "" #. module: base #: model:res.country,name:base.is msgid "Iceland" -msgstr "" +msgstr "Исландия" #. module: base #: model:ir.actions.act_window,name:base.ir_action_window @@ -5723,12 +5723,12 @@ msgstr "" #. module: base #: selection:publisher_warranty.contract.wizard,state:0 msgid "Finished" -msgstr "" +msgstr "Біткен" #. module: base #: model:res.country,name:base.de msgid "Germany" -msgstr "" +msgstr "Германия" #. module: base #: view:ir.sequence:0 @@ -5748,7 +5748,7 @@ msgstr "" #. module: base #: model:res.country,name:base.gy msgid "Guyana" -msgstr "" +msgstr "Гайана" #. module: base #: help:ir.actions.act_window,view_type:0 @@ -5771,7 +5771,7 @@ msgstr "" #. module: base #: model:res.country,name:base.hn msgid "Honduras" -msgstr "" +msgstr "Гондурас" #. module: base #: help:res.config.users,menu_tips:0 @@ -5783,7 +5783,7 @@ msgstr "" #. module: base #: model:res.country,name:base.eg msgid "Egypt" -msgstr "" +msgstr "Мысыр" #. module: base #: field:ir.rule,perm_read:0 @@ -5810,7 +5810,7 @@ msgstr "" #. module: base #: selection:ir.property,type:0 msgid "Boolean" -msgstr "" +msgstr "Логикалық мән" #. module: base #: view:ir.model:0 @@ -5846,13 +5846,13 @@ msgstr "" #: selection:ir.translation,type:0 #: field:wizard.ir.model.menu.create.line,view_id:0 msgid "View" -msgstr "" +msgstr "Қарау" #. module: base #: selection:ir.module.module,state:0 #: selection:ir.module.module.dependency,state:0 msgid "To be installed" -msgstr "" +msgstr "Орнатуға" #. module: base #: help:ir.actions.act_window,display_menu_tip:0 @@ -5866,7 +5866,7 @@ msgstr "" #: model:ir.module.module,shortdesc:base.module_meta_information #: field:res.currency,base:0 msgid "Base" -msgstr "" +msgstr "Негізгі" #. module: base #: selection:base.language.install,lang:0 @@ -5876,7 +5876,7 @@ msgstr "" #. module: base #: model:res.country,name:base.lr msgid "Liberia" -msgstr "" +msgstr "Либерия" #. module: base #: view:ir.attachment:0 @@ -5886,7 +5886,7 @@ msgstr "" #: field:res.partner,comment:0 #: model:res.widget,title:base.note_widget msgid "Notes" -msgstr "" +msgstr "Жазбалар" #. module: base #: field:ir.config_parameter,value:0 @@ -5902,7 +5902,7 @@ msgstr "" #: field:ir.values,value:0 #: field:ir.values,value_unpickle:0 msgid "Value" -msgstr "" +msgstr "Мәні" #. module: base #: field:ir.sequence,code:0 @@ -5911,7 +5911,7 @@ msgstr "" #: field:res.bank,code:0 #: field:res.partner.bank.type,code:0 msgid "Code" -msgstr "" +msgstr "Коды" #. module: base #: model:ir.model,name:base.model_res_config_installer @@ -5921,17 +5921,17 @@ msgstr "" #. module: base #: model:res.country,name:base.mc msgid "Monaco" -msgstr "" +msgstr "Монако" #. module: base #: selection:ir.cron,interval_type:0 msgid "Minutes" -msgstr "" +msgstr "Минут" #. module: base #: selection:ir.translation,type:0 msgid "Help" -msgstr "" +msgstr "Көмек" #. module: base #: help:res.config.users,menu_id:0 @@ -5971,7 +5971,7 @@ msgstr "" #. module: base #: wizard_button:server.action.create,step_1,create:0 msgid "Create" -msgstr "" +msgstr "Құру" #. module: base #: view:ir.sequence:0 @@ -5986,7 +5986,7 @@ msgstr "" #. module: base #: model:res.country,name:base.fr msgid "France" -msgstr "" +msgstr "Франция" #. module: base #: model:ir.model,name:base.model_res_log @@ -6008,7 +6008,7 @@ msgstr "" #. module: base #: selection:ir.cron,interval_type:0 msgid "Weeks" -msgstr "" +msgstr "апта" #. module: base #: model:res.country,name:base.af @@ -6047,7 +6047,7 @@ msgstr "" #: field:res.bank,fax:0 #: field:res.partner.address,fax:0 msgid "Fax" -msgstr "" +msgstr "Факс" #. module: base #: field:res.lang,thousands_sep:0 @@ -6094,7 +6094,7 @@ msgstr "" #. module: base #: model:res.country,name:base.pa msgid "Panama" -msgstr "" +msgstr "Панама" #. module: base #: model:res.partner.title,name:base.res_partner_title_ltd @@ -6116,7 +6116,7 @@ msgstr "" #. module: base #: model:res.country,name:base.gi msgid "Gibraltar" -msgstr "" +msgstr "Гибралтар" #. module: base #: field:ir.actions.report.xml,report_name:0 @@ -6126,7 +6126,7 @@ msgstr "" #. module: base #: model:res.country,name:base.pn msgid "Pitcairn Island" -msgstr "" +msgstr "Питкэрн ар-ы" #. module: base #: view:base.module.upgrade:0 @@ -6144,7 +6144,7 @@ msgstr "" #: field:res.config.users,name:0 #: field:res.users,name:0 msgid "User Name" -msgstr "" +msgstr "Пайдаланушы аты" #. module: base #: view:ir.sequence:0 @@ -6156,7 +6156,7 @@ msgstr "" #: view:ir.model.fields:0 #: view:workflow.activity:0 msgid "Properties" -msgstr "" +msgstr "Баптаулар" #. module: base #: help:ir.sequence,padding:0 @@ -6173,7 +6173,7 @@ msgstr "" #. module: base #: selection:ir.cron,interval_type:0 msgid "Months" -msgstr "" +msgstr "Айлары" #. module: base #: field:ir.actions.act_window,search_view:0 @@ -6191,7 +6191,7 @@ msgstr "" #: view:ir.attachment:0 #: model:ir.ui.menu,name:base.menu_action_attachment msgid "Attachments" -msgstr "" +msgstr "Тіркемелер" #. module: base #: model:ir.ui.menu,name:base.menu_base_partner @@ -6209,12 +6209,12 @@ msgstr "" #: selection:ir.actions.todo,state:0 #: view:res.config.users:0 msgid "Done" -msgstr "" +msgstr "Бітті" #. module: base #: model:res.partner.title,name:base.res_partner_title_miss msgid "Miss" -msgstr "" +msgstr "мис." #. module: base #: view:ir.model.access:0 @@ -6234,23 +6234,23 @@ msgstr "" #: field:res.partner.address,city:0 #: field:res.partner.bank,city:0 msgid "City" -msgstr "" +msgstr "Қала" #. module: base #: model:res.country,name:base.qa msgid "Qatar" -msgstr "" +msgstr "Катар" #. module: base #: model:res.country,name:base.it msgid "Italy" -msgstr "" +msgstr "Италия" #. module: base #: view:ir.actions.todo:0 #: selection:ir.actions.todo,state:0 msgid "To Do" -msgstr "" +msgstr "Тапсырма" #. module: base #: selection:base.language.install,lang:0 @@ -6262,7 +6262,7 @@ msgstr "" #: field:res.partner,email:0 #: field:res.users,email:0 msgid "E-mail" -msgstr "" +msgstr "Электрондық пошта" #. module: base #: selection:ir.module.module,license:0 @@ -6313,12 +6313,12 @@ msgstr "" #: view:res.users:0 #: field:res.users,address_id:0 msgid "Address" -msgstr "" +msgstr "Адресі" #. module: base #: field:ir.module.module,latest_version:0 msgid "Installed version" -msgstr "" +msgstr "Орнатылған нұсқа" #. module: base #: selection:base.language.install,lang:0 @@ -6328,7 +6328,7 @@ msgstr "" #. module: base #: model:res.country,name:base.mr msgid "Mauritania" -msgstr "" +msgstr "Мавритания" #. module: base #: model:ir.model,name:base.model_ir_translation @@ -6344,13 +6344,13 @@ msgstr "" #: view:workflow.activity:0 #: field:workflow.workitem,act_id:0 msgid "Activity" -msgstr "" +msgstr "Ісі" #. module: base #: view:res.partner:0 #: view:res.partner.address:0 msgid "Postal Address" -msgstr "" +msgstr "Пошта адресі" #. module: base #: field:res.company,parent_id:0 @@ -6365,17 +6365,17 @@ msgstr "" #. module: base #: field:res.currency.rate,rate:0 msgid "Rate" -msgstr "" +msgstr "Дәрежесі" #. module: base #: model:res.country,name:base.cg msgid "Congo" -msgstr "" +msgstr "Конго" #. module: base #: view:res.lang:0 msgid "Examples" -msgstr "" +msgstr "Мысалдар" #. module: base #: field:ir.default,value:0 @@ -6385,7 +6385,7 @@ msgstr "" #. module: base #: model:ir.ui.menu,name:base.menu_tools msgid "Tools" -msgstr "" +msgstr "Құралдар" #. module: base #: model:res.country,name:base.kn @@ -6413,7 +6413,7 @@ msgstr "" #: field:ir.model.fields,model:0 #: field:ir.values,model:0 msgid "Object Name" -msgstr "" +msgstr "Нысанның атауы" #. module: base #: help:ir.actions.server,srcmodel_id:0 @@ -6427,7 +6427,7 @@ msgstr "" #: selection:ir.module.module,state:0 #: selection:ir.module.module.dependency,state:0 msgid "Not Installed" -msgstr "" +msgstr "Орнатылмаған" #. module: base #: view:workflow.activity:0 @@ -6438,7 +6438,7 @@ msgstr "" #. module: base #: field:ir.ui.menu,icon:0 msgid "Icon" -msgstr "" +msgstr "Таңбашасы" #. module: base #: help:ir.model.fields,model_id:0 @@ -6461,17 +6461,17 @@ msgstr "" #: model:ir.ui.menu,name:base.menu_resquest_ref #: view:res.request:0 msgid "Requests" -msgstr "" +msgstr "Талаптар" #. module: base #: model:res.country,name:base.ye msgid "Yemen" -msgstr "" +msgstr "Йемен" #. module: base #: selection:workflow.activity,split_mode:0 msgid "Or" -msgstr "" +msgstr "Немесе" #. module: base #: model:ir.actions.act_window,name:base.res_log_act_window @@ -6482,12 +6482,12 @@ msgstr "" #. module: base #: model:res.country,name:base.al msgid "Albania" -msgstr "" +msgstr "Албания" #. module: base #: model:res.country,name:base.ws msgid "Samoa" -msgstr "" +msgstr "Самоа" #. module: base #: code:addons/base/res/res_lang.py:161 @@ -6555,14 +6555,14 @@ msgstr "" #. module: base #: model:res.country,name:base.la msgid "Laos" -msgstr "" +msgstr "Лаос" #. module: base #: selection:ir.actions.server,state:0 #: field:res.config.users,user_email:0 #: field:res.users,user_email:0 msgid "Email" -msgstr "" +msgstr "Эл.поштасы" #. module: base #: field:res.config.users,action_id:0 @@ -6593,7 +6593,7 @@ msgstr "" #. module: base #: model:res.country,name:base.tg msgid "Togo" -msgstr "" +msgstr "Того" #. module: base #: selection:ir.module.module,license:0 @@ -6603,7 +6603,7 @@ msgstr "" #. module: base #: selection:workflow.activity,kind:0 msgid "Stop All" -msgstr "" +msgstr "Барлығын тоқтату" #. module: base #: code:addons/orm.py:412 @@ -6624,7 +6624,7 @@ msgstr "" #. module: base #: selection:ir.model.fields,on_delete:0 msgid "Cascade" -msgstr "" +msgstr "Кезектеп" #. module: base #: field:workflow.transition,group_id:0 @@ -6639,12 +6639,12 @@ msgstr "" #. module: base #: field:res.groups,comment:0 msgid "Comment" -msgstr "" +msgstr "Түсініктеме" #. module: base #: model:res.country,name:base.ro msgid "Romania" -msgstr "" +msgstr "Румыния" #. module: base #: help:ir.cron,doall:0 @@ -6678,7 +6678,7 @@ msgstr "" #: field:res.config.users,context_tz:0 #: field:res.users,context_tz:0 msgid "Timezone" -msgstr "" +msgstr "Уақыт белдеуі" #. module: base #: model:ir.model,name:base.model_ir_actions_report_xml @@ -6731,7 +6731,7 @@ msgstr "" #. module: base #: model:res.country,name:base.by msgid "Belarus" -msgstr "" +msgstr "Белорусь" #. module: base #: field:ir.actions.act_window,name:0 @@ -6741,7 +6741,7 @@ msgstr "" #: field:ir.actions.url,name:0 #: field:ir.filters,name:0 msgid "Action Name" -msgstr "" +msgstr "Әрекеттің атауы" #. module: base #: model:ir.actions.act_window,help:base.action_res_users @@ -6755,7 +6755,7 @@ msgstr "" #. module: base #: selection:res.request,priority:0 msgid "Normal" -msgstr "" +msgstr "Қәдімгі" #. module: base #: field:res.bank,street2:0 @@ -6786,12 +6786,12 @@ msgstr "" #: view:res.users:0 #: field:res.widget.user,user_id:0 msgid "User" -msgstr "" +msgstr "Паайдаланушы" #. module: base #: model:res.country,name:base.pr msgid "Puerto Rico" -msgstr "" +msgstr "Пуэрто-Рико" #. module: base #: view:ir.actions.act_window:0 @@ -6806,22 +6806,22 @@ msgstr "" #. module: base #: field:ir.actions.act_window,filter:0 msgid "Filter" -msgstr "" +msgstr "Сүзгі" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam msgid "Ms." -msgstr "" +msgstr "миссис" #. module: base #: model:res.country,name:base.ch msgid "Switzerland" -msgstr "" +msgstr "Швейцария" #. module: base #: model:res.country,name:base.gd msgid "Grenada" -msgstr "" +msgstr "Гренада" #. module: base #: model:res.country,name:base.wf @@ -6841,7 +6841,7 @@ msgstr "" #. module: base #: view:base.language.install:0 msgid "Load" -msgstr "" +msgstr "Жүктеп алу" #. module: base #: help:res.config.users,name:0 @@ -6870,7 +6870,7 @@ msgstr "" #. module: base #: model:res.country,name:base.so msgid "Somalia" -msgstr "" +msgstr "Сомали" #. module: base #: selection:publisher_warranty.contract,state:0 @@ -6892,13 +6892,13 @@ msgstr "" #: field:res.request,act_to:0 #: field:res.request.history,act_to:0 msgid "To" -msgstr "" +msgstr "Кімге" #. module: base #: view:ir.cron:0 #: field:ir.cron,args:0 msgid "Arguments" -msgstr "" +msgstr "Аргументтер" #. module: base #: code:addons/orm.py:716 @@ -6939,7 +6939,7 @@ msgstr "" #: field:res.partner.address,is_customer_add:0 #: model:res.partner.category,name:base.res_partner_category_0 msgid "Customer" -msgstr "" +msgstr "Сатып алу" #. module: base #: selection:base.language.install,lang:0 @@ -6997,22 +6997,22 @@ msgstr "" #: field:res.widget.user,sequence:0 #: field:wizard.ir.model.menu.create.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Тізбек" #. module: base #: model:res.country,name:base.tn msgid "Tunisia" -msgstr "" +msgstr "Тунис" #. module: base #: model:ir.ui.menu,name:base.menu_mrp_root msgid "Manufacturing" -msgstr "" +msgstr "Өндіру" #. module: base #: model:res.country,name:base.km msgid "Comoros" -msgstr "" +msgstr "Комор ар-ы" #. module: base #: model:ir.actions.act_window,name:base.action_server_action @@ -7096,7 +7096,7 @@ msgstr "" #: field:res.request.link,object:0 #: field:workflow.triggers,model:0 msgid "Object" -msgstr "" +msgstr "Объект" #. module: base #: code:addons/osv.py:151 @@ -7127,7 +7127,7 @@ msgstr "" #. module: base #: model:ir.ui.menu,name:base.next_id_10 msgid "Scheduler" -msgstr "" +msgstr "Іс кестесі" #. module: base #: help:ir.cron,numbercall:0 @@ -7158,7 +7158,7 @@ msgstr "" #. module: base #: model:res.widget,title:base.google_maps_widget msgid "Google Maps" -msgstr "" +msgstr "Google Maps" #. module: base #: model:ir.ui.menu,name:base.menu_base_config @@ -7169,7 +7169,7 @@ msgstr "" #: model:ir.ui.menu,name:base.menu_marketing_config_root #: view:res.company:0 msgid "Configuration" -msgstr "" +msgstr "Баптау" #. module: base #: model:ir.model,name:base.model_publisher_warranty_contract_wizard @@ -7210,17 +7210,17 @@ msgstr "" #. module: base #: model:res.country,name:base.tr msgid "Turkey" -msgstr "" +msgstr "Түркия" #. module: base #: model:res.country,name:base.fk msgid "Falkland Islands" -msgstr "" +msgstr "Фолкленд (Мальвин) ар-ы" #. module: base #: model:res.country,name:base.lb msgid "Lebanon" -msgstr "" +msgstr "Ливан" #. module: base #: view:ir.actions.report.xml:0 @@ -7242,7 +7242,7 @@ msgstr "" #: field:workflow.instance,state:0 #: field:workflow.workitem,state:0 msgid "State" -msgstr "" +msgstr "Облыс/Штаты" #. module: base #: selection:base.language.install,lang:0 @@ -7252,7 +7252,7 @@ msgstr "" #. module: base #: model:res.country,name:base.no msgid "Norway" -msgstr "" +msgstr "Норвегия" #. module: base #: view:res.lang:0 @@ -7278,7 +7278,7 @@ msgstr "" #. module: base #: model:res.country,name:base.kg msgid "Kyrgyz Republic (Kyrgyzstan)" -msgstr "" +msgstr "Қырғызстан" #. module: base #: selection:res.request,state:0 @@ -7304,7 +7304,7 @@ msgstr "" #. module: base #: view:ir.attachment:0 msgid "Created" -msgstr "" +msgstr "Құрылған кезі" #. module: base #: help:ir.actions.wizard,multi:0 @@ -7321,7 +7321,7 @@ msgstr "" #. module: base #: model:res.country,name:base.hm msgid "Heard and McDonald Islands" -msgstr "" +msgstr "Херд және Макдоналд ар-ы" #. module: base #: field:ir.actions.act_window,view_id:0 @@ -7331,7 +7331,7 @@ msgstr "" #. module: base #: selection:ir.translation,type:0 msgid "Selection" -msgstr "" +msgstr "Таңдағанды ғана" #. module: base #: field:res.company,rml_header1:0 @@ -7375,30 +7375,30 @@ msgstr "" #: view:ir.module.module:0 #: field:ir.module.module,category_id:0 msgid "Category" -msgstr "" +msgstr "Санат" #. module: base #: view:ir.attachment:0 #: selection:ir.attachment,type:0 #: selection:ir.property,type:0 msgid "Binary" -msgstr "" +msgstr "Екілік" #. module: base #: field:ir.actions.server,sms:0 #: selection:ir.actions.server,state:0 msgid "SMS" -msgstr "" +msgstr "SMS" #. module: base #: model:res.country,name:base.cr msgid "Costa Rica" -msgstr "" +msgstr "Коста Рика" #. module: base #: view:workflow.activity:0 msgid "Conditions" -msgstr "" +msgstr "Шарттары" #. module: base #: model:ir.actions.act_window,name:base.action_partner_other_form @@ -7435,7 +7435,7 @@ msgstr "" #. module: base #: model:res.country,name:base.dk msgid "Denmark" -msgstr "" +msgstr "Дания" #. module: base #: field:res.country,code:0 @@ -7480,12 +7480,12 @@ msgstr "" #. module: base #: model:res.partner.title,name:base.res_partner_title_madam msgid "Madam" -msgstr "" +msgstr "Мадам" #. module: base #: model:res.country,name:base.ee msgid "Estonia" -msgstr "" +msgstr "Эстония" #. module: base #: model:ir.ui.menu,name:base.dashboard @@ -7501,12 +7501,12 @@ msgstr "" #: field:res.config.users,new_password:0 #: field:res.users,new_password:0 msgid "Change password" -msgstr "" +msgstr "Парольді өзгерту" #. module: base #: model:res.country,name:base.nl msgid "Netherlands" -msgstr "" +msgstr "Нидерланды" #. module: base #: model:ir.ui.menu,name:base.next_id_4 @@ -7541,12 +7541,12 @@ msgstr "" #: model:ir.ui.menu,name:base.menu_emails #: model:ir.ui.menu,name:base.menu_mail_gateway msgid "Emails" -msgstr "" +msgstr "Эл.пошта адрестер" #. module: base #: model:res.country,name:base.cd msgid "Congo, The Democratic Republic of the" -msgstr "" +msgstr "Конго (КДР)" #. module: base #: selection:base.language.install,lang:0 @@ -7558,12 +7558,12 @@ msgstr "" #: field:res.request,body:0 #: field:res.request.history,req_id:0 msgid "Request" -msgstr "" +msgstr "Сұрақ" #. module: base #: model:res.country,name:base.jp msgid "Japan" -msgstr "" +msgstr "Жапония" #. module: base #: field:ir.cron,numbercall:0 @@ -7591,7 +7591,7 @@ msgstr "" #. module: base #: model:res.country,name:base.gr msgid "Greece" -msgstr "" +msgstr "Грекия" #. module: base #: field:res.request,trigger_date:0 @@ -7632,7 +7632,7 @@ msgstr "" #: view:ir.actions.server:0 #: selection:ir.actions.server,state:0 msgid "Trigger" -msgstr "" +msgstr "Бастауыш" #. module: base #: model:ir.model,name:base.model_base_module_update @@ -7643,17 +7643,17 @@ msgstr "" #: view:ir.model.fields:0 #: field:ir.model.fields,translate:0 msgid "Translate" -msgstr "" +msgstr "Жылжыту" #. module: base #: field:res.request.history,body:0 msgid "Body" -msgstr "" +msgstr "Беті" #. module: base #: view:partner.wizard.spam:0 msgid "Send Email" -msgstr "" +msgstr "Эл.пошта жолдау" #. module: base #: field:res.config.users,menu_id:0 @@ -7697,7 +7697,7 @@ msgstr "" #. module: base #: view:publisher_warranty.contract.wizard:0 msgid "Register" -msgstr "" +msgstr "Тіркелу" #. module: base #: field:res.request,ref_doc2:0 @@ -7712,7 +7712,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ga msgid "Gabon" -msgstr "" +msgstr "Габон" #. module: base #: model:ir.model,name:base.model_ir_model_data @@ -7724,12 +7724,12 @@ msgstr "" #: view:ir.rule:0 #: view:res.groups:0 msgid "Access Rights" -msgstr "" +msgstr "Қатынау құқықтары" #. module: base #: model:res.country,name:base.gl msgid "Greenland" -msgstr "" +msgstr "Гренландия" #. module: base #: field:res.partner.bank,acc_number:0 @@ -7749,7 +7749,7 @@ msgstr "" #. module: base #: model:res.country,name:base.cy msgid "Cyprus" -msgstr "" +msgstr "Кипр" #. module: base #: view:base.module.import:0 @@ -7764,18 +7764,18 @@ msgstr "" #: field:partner.wizard.spam,subject:0 #: field:res.request,name:0 msgid "Subject" -msgstr "" +msgstr "Нысаны" #. module: base #: field:res.request,act_from:0 #: field:res.request.history,act_from:0 msgid "From" -msgstr "" +msgstr "Кімден" #. module: base #: view:res.users:0 msgid "Preferences" -msgstr "" +msgstr "Баптаулары" #. module: base #: model:res.partner.category,name:base.res_partner_category_consumers0 @@ -7786,7 +7786,7 @@ msgstr "" #: view:res.config:0 #: wizard_button:server.action.create,init,step_1:0 msgid "Next" -msgstr "" +msgstr "Келесі" #. module: base #: help:ir.cron,function:0 @@ -7806,12 +7806,12 @@ msgstr "" #. module: base #: view:ir.actions.report.xml:0 msgid "Miscellaneous" -msgstr "" +msgstr "Әр түрлі" #. module: base #: model:res.country,name:base.cn msgid "China" -msgstr "" +msgstr "Қытай" #. module: base #: code:addons/base/res/res_user.py:516 @@ -7824,7 +7824,7 @@ msgstr "" #. module: base #: model:res.country,name:base.eh msgid "Western Sahara" -msgstr "" +msgstr "Батыс Сахара" #. module: base #: model:ir.model,name:base.model_workflow @@ -7841,7 +7841,7 @@ msgstr "" #. module: base #: model:res.country,name:base.id msgid "Indonesia" -msgstr "" +msgstr "Индонезия" #. module: base #: view:base.update.translations:0 @@ -7861,7 +7861,7 @@ msgstr "" #. module: base #: model:res.country,name:base.bg msgid "Bulgaria" -msgstr "" +msgstr "Болгария" #. module: base #: view:publisher_warranty.contract.wizard:0 @@ -7871,12 +7871,12 @@ msgstr "" #. module: base #: model:res.country,name:base.ao msgid "Angola" -msgstr "" +msgstr "Ангола" #. module: base #: model:res.country,name:base.tf msgid "French Southern Territories" -msgstr "" +msgstr "Францияның солтүстік аймақтары" #. module: base #: model:ir.model,name:base.model_res_currency @@ -7886,7 +7886,7 @@ msgstr "" #: field:res.currency,name:0 #: field:res.currency.rate,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Ақша" #. module: base #: field:res.partner.canal,name:0 @@ -7912,12 +7912,12 @@ msgstr "" #. module: base #: view:res.company:0 msgid "Landscape" -msgstr "" +msgstr "Көлденең" #. module: base #: model:ir.ui.menu,name:base.menu_administration msgid "Administration" -msgstr "" +msgstr "Әкімшілік" #. module: base #: view:base.module.update:0 @@ -7927,7 +7927,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ir msgid "Iran" -msgstr "" +msgstr "Иран" #. module: base #: model:ir.actions.act_window,name:base.res_widget_user_act_window @@ -7945,12 +7945,12 @@ msgstr "" #: field:ir.ui.menu,icon_pict:0 #: field:publisher_warranty.contract.wizard,state:0 msgid "unknown" -msgstr "" +msgstr "беймәлім" #. module: base #: field:res.currency,symbol:0 msgid "Symbol" -msgstr "" +msgstr "Белгісі" #. module: base #: help:res.config.users,login:0 @@ -7971,29 +7971,29 @@ msgstr "" #. module: base #: model:res.country,name:base.ki msgid "Kiribati" -msgstr "" +msgstr "Кирибати" #. module: base #: model:res.country,name:base.iq msgid "Iraq" -msgstr "" +msgstr "Ирак" #. module: base #: model:ir.ui.menu,name:base.menu_association msgid "Association" -msgstr "" +msgstr "Байланыс" #. module: base #: model:res.country,name:base.cl msgid "Chile" -msgstr "" +msgstr "Чили" #. module: base #: model:ir.ui.menu,name:base.menu_address_book #: model:ir.ui.menu,name:base.menu_config_address_book #: model:ir.ui.menu,name:base.menu_procurement_management_supplier msgid "Address Book" -msgstr "" +msgstr "Адрестік кітапша" #. module: base #: model:ir.model,name:base.model_ir_sequence_type @@ -8034,7 +8034,7 @@ msgstr "" #. module: base #: model:res.country,name:base.dj msgid "Djibouti" -msgstr "" +msgstr "Джибути" #. module: base #: field:ir.translation,value:0 @@ -8044,7 +8044,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ag msgid "Antigua and Barbuda" -msgstr "" +msgstr "Антигуа және Барбуда" #. module: base #: code:addons/orm.py:3166 @@ -8057,7 +8057,7 @@ msgstr "" #. module: base #: model:res.country,name:base.zr msgid "Zaire" -msgstr "" +msgstr "Заир" #. module: base #: field:ir.model.data,res_id:0 @@ -8071,7 +8071,7 @@ msgstr "" #: view:ir.cron:0 #: field:ir.model,info:0 msgid "Information" -msgstr "" +msgstr "Ақпарат" #. module: base #: view:res.widget.user:0 @@ -8086,12 +8086,12 @@ msgstr "" #. module: base #: selection:res.partner.address,type:0 msgid "Other" -msgstr "" +msgstr "Басқа" #. module: base #: view:res.request:0 msgid "Reply" -msgstr "" +msgstr "Жауап беру" #. module: base #: selection:base.language.install,lang:0 @@ -8104,12 +8104,12 @@ msgstr "" #: view:workflow:0 #: field:workflow,activities:0 msgid "Activities" -msgstr "" +msgstr "Істер" #. module: base #: field:ir.actions.act_window,auto_refresh:0 msgid "Auto-Refresh" -msgstr "" +msgstr "Автожаңарту" #. module: base #: code:addons/base/ir/ir_model.py:62 @@ -8151,22 +8151,22 @@ msgstr "" #: model:ir.ui.menu,name:base.next_id_6 #: view:workflow.activity:0 msgid "Actions" -msgstr "" +msgstr "Әрекеттер" #. module: base #: selection:res.request,priority:0 msgid "High" -msgstr "" +msgstr "Жоғары" #. module: base #: field:ir.exports.line,export_id:0 msgid "Export" -msgstr "" +msgstr "Экспорт" #. module: base #: model:res.country,name:base.hr msgid "Croatia" -msgstr "" +msgstr "Хорватия" #. module: base #: help:res.bank,bic:0 @@ -8176,7 +8176,7 @@ msgstr "" #. module: base #: model:res.country,name:base.tm msgid "Turkmenistan" -msgstr "" +msgstr "Түрікменстан" #. module: base #: code:addons/base/ir/ir_actions.py:597 @@ -8208,12 +8208,12 @@ msgstr "" #: code:addons/orm.py:3199 #, python-format msgid "Error" -msgstr "" +msgstr "Қате" #. module: base #: model:res.country,name:base.pm msgid "Saint Pierre and Miquelon" -msgstr "" +msgstr "Сен-Пьер және Микелон" #. module: base #: help:ir.actions.report.xml,header:0 @@ -8229,7 +8229,7 @@ msgstr "" #: view:base.module.update:0 #: view:base.update.translations:0 msgid "Update" -msgstr "" +msgstr "Жаңарту" #. module: base #: model:ir.actions.report.xml,name:base.ir_module_reference_print @@ -8239,7 +8239,7 @@ msgstr "" #. module: base #: model:res.country,name:base.tz msgid "Tanzania" -msgstr "" +msgstr "Танзания" #. module: base #: selection:base.language.install,lang:0 @@ -8254,7 +8254,7 @@ msgstr "" #. module: base #: model:res.country,name:base.cx msgid "Christmas Island" -msgstr "" +msgstr "Милад аралы" #. module: base #: view:ir.actions.server:0 @@ -8272,7 +8272,7 @@ msgstr "" #: model:ir.ui.menu,name:base.menu_res_partner_canal-act #: view:res.partner.canal:0 msgid "Channels" -msgstr "" +msgstr "Арналары" #. module: base #: view:ir.ui.view:0 @@ -8309,7 +8309,7 @@ msgstr "" #. module: base #: view:res.request:0 msgid "Send" -msgstr "" +msgstr "Жіберу" #. module: base #: field:res.config.users,menu_tips:0 @@ -8320,7 +8320,7 @@ msgstr "" #. module: base #: field:ir.translation,src:0 msgid "Source" -msgstr "" +msgstr "Көзі" #. module: base #: help:res.partner.address,partner_id:0 @@ -8330,7 +8330,7 @@ msgstr "" #. module: base #: model:res.country,name:base.vu msgid "Vanuatu" -msgstr "" +msgstr "Вануату" #. module: base #: view:res.company:0 @@ -8370,7 +8370,7 @@ msgstr "" #. module: base #: model:res.country,name:base.do msgid "Dominican Republic" -msgstr "" +msgstr "Доминикан Республикасы" #. module: base #: selection:base.language.install,lang:0 @@ -8388,7 +8388,7 @@ msgstr "" #. module: base #: model:res.country,name:base.sa msgid "Saudi Arabia" -msgstr "" +msgstr "Сауд Арабиясы" #. module: base #: help:res.partner,supplier:0 @@ -8442,12 +8442,12 @@ msgstr "" #. module: base #: model:res.country,name:base.gn msgid "Guinea" -msgstr "" +msgstr "Гвинея" #. module: base #: model:res.country,name:base.lu msgid "Luxembourg" -msgstr "" +msgstr "Люксембург" #. module: base #: help:ir.values,key2:0 @@ -8484,14 +8484,14 @@ msgstr "" #. module: base #: model:res.country,name:base.sv msgid "El Salvador" -msgstr "" +msgstr "Сальвадор" #. module: base #: field:res.bank,phone:0 #: field:res.partner,phone:0 #: field:res.partner.address,phone:0 msgid "Phone" -msgstr "" +msgstr "Телефондау" #. module: base #: field:ir.cron,active:0 @@ -8509,12 +8509,12 @@ msgstr "" #: view:workflow.instance:0 #: view:workflow.workitem:0 msgid "Active" -msgstr "" +msgstr "Белсенді" #. module: base #: model:res.country,name:base.th msgid "Thailand" -msgstr "" +msgstr "Тайланд" #. module: base #: model:ir.ui.menu,name:base.menu_crm_config_lead @@ -8535,7 +8535,7 @@ msgstr "" #: selection:workflow.activity,join_mode:0 #: selection:workflow.activity,split_mode:0 msgid "And" -msgstr "" +msgstr "Және" #. module: base #: field:ir.model.fields,relation:0 @@ -8546,12 +8546,12 @@ msgstr "" #: view:ir.rule:0 #: view:res.partner:0 msgid "General" -msgstr "" +msgstr "Жалпы" #. module: base #: model:res.country,name:base.uz msgid "Uzbekistan" -msgstr "" +msgstr "Өзбекстан" #. module: base #: model:ir.model,name:base.model_ir_actions_act_window @@ -8572,7 +8572,7 @@ msgstr "" #. module: base #: model:res.country,name:base.tw msgid "Taiwan" -msgstr "" +msgstr "Тайвань ар." #. module: base #: model:ir.model,name:base.model_res_currency_rate @@ -8635,7 +8635,7 @@ msgstr "" #: view:ir.property:0 #: field:ir.property,res_id:0 msgid "Resource" -msgstr "" +msgstr "Ресурс" #. module: base #: field:ir.ui.menu,web_icon:0 @@ -8682,18 +8682,18 @@ msgstr "" #: field:base.language.export,name:0 #: field:ir.attachment,datas_fname:0 msgid "Filename" -msgstr "" +msgstr "Файл атауы" #. module: base #: field:ir.model,access_ids:0 #: view:ir.model.access:0 msgid "Access" -msgstr "" +msgstr "Құқықтары" #. module: base #: model:res.country,name:base.sk msgid "Slovak Republic" -msgstr "" +msgstr "Словакия Республикасы" #. module: base #: model:ir.ui.menu,name:base.publisher_warranty @@ -8703,22 +8703,22 @@ msgstr "" #. module: base #: model:res.country,name:base.aw msgid "Aruba" -msgstr "" +msgstr "Аруба" #. module: base #: model:res.country,name:base.ar msgid "Argentina" -msgstr "" +msgstr "Аргентина" #. module: base #: field:res.groups,name:0 msgid "Group Name" -msgstr "" +msgstr "Топ атауы" #. module: base #: model:res.country,name:base.bh msgid "Bahrain" -msgstr "" +msgstr "Бахрейн" #. module: base #: model:res.partner.category,name:base.res_partner_category_12 @@ -8740,7 +8740,7 @@ msgstr "" #: view:res.users:0 #: field:res.users,company_id:0 msgid "Company" -msgstr "" +msgstr "Компания" #. module: base #: view:res.users:0 @@ -8765,12 +8765,12 @@ msgstr "" #. module: base #: view:ir.actions.todo:0 msgid "Launch" -msgstr "" +msgstr "Ашу" #. module: base #: field:ir.actions.act_window,limit:0 msgid "Limit" -msgstr "" +msgstr "Шегі" #. module: base #: help:ir.actions.server,wkf_model_id:0 @@ -8780,7 +8780,7 @@ msgstr "" #. module: base #: model:res.country,name:base.jm msgid "Jamaica" -msgstr "" +msgstr "Ямайка" #. module: base #: model:ir.actions.act_window,help:base.action_partner_category_form @@ -8794,13 +8794,13 @@ msgstr "" #. module: base #: model:res.country,name:base.az msgid "Azerbaijan" -msgstr "" +msgstr "Әзірбайжан" #. module: base #: code:addons/base/res/partner/partner.py:250 #, python-format msgid "Warning" -msgstr "" +msgstr "Ескерту" #. module: base #: selection:base.language.install,lang:0 @@ -8816,7 +8816,7 @@ msgstr "" #: view:ir.property:0 #: model:ir.ui.menu,name:base.next_id_15 msgid "Parameters" -msgstr "" +msgstr "Параметрлер" #. module: base #: selection:base.language.install,lang:0 @@ -8840,7 +8840,7 @@ msgstr "" #. module: base #: model:res.country,name:base.rw msgid "Rwanda" -msgstr "" +msgstr "Руанда" #. module: base #: view:ir.sequence:0 @@ -8850,7 +8850,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ck msgid "Cook Islands" -msgstr "" +msgstr "Кук ар-ы" #. module: base #: field:ir.model.data,noupdate:0 @@ -8865,12 +8865,12 @@ msgstr "" #. module: base #: model:res.country,name:base.sg msgid "Singapore" -msgstr "" +msgstr "Сингапур" #. module: base #: selection:ir.actions.act_window,target:0 msgid "Current Window" -msgstr "" +msgstr "Назардағы терезе" #. module: base #: view:ir.values:0 @@ -8895,7 +8895,7 @@ msgstr "" #: field:res.partner.address,country_id:0 #: field:res.partner.bank,country_id:0 msgid "Country" -msgstr "" +msgstr "Кантри" #. module: base #: field:ir.model.fields,complete_name:0 @@ -8928,7 +8928,7 @@ msgstr "" #. module: base #: view:ir.actions.act_window:0 msgid "Select Groups" -msgstr "" +msgstr "Топтарды таңдау" #. module: base #: view:res.lang:0 @@ -8952,7 +8952,7 @@ msgstr "" #. module: base #: view:res.company:0 msgid "Portrait" -msgstr "" +msgstr "Тік" #. module: base #: code:addons/base/ir/ir_model.py:317 @@ -8975,7 +8975,7 @@ msgstr "" #: selection:ir.ui.view,type:0 #: selection:wizard.ir.model.menu.create.line,view_type:0 msgid "Graph" -msgstr "" +msgstr "График" #. module: base #: model:ir.model,name:base.model_ir_actions_server @@ -9027,13 +9027,13 @@ msgstr "" #. module: base #: view:ir.cron:0 msgid "Execution" -msgstr "" +msgstr "Орындау" #. module: base #: field:ir.actions.server,condition:0 #: field:workflow.transition,condition:0 msgid "Condition" -msgstr "" +msgstr "Шарты" #. module: base #: help:ir.values,model_id:0 @@ -9099,7 +9099,7 @@ msgstr "" #. module: base #: model:res.country,name:base.sc msgid "Seychelles" -msgstr "" +msgstr "Сейшел ар-ы" #. module: base #: model:ir.model,name:base.model_res_partner_bank @@ -9110,18 +9110,18 @@ msgstr "" #. module: base #: model:res.country,name:base.sl msgid "Sierra Leone" -msgstr "" +msgstr "Съера-Леоне" #. module: base #: view:res.company:0 #: view:res.partner:0 msgid "General Information" -msgstr "" +msgstr "Жалпы мәліметі" #. module: base #: model:res.country,name:base.tc msgid "Turks and Caicos Islands" -msgstr "" +msgstr "Теркс және Кайкос ар-ы" #. module: base #: field:res.partner.bank,owner_name:0 @@ -9155,7 +9155,7 @@ msgstr "" #: field:res.partner.address,function:0 #: selection:workflow.activity,kind:0 msgid "Function" -msgstr "" +msgstr "Функция" #. module: base #: view:res.widget:0 @@ -9165,7 +9165,7 @@ msgstr "" #. module: base #: selection:ir.actions.todo,restart:0 msgid "Never" -msgstr "" +msgstr "Ешқашан" #. module: base #: selection:res.partner.address,type:0 @@ -9181,7 +9181,7 @@ msgstr "" #. module: base #: model:res.country,name:base.gw msgid "Guinea Bissau" -msgstr "" +msgstr "Гвинея-Биссау" #. module: base #: view:workflow.instance:0 @@ -9197,7 +9197,7 @@ msgstr "" #. module: base #: model:res.country,name:base.kp msgid "North Korea" -msgstr "" +msgstr "Солтүстік Корея" #. module: base #: selection:ir.actions.server,state:0 @@ -9208,7 +9208,7 @@ msgstr "" #: view:ir.filters:0 #: field:res.log,context:0 msgid "Context" -msgstr "" +msgstr "Контексті" #. module: base #: field:res.bank,bic:0 @@ -9240,7 +9240,7 @@ msgstr "" #. module: base #: model:res.country,name:base.lk msgid "Sri Lanka" -msgstr "" +msgstr "Шри-Ланка" #. module: base #: selection:base.language.install,lang:0 diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index b3e6de7ada7..0c9f06f7616 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po index 71f2b0c5116..c7e18317fba 100644 --- a/openerp/addons/base/i18n/lt.po +++ b/openerp/addons/base/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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po index 38532bef174..0da2007afb9 100644 --- a/openerp/addons/base/i18n/lv.po +++ b/openerp/addons/base/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: 2011-10-01 05:03+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po index e5e1f7bf252..3de84393b91 100644 --- a/openerp/addons/base/i18n/mk.po +++ b/openerp/addons/base/i18n/mk.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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po index 797df905133..881a0a9fcbf 100644 --- a/openerp/addons/base/i18n/mn.po +++ b/openerp/addons/base/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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index ad136cf464e..70e78b8367e 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 57df6c192f4..9f4ac74025c 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-30 20:44+0000\n" -"Last-Translator: Antony Lesuisse (OpenERP) \n" +"PO-Revision-Date: 2011-10-26 15:29+0000\n" +"Last-Translator: Michel Vorenhout \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: 2011-10-01 05:02+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -8107,9 +8107,9 @@ msgid "" "loading a new language it becomes available as default interface language " "for users and partners." msgstr "" -"Deze assitent helpt u een nieuwe taal toe te voegen aan uw OpenERP systeem. " -"Na het laden van de nieuwe taal komt het beschikbaar als standaard interface " -"taal voor gebruikers en relaties." +"Deze assistent helpt u een nieuwe taal toe te voegen aan uw OpenERP systeem. " +"Na het laden van de nieuwe taal komt deze beschikbaar als standaard " +"interface taal voor gebruikers en relaties." #. module: base #: field:ir.actions.server,subject:0 diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index 72a89e3dda6..472cfd510f8 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.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: 2011-10-01 05:07+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index 332be04207c..d959968d143 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index cee7a6eda8a..17589906ba9 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index 79dc0c324a0..bdef1ea69f9 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index 7df48b5a664..e0253177327 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index 391adaac3b1..03edac202ac 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/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: 2011-10-01 05:04+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po index 10016a1cfff..2237abc8605 100644 --- a/openerp/addons/base/i18n/sk.po +++ b/openerp/addons/base/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: 2011-10-01 05:05+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index ee292629ca7..3813ffeaca9 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/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: 2011-10-05 04:44+0000\n" -"X-Generator: Launchpad (build 14085)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -211,7 +211,7 @@ msgstr "Struktura podjetja" #. module: base #: selection:base.language.install,lang:0 msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ" -msgstr "" +msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ" #. module: base #: view:res.partner:0 @@ -524,7 +524,7 @@ msgstr "Ime opcijskega modula predmeta na katerem bo to dejanje vidno" #. module: base #: field:workflow.transition,trigger_expr_id:0 msgid "Trigger Expression" -msgstr "" +msgstr "Izraz sprožilnika" #. module: base #: model:res.country,name:base.jo @@ -956,7 +956,7 @@ msgstr "Spletna stran" #. module: base #: model:res.country,name:base.gs msgid "S. Georgia & S. Sandwich Isls." -msgstr "" +msgstr "S. Georgia in S. Sandwich otoki" #. module: base #: field:ir.actions.url,url:0 @@ -1278,7 +1278,7 @@ msgstr "Računska natančnost" #. module: base #: selection:base.language.install,lang:0 msgid "Sinhalese / සිංහල" -msgstr "" +msgstr "Sinhalese / සිංහල" #. module: base #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line @@ -1730,7 +1730,7 @@ msgstr "Poenostavljen" #. module: base #: model:res.country,name:base.st msgid "Saint Tome (Sao Tome) and Principe" -msgstr "" +msgstr "Saint Tome (Sao Tome) in Principe" #. module: base #: selection:res.partner.address,type:0 @@ -2165,7 +2165,7 @@ msgstr "Ime partnerja" #. module: base #: field:workflow.activity,signal_send:0 msgid "Signal (subflow.*)" -msgstr "" +msgstr "Signal (subflow.*)" #. module: base #: model:res.partner.category,name:base.res_partner_category_17 @@ -2545,7 +2545,7 @@ msgstr "Ruska federacija" #. module: base #: selection:base.language.install,lang:0 msgid "Urdu / اردو" -msgstr "" +msgstr "Urdu / اردو" #. module: base #: field:res.company,name:0 @@ -3218,7 +3218,7 @@ msgstr "Poročila po meri" #. module: base #: selection:base.language.install,lang:0 msgid "Abkhazian / аҧсуа" -msgstr "" +msgstr "Copy text \t Abkhazian / аҧсуа" #. module: base #: view:base.module.configuration:0 @@ -3865,7 +3865,7 @@ msgstr "Seznam kontrole dostopa" #. module: base #: model:res.country,name:base.um msgid "USA Minor Outlying Islands" -msgstr "" +msgstr "Manjši oddaljeni otoki ZDA" #. module: base #: field:res.partner.bank,state:0 @@ -3894,7 +3894,7 @@ msgstr "Datum inicializacije" #. module: base #: selection:base.language.install,lang:0 msgid "Gujarati / ગુજરાતી" -msgstr "" +msgstr "Gujarati / ગુજરાતી" #. module: base #: code:addons/base/module/module.py:257 @@ -3946,7 +3946,7 @@ msgstr "Ure" #. module: base #: model:res.country,name:base.gp msgid "Guadeloupe (French)" -msgstr "" +msgstr "Guadeloupe (francoski)" #. module: base #: code:addons/base/res/res_lang.py:157 @@ -4088,7 +4088,7 @@ msgstr "Natančnost cene" #. module: base #: selection:base.language.install,lang:0 msgid "Latvian / latviešu valoda" -msgstr "" +msgstr "Latvijsko / latviešu valoda" #. module: base #: view:res.config:0 @@ -4099,7 +4099,7 @@ msgstr "vsep" #. module: base #: selection:base.language.install,lang:0 msgid "French / Français" -msgstr "" +msgstr "Francosko / Français" #. module: base #: code:addons/orm.py:1049 @@ -4193,7 +4193,7 @@ msgstr "Meniji" #. module: base #: selection:base.language.install,lang:0 msgid "Serbian (Latin) / srpski" -msgstr "" +msgstr "Srbsko (Latin) / srpski" #. module: base #: model:res.country,name:base.il @@ -4266,7 +4266,7 @@ msgstr "Banke" #. module: base #: view:res.log:0 msgid "Unread" -msgstr "" +msgstr "Neprebrano" #. module: base #: field:ir.cron,doall:0 @@ -4393,7 +4393,7 @@ msgstr "Za sorodna polja, tehnično ime ciljnega modela" #. module: base #: selection:base.language.install,lang:0 msgid "Indonesian / Bahasa Indonesia" -msgstr "" +msgstr "Indonezijski / Bahasa Indonesia" #. module: base #: field:ir.ui.view,inherit_id:0 @@ -4847,7 +4847,7 @@ msgstr "Elementi delovnih procesov" #. module: base #: model:res.country,name:base.vc msgid "Saint Vincent & Grenadines" -msgstr "" +msgstr "Saint Vincent in Grenadine" #. module: base #: field:partner.sms.send,password:0 @@ -4886,7 +4886,7 @@ msgstr "RML interna glava" #. module: base #: field:ir.actions.act_window,search_view_id:0 msgid "Search View Ref." -msgstr "" +msgstr "Sklic pogleda iskanja" #. module: base #: field:ir.module.module,installed_version:0 @@ -5144,7 +5144,7 @@ msgstr "Nadrejena kategorija" #. module: base #: selection:ir.property,type:0 msgid "Integer Big" -msgstr "" +msgstr "Veliko celo število" #. module: base #: selection:res.partner.address,type:0 @@ -5440,7 +5440,7 @@ msgstr "Naprej" #. module: base #: selection:base.language.install,lang:0 msgid "Thai / ภาษาไทย" -msgstr "" +msgstr "Tajski/ ภาษาไทย" #. module: base #: code:addons/orm.py:158 @@ -5523,7 +5523,7 @@ msgstr "Privzeto podjetje" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (EC) / Español (EC)" -msgstr "" +msgstr "Špansko (EC) / Español (EC)" #. module: base #: help:ir.ui.view,xml_id:0 @@ -5598,7 +5598,7 @@ msgstr "Zaposlovanje" #. module: base #: model:res.country,name:base.re msgid "Reunion (French)" -msgstr "" +msgstr "Reunion (francoski)" #. module: base #: code:addons/base/ir/ir_model.py:321 @@ -5732,7 +5732,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Flemish (BE) / Vlaams (BE)" -msgstr "" +msgstr "Flamski (BE) / Vlaams (BE)" #. module: base #: field:ir.cron,interval_number:0 @@ -5797,7 +5797,7 @@ msgstr "Bližnjice po meri" #. module: base #: selection:base.language.install,lang:0 msgid "Vietnamese / Tiếng Việt" -msgstr "" +msgstr "Vietnamski/ Tiếng Việt" #. module: base #: model:res.country,name:base.dz @@ -5915,7 +5915,7 @@ msgstr "Nevtralno območje" #. module: base #: selection:base.language.install,lang:0 msgid "Hindi / हिंदी" -msgstr "" +msgstr "Hindujski / हिंदी" #. module: base #: view:ir.model:0 @@ -6121,7 +6121,7 @@ msgstr "Osnova" #. module: base #: selection:base.language.install,lang:0 msgid "Telugu / తెలుగు" -msgstr "" +msgstr "Copy text \t Telugu / తెలుగు" #. module: base #: model:res.country,name:base.lr @@ -6210,7 +6210,7 @@ msgstr "Kode zaporedja" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (CO) / Español (CO)" -msgstr "" +msgstr "Špansko (CO) / Español (CO)" #. module: base #: view:base.module.configuration:0 @@ -6250,7 +6250,7 @@ msgstr "res.log" #: help:ir.translation,module:0 #: help:ir.translation,xml_id:0 msgid "Maps to the ir_model_data for which this translation is provided." -msgstr "" +msgstr "Mapira k ir_model_data za katerega je zagotovljen prevod." #. module: base #: view:workflow.activity:0 @@ -6266,7 +6266,7 @@ msgstr "Tedni" #. module: base #: model:res.country,name:base.af msgid "Afghanistan, Islamic State of" -msgstr "" +msgstr "Afganistan, Muslimanska država" #. module: base #: code:addons/base/module/wizard/base_module_import.py:67 @@ -6324,7 +6324,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Chinese (TW) / 正體字" -msgstr "" +msgstr "Kitajsko (TW) / 正體字" #. module: base #: model:ir.model,name:base.model_res_request @@ -6382,7 +6382,7 @@ msgstr "Ime storitve" #. module: base #: model:res.country,name:base.pn msgid "Pitcairn Island" -msgstr "" +msgstr "Otok Pitcairn" #. module: base #: view:base.module.upgrade:0 @@ -6585,7 +6585,7 @@ msgstr "Nameščena različica" #. module: base #: selection:base.language.install,lang:0 msgid "Mongolian / монгол" -msgstr "" +msgstr "Mongolski / монгол" #. module: base #: model:res.country,name:base.mr @@ -6622,7 +6622,7 @@ msgstr "Krovno podjetje" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (CR) / Español (CR)" -msgstr "" +msgstr "Špansko (CR) / Español (CR)" #. module: base #: field:res.currency.rate,rate:0 @@ -6652,7 +6652,7 @@ msgstr "Orodja" #. module: base #: model:res.country,name:base.kn msgid "Saint Kitts & Nevis Anguilla" -msgstr "" +msgstr "Saint Kitts in Nevis Anguilla" #. module: base #: code:addons/base/res/res_currency.py:100 @@ -6717,7 +6717,7 @@ msgstr "Model kateremu ta polja pripadajo" #. module: base #: model:res.country,name:base.mq msgid "Martinique (French)" -msgstr "" +msgstr "Martinique (francoski)" #. module: base #: view:ir.sequence.type:0 @@ -6781,7 +6781,7 @@ msgstr "" #. module: base #: field:ir.ui.menu,child_id:0 msgid "Child IDs" -msgstr "" +msgstr "Podrejeni ID-ji" #. module: base #: code:addons/base/ir/ir_actions.py:713 @@ -7231,7 +7231,7 @@ msgstr "Stranka" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (NI) / Español (NI)" -msgstr "" +msgstr "Špansko (NI) / Español (NI)" #. module: base #: field:ir.module.module,shortdesc:0 @@ -7542,7 +7542,7 @@ msgstr "Stanje" #. module: base #: selection:base.language.install,lang:0 msgid "Galician / Galego" -msgstr "" +msgstr "Galski / Galego" #. module: base #: model:res.country,name:base.no @@ -7766,7 +7766,7 @@ msgstr "Nedefinirana metoda 'get'!" #. module: base #: selection:base.language.install,lang:0 msgid "Norwegian Bokmål / Norsk bokmål" -msgstr "" +msgstr "Norveški Bokmål / Norsk bokmål" #. module: base #: help:res.config.users,new_password:0 @@ -7827,7 +7827,7 @@ msgstr "ir.values" #. module: base #: selection:base.language.install,lang:0 msgid "Occitan (FR, post 1500) / Occitan" -msgstr "" +msgstr "Copy text \t Occitan (FR, post 1500) / Occitan" #. module: base #: model:ir.actions.act_window,help:base.open_module_tree @@ -7856,7 +7856,7 @@ msgstr "Demokratična republika Kongo" #. module: base #: selection:base.language.install,lang:0 msgid "Malayalam / മലയാളം" -msgstr "" +msgstr "Malezijski / മലയാളം" #. module: base #: view:res.request:0 @@ -7928,7 +7928,7 @@ msgstr "Koda države mora biti edinstvena!" #. module: base #: selection:ir.module.module.dependency,state:0 msgid "Uninstallable" -msgstr "" +msgstr "Nenamestljiv" #. module: base #: view:res.partner.category:0 @@ -8018,7 +8018,7 @@ msgstr "2.sklic dokument" #. module: base #: field:res.request,ref_doc1:0 msgid "Document Ref 1" -msgstr "" +msgstr "1.sklic dokumenta" #. module: base #: model:res.country,name:base.ga @@ -8055,7 +8055,7 @@ msgstr "Copy text \t 1. %c ==> Pet 5.Dec 2008 5 18:25:20" #. module: base #: model:res.country,name:base.nc msgid "New Caledonia (French)" -msgstr "" +msgstr "Nova Caledonia (francoski)" #. module: base #: model:res.country,name:base.cy @@ -8262,7 +8262,7 @@ msgstr "Gradiniki na uporabnika" #. module: base #: selection:base.language.install,lang:0 msgid "Slovak / Slovenský jazyk" -msgstr "" +msgstr "Slovaški / Slovenský jazyk" #. module: base #: field:base.language.export,state:0 @@ -8570,7 +8570,7 @@ msgstr "Tanzanija" #. module: base #: selection:base.language.install,lang:0 msgid "Danish / Dansk" -msgstr "" +msgstr "Danski / Dansk" #. module: base #: selection:ir.model.fields,select_level:0 @@ -8703,7 +8703,7 @@ msgstr "Dominikanska republika" #. module: base #: selection:base.language.install,lang:0 msgid "Serbian (Cyrillic) / српски" -msgstr "" +msgstr "Srbski (Cirilica) / српски" #. module: base #: code:addons/orm.py:2161 @@ -8860,7 +8860,7 @@ msgstr "Interesi & priložnosti" #. module: base #: selection:base.language.install,lang:0 msgid "Romanian / română" -msgstr "" +msgstr "Romunski/ română" #. module: base #: view:res.log:0 @@ -8985,7 +8985,7 @@ msgstr "Datoteka spletne ikone" #. module: base #: selection:base.language.install,lang:0 msgid "Persian / فارس" -msgstr "" +msgstr "Perzijski / فارس" #. module: base #: view:ir.actions.act_window:0 @@ -9099,7 +9099,7 @@ msgstr "Pogodba založniške garancije" #. module: base #: selection:base.language.install,lang:0 msgid "Bulgarian / български език" -msgstr "" +msgstr "Bolgarski / български език" #. module: base #: model:ir.ui.menu,name:base.menu_aftersale @@ -9212,7 +9212,7 @@ msgstr "Ni mogoče posodobiti" #. module: base #: selection:base.language.install,lang:0 msgid "Klingon" -msgstr "" +msgstr "Klingon" #. module: base #: model:res.country,name:base.sg @@ -9295,7 +9295,7 @@ msgstr "%X - primeren čas zastopnja" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (SV) / Español (SV)" -msgstr "" +msgstr "Španski (SV) / Español (SV)" #. module: base #: help:res.lang,grouping:0 diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po index 30f2c54bb2a..10aa34412e9 100644 --- a/openerp/addons/base/i18n/sq.po +++ b/openerp/addons/base/i18n/sq.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: 2011-10-01 05:00+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po index 0d81e8b9fea..7619b9fb9b2 100644 --- a/openerp/addons/base/i18n/sr.po +++ b/openerp/addons/base/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: 2011-10-01 05:05+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po index 561bd88c69e..35be96e6456 100644 --- a/openerp/addons/base/i18n/sr@latin.po +++ b/openerp/addons/base/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: 2011-10-01 05:07+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:55+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po index d1cb5e63c93..9aaa0035343 100644 --- a/openerp/addons/base/i18n/sv.po +++ b/openerp/addons/base/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: 2011-10-01 05:05+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -28,7 +28,7 @@ msgstr "Domän" #. module: base #: model:res.country,name:base.sh msgid "Saint Helena" -msgstr "St Helena" +msgstr "Sankta Helena" #. module: base #: view:ir.actions.report.xml:0 @@ -38,7 +38,7 @@ msgstr "Övrig konfiguration" #. module: base #: selection:ir.property,type:0 msgid "DateTime" -msgstr "DatumTid" +msgstr "Datum/Tid" #. module: base #: code:addons/fields.py:534 diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po index bda7407d9b1..2b2e3032bdd 100644 --- a/openerp/addons/base/i18n/th.po +++ b/openerp/addons/base/i18n/th.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: 2011-10-01 05:05+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index 6051f9c1bbc..c584aec9b4c 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index 6538fc4f237..a2f3b053ca8 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po index 8c17a777bc4..7c6b7ca795c 100644 --- a/openerp/addons/base/i18n/uk.po +++ b/openerp/addons/base/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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po index b503a31a6ab..d9abe62160d 100644 --- a/openerp/addons/base/i18n/ur.po +++ b/openerp/addons/base/i18n/ur.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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po index 4dca37e5ade..55dec7b471f 100644 --- a/openerp/addons/base/i18n/vi.po +++ b/openerp/addons/base/i18n/vi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-23 16:37+0000\n" -"Last-Translator: OpenBMS JSC \n" +"PO-Revision-Date: 2011-11-05 03:38+0000\n" +"Last-Translator: Vuong Kien Hung \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 @@ -9053,7 +9053,7 @@ msgstr "Hình thức tách" #. module: base #: view:base.module.upgrade:0 msgid "Note that this operation might take a few minutes." -msgstr "" +msgstr "Lưu ý hoạt động này có thể mất vài phút" #. module: base #: model:ir.ui.menu,name:base.menu_localisation @@ -9106,7 +9106,7 @@ msgstr "" #. module: base #: view:res.lang:0 msgid "%j - Day of the year [001,366]." -msgstr "" +msgstr "%j - Ngày của năm [001,366]" #. module: base #: field:ir.actions.server,mobile:0 @@ -9189,7 +9189,7 @@ msgstr "" #. module: base #: help:ir.sequence,number_increment:0 msgid "The next number of the sequence will be incremented by this number" -msgstr "" +msgstr "Số tiếp theo của dãy thứ tự sẽ được tăng bằng số này" #. module: base #: field:ir.cron,function:0 @@ -9238,7 +9238,7 @@ msgstr "Các đối tác: " #. module: base #: model:res.country,name:base.kp msgid "North Korea" -msgstr "" +msgstr "Bắc Triều Tiên" #. module: base #: selection:ir.actions.server,state:0 @@ -9269,7 +9269,7 @@ msgstr "" #. module: base #: field:ir.exports,name:0 msgid "Export Name" -msgstr "" +msgstr "Tên Trích xuất" #. module: base #: help:res.partner.address,type:0 diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po index 5cc1a6ad39d..dd7a2e5030b 100644 --- a/openerp/addons/base/i18n/zh_CN.po +++ b/openerp/addons/base/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: 2011-10-01 05:07+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po index 28b94f85e50..25a6ecd250b 100644 --- a/openerp/addons/base/i18n/zh_HK.po +++ b/openerp/addons/base/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: 2011-10-01 05:06+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po index 62d7023c874..4702f75fa7c 100644 --- a/openerp/addons/base/i18n/zh_TW.po +++ b/openerp/addons/base/i18n/zh_TW.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: 2011-10-01 05:07+0000\n" -"X-Generator: Launchpad (build 14071)\n" +"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n" +"X-Generator: Launchpad (build 14231)\n" #. module: base #: view:ir.filters:0 diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 7989bf6e180..da6f1e167f9 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -2043,7 +2043,9 @@ - - + + + + diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 7850006c31a..e01f23b6cc0 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -117,7 +117,7 @@ class report_xml(osv.osv): 'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view."), 'attachment': fields.char('Save As Attachment Prefix', size=128, help='This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables.'), 'attachment_use': fields.boolean('Reload from Attachment', help='If you check this, then the second time the user prints with same attachment name, it returns the previous report.'), - 'auto': fields.boolean('Custom python parser', required=True), + 'auto': fields.boolean('Custom python parser'), 'header': fields.boolean('Add RML header', help="Add or not the coporate RML header"), @@ -265,12 +265,13 @@ class act_window(osv.osv): help="Model name of the object to open in the view window"), 'src_model': fields.char('Source Object', size=64, help="Optional model name of the objects on which this action should be visible"), - 'target': fields.selection([('current','Current Window'),('new','New Window')], 'Target Window'), + 'target': fields.selection([('current','Current Window'),('new','New Window'),('inline','Inline')], 'Target Window'), 'view_type': fields.selection((('tree','Tree'),('form','Form')), string='View Type', required=True, help="View type: set to 'tree' for a hierarchical tree view, or 'form' for other views"), 'view_mode': fields.char('View Mode', size=250, required=True, help="Comma-separated list of allowed view modes, such as 'form', 'tree', 'calendar', etc. (Default: tree,form)"), - 'usage': fields.char('Action Usage', size=32), + 'usage': fields.char('Action Usage', size=32, + help="Used to filter menu and home actions from the user form."), 'view_ids': fields.one2many('ir.actions.act_window.view', 'act_window_id', 'Views'), 'views': fields.function(_views_get_fnc, method=True, type='binary', string='Views', help="This function field computes the ordered list of views that should be enabled " \ diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py index 981dfd2798e..fe8c651621c 100644 --- a/openerp/addons/base/ir/ir_config_parameter.py +++ b/openerp/addons/base/ir/ir_config_parameter.py @@ -25,7 +25,7 @@ Store database-specific configuration parameters from osv import osv,fields import uuid import datetime -from tools import misc +from tools import misc, config """ A dictionary holding some configuration parameters to be initialized when the database is created. @@ -33,6 +33,7 @@ A dictionary holding some configuration parameters to be initialized when the da _default_parameters = { "database.uuid": lambda: str(uuid.uuid1()), "database.create_date": lambda: datetime.datetime.now().strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT), + "web.base.url": lambda: "http://localhost:%s" % config.get('xmlrpc_port'), } class ir_config_parameter(osv.osv): diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index f175a27077f..2e3060fc103 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -44,8 +44,8 @@ _logger = logging.getLogger('ir.mail_server') class MailDeliveryException(osv.except_osv): """Specific exception subclass for mail delivery errors""" - def __init__(self, name, value, exc_type='warning'): - super(MailDeliveryException, self).__init__(name, value, exc_type=exc_type) + def __init__(self, name, value): + super(MailDeliveryException, self).__init__(name, value) class WriteToLogger(object): """debugging helper: behave as a fd and pipe to logger at the given level""" @@ -431,7 +431,9 @@ class ir_mail_server(osv.osv): # ignored, just a consequence of the previous exception pass except Exception, e: - msg = _("Mail delivery failed via SMTP server '%s'.\n%s: %s") % (smtp_server, e.__class__.__name__, e) + msg = _("Mail delivery failed via SMTP server '%s'.\n%s: %s") % (tools.ustr(smtp_server), + e.__class__.__name__, + tools.ustr(e)) _logger.exception(msg) raise MailDeliveryException(_("Mail delivery failed"), msg) return message_id diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 395bf3e8d60..014d5652891 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -124,12 +124,13 @@ class ir_model(osv.osv): # overridden to allow searching both on model name (model field) # and model description (name field) - def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None): + def _name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None): if args is None: args = [] domain = args + ['|', ('model', operator, name), ('name', operator, name)] - return super(ir_model, self).name_search(cr, uid, None, domain, - operator=operator, limit=limit, context=context) + return self.name_get(cr, name_get_uid or uid, + super(ir_model, self).search(cr, uid, domain, limit=limit, context=context), + context=context) def unlink(self, cr, user, ids, context=None): @@ -671,18 +672,20 @@ class ir_model_data(osv.osv): action_id = False if xml_id: - cr.execute('''SELECT imd.id, imd.res_id, md.id + cr.execute('''SELECT imd.id, imd.res_id, md.id, imd.model FROM ir_model_data imd LEFT JOIN %s md ON (imd.res_id = md.id) WHERE imd.module=%%s AND imd.name=%%s''' % model_obj._table, (module, xml_id)) results = cr.fetchall() - for imd_id2,res_id2,real_id2 in results: + for imd_id2,res_id2,real_id2,real_model in results: if not real_id2: self._get_id.clear_cache(self, uid, module, xml_id) self.get_object_reference.clear_cache(self, uid, module, xml_id) cr.execute('delete from ir_model_data where id=%s', (imd_id2,)) res_id = False else: + assert model == real_model, "External ID conflict, %s already refers to a `%s` record,"\ + " you can't define a `%s` record with this ID." % (xml_id, real_model, model) res_id,action_id = res_id2,imd_id2 if action_id and res_id: diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index c44ff716519..86b913267aa 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -27,22 +27,6 @@ import tools import os import logging -def _check_xml(self, cr, uid, ids, context=None): - logger = logging.getLogger('init') - for view in self.browse(cr, uid, ids, context): - eview = etree.fromstring(view.arch.encode('utf8')) - frng = tools.file_open(os.path.join('base','rng','view.rng')) - try: - relaxng_doc = etree.parse(frng) - relaxng = etree.RelaxNG(relaxng_doc) - if not relaxng.validate(eview): - for error in relaxng.error_log: - logger.error(tools.ustr(error)) - return False - finally: - frng.close() - return True - class view_custom(osv.osv): _name = 'ir.ui.view.custom' _order = 'create_date desc' # search(limit=1) should return the last customization @@ -86,6 +70,23 @@ class view(osv.osv): 'priority': 16 } _order = "priority,name" + + def _check_xml(self, cr, uid, ids, context=None): + logger = logging.getLogger('init') + for view in self.browse(cr, uid, ids, context): + eview = etree.fromstring(view.arch.encode('utf8')) + frng = tools.file_open(os.path.join('base','rng','view.rng')) + try: + relaxng_doc = etree.parse(frng) + relaxng = etree.RelaxNG(relaxng_doc) + if not relaxng.validate(eview): + for error in relaxng.error_log: + logger.error(tools.ustr(error)) + return False + finally: + frng.close() + return True + _constraints = [ (_check_xml, 'Invalid XML for View Architecture!', ['arch']) ] diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml index 58fa98a6b09..f3593fa5791 100644 --- a/openerp/addons/base/module/module_data.xml +++ b/openerp/addons/base/module/module_data.xml @@ -109,8 +109,8 @@ 14 - - Verticalizations + + Specific Industry Applications 15 diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 3cec8b740ec..62edb0a842c 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -70,6 +70,9 @@ class res_config_configurable(osv.osv_memory): res = next.action_launch(context=context) res['nodestroy'] = False return res + #if there is no next action and if html is in the context: reload instead of closing + if 'html' in context: + return {'type' : 'ir.actions.reload'} return {'type' : 'ir.actions.act_window_close'} def start(self, cr, uid, ids, context=None): diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index b250269cb0e..66b092e3a2c 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -150,7 +150,6 @@ class res_partner(osv.osv): _defaults = { 'active': lambda *a: 1, 'customer': lambda *a: 1, - 'address': [{'type': 'default'}], 'category_id': _default_category, 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c), 'color': 0, diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 5f3ebf73f46..33fde6c5d1b 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -105,13 +105,16 @@ - + res.partner.address.kanban res.partner.address kanban - + + + + @@ -133,22 +136,22 @@ @@ -157,7 +160,7 @@
- + @@ -422,7 +425,7 @@ - + RES - PARTNER KANBAN @@ -430,6 +433,9 @@ kanban + + + @@ -450,23 +456,23 @@
- +
- , + ,
- , + ,
- , + ,
- @@ -475,7 +481,7 @@
- + diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index f552e8166cd..36270e1879b 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -35,6 +35,7 @@ from osv import fields,osv from osv.orm import browse_record from service import security from tools.translate import _ +import openerp import openerp.exceptions class groups(osv.osv): @@ -205,6 +206,7 @@ class users(osv.osv): return dict.fromkeys(ids, '') _columns = { + 'id': fields.integer('ID'), 'name': fields.char('User Name', size=64, required=True, select=True, help="The new user's real name, used for searching" " and most listings"), @@ -417,14 +419,42 @@ class users(osv.osv): data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my') return dataobj.browse(cr, uid, data_id, context=context).res_id + def authenticate(self, db, login, password, user_agent_env): + """Verifies and returns the user ID corresponding to the given + ``login`` and ``password`` combination, or False if there was + no matching user. + + :param str db: the database on which user is trying to authenticate + :param str login: username + :param str password: user password + :param dict user_agent_env: environment dictionary describing any + relevant environment attributes + """ + uid = self.login(db, login, password) + if uid == openerp.SUPERUSER_ID: + # Successfully logged in as admin! + # Attempt to guess the web base url... + if user_agent_env and user_agent_env.get('base_location'): + cr = pooler.get_db(db).cursor() + try: + self.pool.get('ir.config_parameter').set_param(cr, uid, 'web.base.url', + user_agent_env['base_location']) + cr.commit() + except Exception: + logging.getLogger('res.users').exception("Failed to update web.base.url configuration parameter") + finally: + cr.close() + return uid def login(self, db, login, password): if not password: return False cr = pooler.get_db(db).cursor() try: - cr.execute('UPDATE res_users SET date=now() WHERE login=%s AND password=%s AND active RETURNING id', - (tools.ustr(login), tools.ustr(password))) + cr.execute("""UPDATE res_users + SET date = now() AT TIME ZONE 'UTC' + WHERE login=%s AND password=%s AND active RETURNING id""", + (tools.ustr(login), tools.ustr(password))) res = cr.fetchone() cr.commit() if res: @@ -726,6 +756,28 @@ class users_view(osv.osv): return res return super(users_view, self).read(cr, uid, ids, fields, context, load) + def fields_get(self, cr, user, allfields=None, context=None, write_access=True): + res = super(users_view, self).fields_get(cr, user, allfields, context, write_access) + apps, others = self.pool.get('res.groups').get_classified(cr, user, context) + for app, groups in apps: + ids = [g.id for name, g in groups] + app_name = name_boolean_groups(ids) + sel_name = name_selection_groups(ids) + selection = [(g.id, name) for name, g in groups] + res[app_name] = {'type': 'boolean', 'string': app} + tips = [name + ': ' + (g.comment or '') for name, g in groups] + if tips: + res[app_name].update(help='\n'.join(tips)) + res[sel_name] = {'type': 'selection', 'string': 'Group', 'selection': selection} + + for sec, groups in others: + for gname, g in groups: + name = name_boolean_group(g.id) + res[name] = {'type': 'boolean', 'string': gname} + if g.comment: + res[name].update(help=g.comment) + return res + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): # in form views, transform 'groups_id' into reified group fields diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 7c13afd8bfc..408d032d75c 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -1,42 +1,43 @@ - - - - - - - - - before - - after - - inside - - replace - - - - - - attributes - - - - - - - - - - - + xmlns:a="http://relaxng.org/ns/annotation/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> + + + + + + + + + before + + after + + inside + + replace + + + + + + attributes + + + + + + + + + + + @@ -44,29 +45,113 @@ + + + + + + + + + + + + + + + + + + + + + + + New-style (6.1) dashboard definition + + + + + Single-column dashboard style + + + 1 + + + + + + Three different 2-column dashboard styles: + 50|50, 33|66 and 66|33. + + + + 1-1 + 1-2 + 2-1 + + + + + + + + Three-column dashboard style: 33|33|33 + + + 1-1-1 + + + + + + + + + + + hpaned + vpaned + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -219,12 +304,11 @@ - - + @@ -278,34 +362,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -341,8 +397,7 @@ - - + diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index 7bb6e63f049..3820c48ae9a 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -16,7 +16,7 @@ "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0 -"access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0 +"access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category",,1,0,0,0 "access_ir_module_module_group_user","ir_module_module group_user","model_ir_module_module","group_system",1,1,1,1 "access_ir_module_module_user","ir_module_module user","model_ir_module_module",,1,0,0,0 "access_ir_module_module_dependency_group_system","ir_module_module_dependency group_system","model_ir_module_module_dependency","group_system",1,1,1,1 diff --git a/openerp/addons/base/static/src/img/kanban_partner.png b/openerp/addons/base/static/src/img/kanban_partner.png new file mode 100644 index 00000000000..56a8ef11d0f Binary files /dev/null and b/openerp/addons/base/static/src/img/kanban_partner.png differ diff --git a/openerp/modules/graph.py b/openerp/modules/graph.py index 539dda25b50..7b302e99f4c 100644 --- a/openerp/modules/graph.py +++ b/openerp/modules/graph.py @@ -101,7 +101,7 @@ class Graph(dict): # NOTE The call to load_information_from_description_file is already # done by db.initialize, so it is possible to not do it again here. info = openerp.modules.module.load_information_from_description_file(module) - if info['installable']: + if info and info['installable']: packages.append((module, info)) # TODO directly a dict, like in get_modules_with_version else: logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: not installable, skipped' % (module)) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index b06368ba1b2..00948bc690e 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -147,6 +147,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= migrations = openerp.modules.migration.MigrationManager(cr, graph) logger.debug('loading %d packages...', len(graph)) + # get db timestamp + cr.execute("select now()::timestamp") + dt_before_load = cr.fetchone()[0] + # register, instantiate and initialize models for each modules for index, package in enumerate(graph): module_name = package.name @@ -214,6 +218,9 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= cr.commit() + # mark new res_log records as read + cr.execute("update res_log set read=True where create_date >= %s", (dt_before_load,)) + cr.commit() return loaded_modules, processed_modules diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py index 2d96963f516..c81ee897891 100644 --- a/openerp/osv/expression.py +++ b/openerp/osv/expression.py @@ -69,7 +69,7 @@ and you would be tempted to believe something like this would be possible: ['!', ['=', 'company_id.name', ['&', ..., ...]]] That is, a domain could be a valid operand. But this is not the case. A domain -is really limited to a two-level nature, and can not takes a recursive form: a +is really limited to a two-level nature, and can not take a recursive form: a domain is not a valid second-level operand. Unaccent - Accent-insensitive search diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 11f24f14505..72df86eeff9 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -131,6 +131,12 @@ class boolean(_column): _symbol_f = lambda x: x and 'True' or 'False' _symbol_set = (_symbol_c, _symbol_f) + def __init__(self, string='unknown', required=False, **args): + super(boolean, self).__init__(string=string, required=required, **args) + if required: + warnings.warn("Making a boolean field `required` has no effect, as NULL values are " + "automatically turned into False", PendingDeprecationWarning, stacklevel=2) + class integer(_column): _type = 'integer' _symbol_c = '%s' @@ -138,6 +144,12 @@ class integer(_column): _symbol_set = (_symbol_c, _symbol_f) _symbol_get = lambda self,x: x or 0 + def __init__(self, string='unknown', required=False, **args): + super(integer, self).__init__(string=string, required=required, **args) + if required: + warnings.warn("Making an integer field `required` has no effect, as NULL values are " + "automatically turned into 0", PendingDeprecationWarning, stacklevel=2) + class integer_big(_column): """Experimental 64 bit integer column type, currently unused. @@ -155,6 +167,12 @@ class integer_big(_column): _symbol_set = (_symbol_c, _symbol_f) _symbol_get = lambda self,x: x or 0 + def __init__(self, string='unknown', required=False, **args): + super(integer_big, self).__init__(string=string, required=required, **args) + if required: + warnings.warn("Making an integer_big field `required` has no effect, as NULL values are " + "automatically turned into 0", PendingDeprecationWarning, stacklevel=2) + class reference(_column): _type = 'reference' _classic_read = False # post-process to handle missing target @@ -208,10 +226,13 @@ class float(_column): _symbol_set = (_symbol_c, _symbol_f) _symbol_get = lambda self,x: x or 0.0 - def __init__(self, string='unknown', digits=None, digits_compute=None, **args): - _column.__init__(self, string=string, **args) + def __init__(self, string='unknown', digits=None, digits_compute=None, required=False, **args): + _column.__init__(self, string=string, required=required, **args) self.digits = digits self.digits_compute = digits_compute + if required: + warnings.warn("Making a float field `required` has no effect, as NULL values are " + "automatically turned into 0.0", PendingDeprecationWarning, stacklevel=2) def digits_change(self, cr): @@ -1037,7 +1058,7 @@ class related(function): _columns = { 'foo_id': fields.many2one('my.foo', 'Foo'), - 'bar': fields.related('frol', 'foo_id', type='char', string='Frol of Foo'), + 'bar': fields.related('foo_id', 'frol', type='char', string='Frol of Foo'), } """ @@ -1364,6 +1385,9 @@ def field_to_dict(model, cr, user, field, context=None): res['domain'] = field._domain res['context'] = field._context + if isinstance(field, one2many): + res['relation_field'] = field._fields_id + return res diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index ad40ac66093..9a50cf8bcc8 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -229,11 +229,6 @@ POSTGRES_CONFDELTYPES = { 'SET DEFAULT': 'd', } -def last_day_of_current_month(): - today = datetime.date.today() - last_day = str(calendar.monthrange(today.year, today.month)[1]) - return time.strftime('%Y-%m-' + last_day) - def intersect(la, lb): return filter(lambda x: x in lb, la) @@ -664,6 +659,10 @@ class BaseModel(object): _sequence = None _description = None + # dict of {field:method}, with method returning the name_get of records + # to include in the _read_group, if grouped on this field + _group_by_full = {} + # Transience _transient = False # True in a TransientModel _transient_max_count = None @@ -1261,7 +1260,7 @@ class BaseModel(object): nbrmax = position+1 done = {} - for i in range(len(fields)): + for i, field in enumerate(fields): res = False if i >= len(line): raise Exception(_('Please check that all your lines have %d columns.' @@ -1270,11 +1269,11 @@ class BaseModel(object): if not line[i]: continue - field = fields[i] if field[:len(prefix)] <> prefix: if line[i] and skip: return False continue + field_name = field[len(prefix)] #set the mode for m2o, o2m, m2m : xml_id/id/name if len(field) == len(prefix)+1: @@ -1290,7 +1289,7 @@ class BaseModel(object): return [(6,0,res)] # ID of the record using a XML ID - if field[len(prefix)]=='id': + if field_name == 'id': try: data_res_id = _get_id(model_name, line[i], current_module, 'id') except ValueError: @@ -1299,16 +1298,17 @@ class BaseModel(object): continue # ID of the record using a database ID - elif field[len(prefix)]=='.id': + elif field_name == '.id': data_res_id = _get_id(model_name, line[i], current_module, '.id') continue + field_type = fields_def[field_name]['type'] # recursive call for getting children and returning [(0,0,{})] or [(1,ID,{})] - if fields_def[field[len(prefix)]]['type']=='one2many': - if field[len(prefix)] in done: + if field_type == 'one2many': + if field_name in done: continue - done[field[len(prefix)]] = True - relation = fields_def[field[len(prefix)]]['relation'] + done[field_name] = True + relation = fields_def[field_name]['relation'] relation_obj = self.pool.get(relation) newfd = relation_obj.fields_get( cr, uid, context=context ) pos = position @@ -1317,7 +1317,7 @@ class BaseModel(object): first = 0 while pos < len(datas): - res2 = process_liness(self, datas, prefix + [field[len(prefix)]], current_module, relation_obj._name, newfd, pos, first) + res2 = process_liness(self, datas, prefix + [field_name], current_module, relation_obj._name, newfd, pos, first) if not res2: break (newrow, pos, w2, data_res_id2, xml_id2) = res2 @@ -1333,36 +1333,36 @@ class BaseModel(object): res.append( (data_res_id2 and 1 or 0, data_res_id2 or 0, newrow) ) - - elif fields_def[field[len(prefix)]]['type']=='many2one': - relation = fields_def[field[len(prefix)]]['relation'] + elif field_type == 'many2one': + relation = fields_def[field_name]['relation'] res = _get_id(relation, line[i], current_module, mode) - elif fields_def[field[len(prefix)]]['type']=='many2many': - relation = fields_def[field[len(prefix)]]['relation'] + elif field_type == 'many2many': + relation = fields_def[field_name]['relation'] res = many_ids(line[i], relation, current_module, mode) - elif fields_def[field[len(prefix)]]['type'] == 'integer': + elif field_type == 'integer': res = line[i] and int(line[i]) or 0 - elif fields_def[field[len(prefix)]]['type'] == 'boolean': + elif field_type == 'boolean': res = line[i].lower() not in ('0', 'false', 'off') - elif fields_def[field[len(prefix)]]['type'] == 'float': + elif field_type == 'float': res = line[i] and float(line[i]) or 0.0 - elif fields_def[field[len(prefix)]]['type'] == 'selection': - for key, val in fields_def[field[len(prefix)]]['selection']: + elif field_type == 'selection': + for key, val in fields_def[field_name]['selection']: if tools.ustr(line[i]) in [tools.ustr(key), tools.ustr(val)]: res = key break if line[i] and not res: - logger.notifyChannel("import", netsvc.LOG_WARNING, - _("key '%s' not found in selection field '%s'") % \ - (tools.ustr(line[i]), tools.ustr(field[len(prefix)]))) - warning += [_("Key/value '%s' not found in selection field '%s'") % (tools.ustr(line[i]), tools.ustr(field[len(prefix)]))] + logging.getLogger('orm.import').warn( + _("key '%s' not found in selection field '%s'"), + tools.ustr(line[i]), tools.ustr(field_name)) + warning.append(_("Key/value '%s' not found in selection field '%s'") % ( + tools.ustr(line[i]), tools.ustr(field_name))) else: res = line[i] - row[field[len(prefix)]] = res or False + row[field_name] = res or False result = (row, nbrmax, warning, data_res_id, xml_id) return result @@ -1807,7 +1807,7 @@ class BaseModel(object): """ _rec_name = self._rec_name if _rec_name not in self._columns: - _rec_name = self._columns.keys()[0] + _rec_name = self._columns.keys()[0] if len(self._columns.keys()) > 0 else "id" view = etree.Element('tree', string=self._description) etree.SubElement(view, 'field', name=_rec_name) @@ -2476,6 +2476,24 @@ class BaseModel(object): del alldata[d['id']][groupby] d.update(alldata[d['id']]) del d['id'] + + if groupby and groupby in self._group_by_full: + gids = [x[groupby][0] for x in data if x[groupby]] + stages = self._group_by_full[groupby](self, cr, uid, gids, domain, context) + # as both lists are sorted in the same way, we can merge in one pass + pos = 0 + while stages and ((pos``). + """ if not self.localcontext: return str2xml(txt) if not txt: @@ -130,10 +138,10 @@ def _process_text(self, txt): except Exception: pass if isinstance(txt, basestring): - result += str2xml(txt) + result += txt elif txt and (txt is not None) and (txt is not False): result += ustr(txt) - return result + return str2xml(result) def text_get(node): return ''.join([ustr(n.text) for n in node]) diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index 5f0a1dccff9..2cf8a848378 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -366,20 +366,15 @@ class db(netsvc.ExportService): return True class common(netsvc.ExportService): + _logger = logging.getLogger('web-services') + def __init__(self,name="common"): netsvc.ExportService.__init__(self,name) def dispatch(self, method, params): - logger = netsvc.Logger() - if method == 'login': - res = security.login(params[0], params[1], params[2]) - msg = res and 'successful login' or 'bad login or password' - # TODO log the client ip address.. - logger.notifyChannel("web-service", netsvc.LOG_INFO, "%s from '%s' using database '%s'" % (msg, params[1], params[0].lower())) - return res or False - elif method in ['about', 'timezone_get', 'get_server_environment', - 'login_message','get_stats', 'check_connectivity', - 'list_http_services', 'version']: + if method in ['login', 'about', 'timezone_get', 'get_server_environment', + 'login_message','get_stats', 'check_connectivity', + 'list_http_services', 'version', 'authenticate']: pass elif method in ['get_available_updates', 'get_migration_scripts', 'set_loglevel', 'get_os_time', 'get_sqlcount']: passwd = params[0] @@ -391,6 +386,18 @@ class common(netsvc.ExportService): fn = getattr(self, 'exp_'+method) return fn(*params) + def exp_login(self, db, login, password): + # TODO: legacy indirection through 'security', should use directly + # the res.users model + res = security.login(db, login, password) + msg = res and 'successful login' or 'bad login or password' + self._logger.info("%s from '%s' using database '%s'", msg, login, db.lower()) + return res or False + + def exp_authenticate(self, db, login, password, user_agent_env): + res_users = pooler.get_pool(db).get('res.users') + return res_users.authenticate(db, login, password, user_agent_env) + def exp_version(self): return RPC_VERSION_1 diff --git a/openerp/tools/config.py b/openerp/tools/config.py index a628cc8cab0..f1c3931e81f 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -102,6 +102,9 @@ class configmanager(object): group.add_option("-P", "--import-partial", dest="import_partial", my_default='', help="Use this for big data importation, if it crashes you will be able to continue at the current state. Provide a filename to store intermediate importation states.") group.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + group.add_option("--addons-path", dest="addons_path", + help="specify additional addons paths (separated by commas).", + action="callback", callback=self._check_addons_path, nargs=1, type="string") group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules default=web") parser.add_option_group(group) @@ -233,9 +236,6 @@ class configmanager(object): help="overwrites existing translation terms on updating a module or importing a CSV or a PO file.") group.add_option("--modules", dest="translate_modules", help="specify modules to export. Use in combination with --i18n-export") - group.add_option("--addons-path", dest="addons_path", - help="specify additional addons paths (separated by commas).", - action="callback", callback=self._check_addons_path, nargs=1, type="string") parser.add_option_group(group) security = optparse.OptionGroup(parser, 'Security-related options') diff --git a/openerp/tools/graph.py b/openerp/tools/graph.py index df3fb39ef47..b54e101eec4 100755 --- a/openerp/tools/graph.py +++ b/openerp/tools/graph.py @@ -759,8 +759,8 @@ if __name__=='__main__': g.process(starting_node) g.scale(radius*3,radius*3, radius, radius) - import Image - import ImageDraw + from PIL import Image + from PIL import ImageDraw img = Image.new("RGB", (800, 600), "#ffffff") draw = ImageDraw.Draw(img) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 277965c5449..e163c59a82f 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -363,7 +363,7 @@ class TinyPoFile(object): "msgid \"\"\n" \ "msgstr \"\"\n" \ '''"Project-Id-Version: %(project)s %(version)s\\n"\n''' \ - '''"Report-Msgid-Bugs-To: %(bugmail)s\\n"\n''' \ + '''"Report-Msgid-Bugs-To: \\n"\n''' \ '''"POT-Creation-Date: %(now)s\\n"\n''' \ '''"PO-Revision-Date: %(now)s\\n"\n''' \ '''"Last-Translator: <>\\n"\n''' \ @@ -377,7 +377,6 @@ class TinyPoFile(object): % { 'project': release.description, 'version': release.version, 'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""), - 'bugmail': release.support_email, 'now': datetime.utcnow().strftime('%Y-%m-%d %H:%M')+"+0000", } ) diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py index a8e22badcc7..e0ced74fa3e 100644 --- a/openerp/tools/yaml_import.py +++ b/openerp/tools/yaml_import.py @@ -11,6 +11,8 @@ import misc from config import config import yaml_tag import yaml +import re +from lxml import etree # YAML import needs both safe and unsafe eval, but let's # default to /safe/. @@ -164,9 +166,11 @@ class YamlInterpreter(object): self.logger.log(logging.ERROR, 'id: %s is to long (max: 64)', id) def get_id(self, xml_id): - if not xml_id: - raise YamlImportException("The xml_id should be a non empty string.") - if isinstance(xml_id, types.IntType): + if xml_id is False: + return False + #if not xml_id: + # raise YamlImportException("The xml_id should be a non empty string.") + elif isinstance(xml_id, types.IntType): id = xml_id elif xml_id in self.id_map: id = self.id_map[xml_id] @@ -308,10 +312,21 @@ class YamlInterpreter(object): import openerp.osv as osv record, fields = node.items()[0] model = self.get_model(record.model) + + view_id = record.view + if view_id and (view_id is not True): + view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, 1, self.module, record.view)[1] + if model.is_transient(): record_dict=self.create_osv_memory_record(record, fields) else: self.validate_xml_id(record.id) + try: + self.pool.get('ir.model.data')._get_id(self.cr, 1, self.module, record.id) + default = False + except ValueError: + default = True + if self.isnoupdate(record) and self.mode != 'init': id = self.pool.get('ir.model.data')._update_dummy(self.cr, 1, record.model, self.module, record.id) # check if the resource already existed at the last update @@ -322,22 +337,110 @@ class YamlInterpreter(object): if not self._coerce_bool(record.forcecreate): return None - record_dict = self._create_record(model, fields) - self.logger.debug("RECORD_DICT %s" % record_dict) + #context = self.get_context(record, self.eval_context) - context = record.context #TOFIX: record.context like {'withoutemployee':True} should pass from self.eval_context. example: test_project.yml in project module + #TOFIX: record.context like {'withoutemployee':True} should pass from self.eval_context. example: test_project.yml in project module + context = record.context + if view_id: + varg = view_id + if view_id is True: varg = False + view = model.fields_view_get(self.cr, 1, varg, 'form', context) + view_id = etree.fromstring(view['arch'].encode('utf-8')) + + record_dict = self._create_record(model, fields, view_id, default=default) + self.logger.debug("RECORD_DICT %s" % record_dict) id = self.pool.get('ir.model.data')._update(self.cr, 1, record.model, \ self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context) self.id_map[record.id] = int(id) if config.get('import_partial'): self.cr.commit() - def _create_record(self, model, fields): + def _create_record(self, model, fields, view=False, parent={}, default=True): + allfields = model.fields_get(self.cr, 1, context=self.context) + if view is not False: + defaults = default and model.default_get(self.cr, 1, allfields, context=self.context) or {} + fg = model.fields_get(self.cr, 1, context=self.context) + else: + default = {} + fg = {} record_dict = {} fields = fields or {} + + def process_val(key, val): + if fg[key]['type']=='many2one': + if type(val) in (tuple,list): + val = val[0] + elif (fg[key]['type']=='one2many'): + if val is False: + val = [] + if len(val) and type(val[0]) == dict: + val = map(lambda x: (0,0,x), val) + return val + + # Process all on_change calls + nodes = (view is not False) and [view] or [] + while nodes: + el = nodes.pop(0) + if el.tag=='field': + field_name = el.attrib['name'] + assert field_name in fg, "The field '%s' is defined in the form view but not on the object '%s'!" % (field_name, model._name) + if field_name in fields: + view2 = None + # if the form view is not inline, we call fields_view_get + if (view is not False) and (fg[field_name]['type']=='one2many'): + view2 = view.find("field[@name='%s']/form"%(field_name,)) + if not view2: + view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, 1, False, 'form', self.context) + view2 = etree.fromstring(view2['arch'].encode('utf-8')) + + field_value = self._eval_field(model, field_name, fields[field_name], view2, parent=record_dict, default=default) + record_dict[field_name] = field_value + #if (field_name in defaults) and defaults[field_name] == field_value: + # print '*** You can remove these lines:', field_name, field_value + elif (field_name in defaults): + if (field_name not in record_dict): + record_dict[field_name] = process_val(field_name, defaults[field_name]) + else: + continue + + if not el.attrib.get('on_change', False): + continue + match = re.match("([a-z_1-9A-Z]+)\((.*)\)", el.attrib['on_change']) + assert match, "Unable to parse the on_change '%s'!" % (el.attrib['on_change'], ) + + # creating the context + class parent2(object): + def __init__(self, d): + self.d = d + def __getattr__(self, name): + return self.d.get(name, False) + + ctx = record_dict.copy() + ctx['context'] = self.context + ctx['uid'] = 1 + ctx['parent'] = parent2(parent) + for a in fg: + if a not in ctx: + ctx[a]=process_val(a, defaults.get(a, False)) + + # Evaluation args + args = map(lambda x: eval(x, ctx), match.group(2).split(',')) + result = getattr(model, match.group(1))(self.cr, 1, [], *args) + for key, val in (result or {}).get('value', {}).items(): + if key not in fields: + assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist on the object '%s'" % (key, match.group(1), model._name) + record_dict[key] = process_val(key, val) + #if (key in fields) and record_dict[key] == process_val(key, val): + # print '*** You can remove these lines:', key, val + else: + nodes = list(el) + nodes + for field_name, expression in fields.items(): - field_value = self._eval_field(model, field_name, expression) + if field_name in record_dict: + continue + field_value = self._eval_field(model, field_name, expression, default=False) record_dict[field_name] = field_value + return record_dict def process_ref(self, node, column=None): @@ -366,7 +469,7 @@ class YamlInterpreter(object): def process_eval(self, node): return eval(node.expression, self.eval_context) - def _eval_field(self, model, field_name, expression): + def _eval_field(self, model, field_name, expression, view=False, parent={}, default=True): # TODO this should be refactored as something like model.get_field() in bin/osv if field_name in model._columns: column = model._columns[field_name] @@ -387,7 +490,7 @@ class YamlInterpreter(object): value = self.get_id(expression) elif column._type == "one2many": other_model = self.get_model(column._obj) - value = [(0, 0, self._create_record(other_model, fields)) for fields in expression] + value = [(0, 0, self._create_record(other_model, fields, view, parent, default=default)) for fields in expression] elif column._type == "many2many": ids = [self.get_id(xml_id) for xml_id in expression] value = [(6, 0, ids)] diff --git a/openerp/tools/yaml_tag.py b/openerp/tools/yaml_tag.py index ba61b4825ca..6f7ceec4aee 100644 --- a/openerp/tools/yaml_tag.py +++ b/openerp/tools/yaml_tag.py @@ -24,13 +24,14 @@ class Assert(YamlTag): super(Assert, self).__init__(**kwargs) class Record(YamlTag): - def __init__(self, model, id, use='id', **kwargs): + def __init__(self, model, id, use='id', view=True, **kwargs): self.model = model self.id = id + self.view = view super(Record, self).__init__(**kwargs) def __str__(self): return '!record {model: %s, id: %s}:' % (str(self.model,), str(self.id,)) - + class Python(YamlTag): def __init__(self, model, severity=logging.ERROR, name="", **kwargs): self.model= model
- + +
- , + ,
- , + ,
- , + ,