diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 0fb6af05e58..87e6a66740c 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -221,8 +221,8 @@ class account_invoice(osv.osv): 'type': { }, 'state': { - 'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'paid' and obj['type'] in ('out_invoice', 'out_refund'), - 'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open' and obj['type'] in ('out_invoice', 'out_refund'), + 'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj.state == 'paid' and obj.type in ('out_invoice', 'out_refund'), + 'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj.state == 'open' and obj.type in ('out_invoice', 'out_refund'), }, } _columns = { diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml index 9d2e65a3a4c..bf81382e718 100644 --- a/addons/account/data/account_data.xml +++ b/addons/account/data/account_data.xml @@ -16,7 +16,6 @@ - Immediate Payment balance @@ -52,7 +51,7 @@ - + diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index e3b3f080365..6e2fd083b54 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-06-19 11:49+0000\n" +"PO-Revision-Date: 2013-06-27 14:01+0000\n" "Last-Translator: Chertykov Denis \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: 2013-06-20 05:17+0000\n" -"X-Generator: Launchpad (build 16673)\n" +"X-Launchpad-Export-Date: 2013-06-28 05:42+0000\n" +"X-Generator: Launchpad (build 16681)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -1959,7 +1959,7 @@ msgstr "Длительность" #: view:account.bank.statement:0 #: field:account.bank.statement,last_closing_balance:0 msgid "Last Closing Balance" -msgstr "" +msgstr "Последнее конечное сальдо" #. module: account #: model:ir.model,name:account.model_account_common_journal_report @@ -3989,6 +3989,8 @@ msgid "" "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." msgstr "" +"Нельзя изменить проводку по этому журналу.\n" +"Прежде, нужно разрешить отмену проводок в журнале." #. module: account #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal @@ -6524,7 +6526,7 @@ msgstr "Позиция аналитики" #. module: account #: model:ir.ui.menu,name:account.menu_action_model_form msgid "Models" -msgstr "" +msgstr "Модели" #. module: account #: code:addons/account/account_invoice.py:1124 @@ -10311,7 +10313,7 @@ msgstr "Внутренний тип" #. module: account #: field:account.subscription.generate,date:0 msgid "Generate Entries Before" -msgstr "" +msgstr "Генерировать проводки до" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_running diff --git a/addons/account/html/account_illu_01.png b/addons/account/static/description/account_illu_01.png similarity index 100% rename from addons/account/html/account_illu_01.png rename to addons/account/static/description/account_illu_01.png diff --git a/addons/account/html/account_illu_02.png b/addons/account/static/description/account_illu_02.png similarity index 100% rename from addons/account/html/account_illu_02.png rename to addons/account/static/description/account_illu_02.png diff --git a/addons/account/html/account_illu_03.png b/addons/account/static/description/account_illu_03.png similarity index 100% rename from addons/account/html/account_illu_03.png rename to addons/account/static/description/account_illu_03.png diff --git a/addons/account/html/account_sc_00.png b/addons/account/static/description/account_sc_00.png similarity index 100% rename from addons/account/html/account_sc_00.png rename to addons/account/static/description/account_sc_00.png diff --git a/addons/account/html/account_sc_01.png b/addons/account/static/description/account_sc_01.png similarity index 100% rename from addons/account/html/account_sc_01.png rename to addons/account/static/description/account_sc_01.png diff --git a/addons/account/html/account_sc_02.png b/addons/account/static/description/account_sc_02.png similarity index 100% rename from addons/account/html/account_sc_02.png rename to addons/account/static/description/account_sc_02.png diff --git a/addons/account/html/account_sc_03.png b/addons/account/static/description/account_sc_03.png similarity index 100% rename from addons/account/html/account_sc_03.png rename to addons/account/static/description/account_sc_03.png diff --git a/addons/account/html/account_sc_04.png b/addons/account/static/description/account_sc_04.png similarity index 100% rename from addons/account/html/account_sc_04.png rename to addons/account/static/description/account_sc_04.png diff --git a/addons/account/html/account_sc_05.png b/addons/account/static/description/account_sc_05.png similarity index 100% rename from addons/account/html/account_sc_05.png rename to addons/account/static/description/account_sc_05.png diff --git a/addons/account/html/account_sc_06.png b/addons/account/static/description/account_sc_06.png similarity index 100% rename from addons/account/html/account_sc_06.png rename to addons/account/static/description/account_sc_06.png diff --git a/addons/account/html/index.html b/addons/account/static/description/index.html similarity index 100% rename from addons/account/html/index.html rename to addons/account/static/description/index.html diff --git a/addons/account/html/sc00.png b/addons/account/static/description/sc00.png similarity index 100% rename from addons/account/html/sc00.png rename to addons/account/static/description/sc00.png diff --git a/addons/account/html/testimonial_sunil.jpg b/addons/account/static/description/testimonial_sunil.jpg similarity index 100% rename from addons/account/html/testimonial_sunil.jpg rename to addons/account/static/description/testimonial_sunil.jpg diff --git a/addons/account_accountant/static/src/img/icon.png b/addons/account_accountant/static/description/icon.png similarity index 100% rename from addons/account_accountant/static/src/img/icon.png rename to addons/account_accountant/static/description/icon.png diff --git a/addons/account_asset/static/src/img/icon.png b/addons/account_asset/static/description/icon.png similarity index 100% rename from addons/account_asset/static/src/img/icon.png rename to addons/account_asset/static/description/icon.png diff --git a/addons/account_voucher/html/account_illu_01.png b/addons/account_voucher/static/description/account_illu_01.png similarity index 100% rename from addons/account_voucher/html/account_illu_01.png rename to addons/account_voucher/static/description/account_illu_01.png diff --git a/addons/account_voucher/html/account_sc_00.png b/addons/account_voucher/static/description/account_sc_00.png similarity index 100% rename from addons/account_voucher/html/account_sc_00.png rename to addons/account_voucher/static/description/account_sc_00.png diff --git a/addons/account_voucher/html/account_sc_02.png b/addons/account_voucher/static/description/account_sc_02.png similarity index 100% rename from addons/account_voucher/html/account_sc_02.png rename to addons/account_voucher/static/description/account_sc_02.png diff --git a/addons/account_voucher/html/account_sc_03.png b/addons/account_voucher/static/description/account_sc_03.png similarity index 100% rename from addons/account_voucher/html/account_sc_03.png rename to addons/account_voucher/static/description/account_sc_03.png diff --git a/addons/account_voucher/html/account_sc_04.png b/addons/account_voucher/static/description/account_sc_04.png similarity index 100% rename from addons/account_voucher/html/account_sc_04.png rename to addons/account_voucher/static/description/account_sc_04.png diff --git a/addons/account_voucher/html/account_sc_06.png b/addons/account_voucher/static/description/account_sc_06.png similarity index 100% rename from addons/account_voucher/html/account_sc_06.png rename to addons/account_voucher/static/description/account_sc_06.png diff --git a/addons/account_voucher/html/bazile.png b/addons/account_voucher/static/description/bazile.png similarity index 100% rename from addons/account_voucher/html/bazile.png rename to addons/account_voucher/static/description/bazile.png diff --git a/addons/account_voucher/static/src/img/icon.png b/addons/account_voucher/static/description/icon.png similarity index 100% rename from addons/account_voucher/static/src/img/icon.png rename to addons/account_voucher/static/description/icon.png diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/static/description/index.html similarity index 100% rename from addons/account_voucher/html/index.html rename to addons/account_voucher/static/description/index.html diff --git a/addons/account_voucher/html/testimonial_sunil.jpg b/addons/account_voucher/static/description/testimonial_sunil.jpg similarity index 100% rename from addons/account_voucher/html/testimonial_sunil.jpg rename to addons/account_voucher/static/description/testimonial_sunil.jpg diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index ce79c4d5ffb..df852181709 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -33,9 +33,9 @@ class account_analytic_account(osv.osv): _description = 'Analytic Account' _track = { 'state': { - 'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'pending', - 'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'close', - 'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open', + 'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending', + 'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj.state == 'close', + 'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open', }, } diff --git a/addons/auth_oauth_signup/i18n/vi.po b/addons/auth_oauth_signup/i18n/vi.po new file mode 100644 index 00000000000..bdc3eff5b8d --- /dev/null +++ b/addons/auth_oauth_signup/i18n/vi.po @@ -0,0 +1,23 @@ +# Vietnamese translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-06-27 06:49+0000\n" +"Last-Translator: FULL NAME \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: 2013-06-28 05:42+0000\n" +"X-Generator: Launchpad (build 16681)\n" + +#. module: auth_oauth_signup +#: model:ir.model,name:auth_oauth_signup.model_res_users +msgid "Users" +msgstr "Người dùng" diff --git a/addons/auth_openid/i18n/vi.po b/addons/auth_openid/i18n/vi.po new file mode 100644 index 00000000000..d1040420132 --- /dev/null +++ b/addons/auth_openid/i18n/vi.po @@ -0,0 +1,97 @@ +# Vietnamese translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-06-27 16:29+0000\n" +"Last-Translator: FULL NAME \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: 2013-06-28 05:42+0000\n" +"X-Generator: Launchpad (build 16681)\n" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:24 +#, python-format +msgid "Username" +msgstr "Tên đăng nhập" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:12 +#: view:res.users:0 +#, python-format +msgid "OpenID" +msgstr "OpenID" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:30 +#: field:res.users,openid_url:0 +#, python-format +msgid "OpenID URL" +msgstr "Đường dẫn OpenID" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:9 +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10 +#, python-format +msgid "Google" +msgstr "Google" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:11 +#, python-format +msgid "Launchpad" +msgstr "Launchpad" + +#. module: auth_openid +#: help:res.users,openid_email:0 +msgid "Used for disambiguation in case of a shared OpenID URL" +msgstr "" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:18 +#, python-format +msgid "Google Apps Domain" +msgstr "" + +#. module: auth_openid +#: field:res.users,openid_email:0 +msgid "OpenID Email" +msgstr "OpenID Email" + +#. module: auth_openid +#: field:res.users,openid_key:0 +msgid "OpenID Key" +msgstr "" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:8 +#, python-format +msgid "Password" +msgstr "Mật khẩu" + +#. module: auth_openid +#. openerp-web +#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10 +#, python-format +msgid "Google Apps" +msgstr "" + +#. module: auth_openid +#: model:ir.model,name:auth_openid.model_res_users +msgid "Users" +msgstr "Người dùng" diff --git a/addons/auth_signup/i18n/vi.po b/addons/auth_signup/i18n/vi.po new file mode 100644 index 00000000000..a79bbcb7bb4 --- /dev/null +++ b/addons/auth_signup/i18n/vi.po @@ -0,0 +1,288 @@ +# Vietnamese translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-06-27 06:52+0000\n" +"Last-Translator: FULL NAME \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: 2013-06-28 05:42+0000\n" +"X-Generator: Launchpad (build 16681)\n" + +#. module: auth_signup +#: field:res.partner,signup_type:0 +msgid "Signup Token Type" +msgstr "Loại mã đăng ký" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_uninvited:0 +msgid "Allow external users to sign up" +msgstr "Cho phép người dùng bên ngoài đăng ký." + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19 +#, python-format +msgid "Confirm Password" +msgstr "Xác nhận mật khẩu" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "Nếu không chọn, chỉ những người được mời mới được đăng ký." + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_base_config_settings +msgid "base.config.settings" +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:266 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "Không thể gửi email: người dùng không có địa chỉ email" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27 +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31 +#, python-format +msgid "Reset password" +msgstr "Đặt lại mật khẩu" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_template_user_id:0 +msgid "Template user for new users created through signup" +msgstr "Mẫu người dùng sử dụng khi đăng ký" + +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "Quên mật khẩu" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "Vui lòng nhập mật khẩu và xác nhận nó" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26 +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29 +#, python-format +msgid "Sign Up" +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "New" +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:258 +#, python-format +msgid "Mail sent to:" +msgstr "" + +#. module: auth_signup +#: field:res.users,state:0 +msgid "Status" +msgstr "Trạng thái" + +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

A password reset was requested for the OpenERP account linked to this " +"email.

\n" +"\n" +"

You may change your password by following this link.

\n" +"\n" +"

Note: If you do not expect this, you can safely ignore this email.

" +msgstr "" +"\n" +"\\n\n" +"

Bạn có một yêu cầu reset mật khẩu từ tài khoản OpenERPA gắn với email " +"này.

\\n\n" +"\\n\n" +"

Bạn có thể thay đổi mật khẩu thông qua đường dẫn này.

\\n\n" +"\\n\n" +"

Lưu ý: Nếu đây không phải chủ ý của bạn. Bạn có thể bỏ qua email này.

" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "Xin nhập tên." + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_users +msgid "Users" +msgstr "Người dùng" + +#. module: auth_signup +#: field:res.partner,signup_url:0 +msgid "Signup URL" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Active" +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:270 +#, python-format +msgid "" +"Cannot send email: no outgoing email server configured.\n" +"You can configure it under Settings/General Settings." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 +#, python-format +msgid "Username" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 +#, python-format +msgid "Name" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:173 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 +#, python-format +msgid "Username (Email)" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_expiration:0 +msgid "Signup Expiration" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Log in" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_valid:0 +msgid "Signup Token is Valid" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:170 +#: code:addons/auth_signup/static/src/js/auth_signup.js:173 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:97 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:170 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30 +#, python-format +msgid "Back to Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22 +#, python-format +msgid "Sign up" +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_partner +msgid "Partner" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_token:0 +msgid "Signup Token" +msgstr "" diff --git a/addons/base_calendar/static/src/img/icon.png b/addons/base_calendar/static/description/icon.png similarity index 100% rename from addons/base_calendar/static/src/img/icon.png rename to addons/base_calendar/static/description/icon.png diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 33c5aa863bf..6b8578bbf47 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -36,6 +36,8 @@ class base_config_settings(osv.osv_memory): help="""Enable the public part of openerp, openerp becomes a public website."""), 'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'), 'module_base_import': fields.boolean("Allow users to import data from CSV files"), + 'module_google_drive': fields.boolean('Attach Google documents to any record', + help="""This installs the module google_docs."""), } def open_company(self, cr, uid, ids, context=None): diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 8c48f5d7a6b..73685be95df 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -81,6 +81,15 @@ + + diff --git a/addons/claim_from_delivery/claim_delivery_data.xml b/addons/claim_from_delivery/claim_delivery_data.xml index 1b69087d4b8..5dabdc25931 100644 --- a/addons/claim_from_delivery/claim_delivery_data.xml +++ b/addons/claim_from_delivery/claim_delivery_data.xml @@ -4,7 +4,7 @@ Delivery Order - stock.picking.out + stock.picking diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml index 9187b1d11ca..850780644fd 100644 --- a/addons/claim_from_delivery/claim_delivery_view.xml +++ b/addons/claim_from_delivery/claim_delivery_view.xml @@ -6,17 +6,18 @@ crm.claim form - {'default_ref': 'stock.picking.out,'+str(context.get('active_id', False))} - [('ref','=','stock.picking.out,'+str(context.get('active_id',False)))] + {'default_ref': 'stock.picking,'+str(context.get('active_id', False))} + [('ref','=','stock.picking,'+str(context.get('active_id',False)))] crm.claim.from_delivery.form - stock.picking.out - + stock.picking +
+
diff --git a/addons/contacts/i18n/vi.po b/addons/contacts/i18n/vi.po new file mode 100644 index 00000000000..d404d947fe2 --- /dev/null +++ b/addons/contacts/i18n/vi.po @@ -0,0 +1,45 @@ +# Vietnamese translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-06-27 16:47+0000\n" +"Last-Translator: FULL NAME \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: 2013-06-28 05:42+0000\n" +"X-Generator: Launchpad (build 16681)\n" + +#. module: contacts +#: model:ir.actions.act_window,help:contacts.action_contacts +msgid "" +"

\n" +" Click to add a contact in your address book.\n" +"

\n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"

\n" +" " +msgstr "" +"

\n" +" Nhấn để thêm liên lạc vào sổ địa chỉ.\n" +"

\n" +" OpenERP giúp bạn theo dõi các hoạt động liên quan tới\n" +" một khách hàng; thảo luận, lịch sử cơ hội kinh doanh,\n" +" tài liệu v.v....\n" +"

\n" +" " + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "Liên hệ" diff --git a/addons/contacts/static/src/img/icon.png b/addons/contacts/static/description/icon.png similarity index 100% rename from addons/contacts/static/src/img/icon.png rename to addons/contacts/static/description/icon.png diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 44ada2ffcc0..1070af22b3c 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -77,12 +77,12 @@ class crm_lead(base_stage, format_address, osv.osv): _track = { 'state': { - 'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'], - 'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done', - 'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel', + 'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.state in ['new', 'draft'], + 'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.state == 'done', + 'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancel', }, 'stage_id': { - 'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'cancel', 'done'], + 'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj.state not in ['new', 'draft', 'cancel', 'done'], }, } diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index e7e6beae33e..4c6cf47c4f7 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -709,5 +709,6 @@ Andrew
eval="[ ref('msg_case18_1'), ref('msg_case18_2')], True, {}" /> + diff --git a/addons/crm/html/Stephan-Keller.jpg b/addons/crm/static/description/Stephan-Keller.jpg similarity index 100% rename from addons/crm/html/Stephan-Keller.jpg rename to addons/crm/static/description/Stephan-Keller.jpg diff --git a/addons/crm/html/claudia-sebastiani.jpg b/addons/crm/static/description/claudia-sebastiani.jpg similarity index 100% rename from addons/crm/html/claudia-sebastiani.jpg rename to addons/crm/static/description/claudia-sebastiani.jpg diff --git a/addons/crm/html/crm_game.png b/addons/crm/static/description/crm_game.png similarity index 100% rename from addons/crm/html/crm_game.png rename to addons/crm/static/description/crm_game.png diff --git a/addons/crm/html/crm_game_01.png b/addons/crm/static/description/crm_game_01.png similarity index 100% rename from addons/crm/html/crm_game_01.png rename to addons/crm/static/description/crm_game_01.png diff --git a/addons/crm/html/crm_game_02.png b/addons/crm/static/description/crm_game_02.png similarity index 100% rename from addons/crm/html/crm_game_02.png rename to addons/crm/static/description/crm_game_02.png diff --git a/addons/crm/html/crm_game_03.png b/addons/crm/static/description/crm_game_03.png similarity index 100% rename from addons/crm/html/crm_game_03.png rename to addons/crm/static/description/crm_game_03.png diff --git a/addons/crm/html/crm_linkedin.png b/addons/crm/static/description/crm_linkedin.png similarity index 100% rename from addons/crm/html/crm_linkedin.png rename to addons/crm/static/description/crm_linkedin.png diff --git a/addons/crm/html/crm_sc_01.jpg b/addons/crm/static/description/crm_sc_01.jpg similarity index 100% rename from addons/crm/html/crm_sc_01.jpg rename to addons/crm/static/description/crm_sc_01.jpg diff --git a/addons/crm/html/crm_sc_01.png b/addons/crm/static/description/crm_sc_01.png similarity index 100% rename from addons/crm/html/crm_sc_01.png rename to addons/crm/static/description/crm_sc_01.png diff --git a/addons/crm/html/crm_sc_02.png b/addons/crm/static/description/crm_sc_02.png similarity index 100% rename from addons/crm/html/crm_sc_02.png rename to addons/crm/static/description/crm_sc_02.png diff --git a/addons/crm/html/crm_sc_04a.png b/addons/crm/static/description/crm_sc_04a.png similarity index 100% rename from addons/crm/html/crm_sc_04a.png rename to addons/crm/static/description/crm_sc_04a.png diff --git a/addons/crm/html/crm_sc_04b.png b/addons/crm/static/description/crm_sc_04b.png similarity index 100% rename from addons/crm/html/crm_sc_04b.png rename to addons/crm/static/description/crm_sc_04b.png diff --git a/addons/crm/html/crm_sc_04c.png b/addons/crm/static/description/crm_sc_04c.png similarity index 100% rename from addons/crm/html/crm_sc_04c.png rename to addons/crm/static/description/crm_sc_04c.png diff --git a/addons/crm/html/crm_sc_04d.png b/addons/crm/static/description/crm_sc_04d.png similarity index 100% rename from addons/crm/html/crm_sc_04d.png rename to addons/crm/static/description/crm_sc_04d.png diff --git a/addons/crm/html/crm_sc_05.png b/addons/crm/static/description/crm_sc_05.png similarity index 100% rename from addons/crm/html/crm_sc_05.png rename to addons/crm/static/description/crm_sc_05.png diff --git a/addons/crm/html/crm_sc_06.png b/addons/crm/static/description/crm_sc_06.png similarity index 100% rename from addons/crm/html/crm_sc_06.png rename to addons/crm/static/description/crm_sc_06.png diff --git a/addons/crm/html/crm_sc_08.png b/addons/crm/static/description/crm_sc_08.png similarity index 100% rename from addons/crm/html/crm_sc_08.png rename to addons/crm/static/description/crm_sc_08.png diff --git a/addons/crm/html/crm_sc_agenda.png b/addons/crm/static/description/crm_sc_agenda.png similarity index 100% rename from addons/crm/html/crm_sc_agenda.png rename to addons/crm/static/description/crm_sc_agenda.png diff --git a/addons/crm/html/crm_sc_marketing.png b/addons/crm/static/description/crm_sc_marketing.png similarity index 100% rename from addons/crm/html/crm_sc_marketing.png rename to addons/crm/static/description/crm_sc_marketing.png diff --git a/addons/crm/static/src/img/icon.png b/addons/crm/static/description/icon.png similarity index 100% rename from addons/crm/static/src/img/icon.png rename to addons/crm/static/description/icon.png diff --git a/addons/crm/html/index.html b/addons/crm/static/description/index.html similarity index 100% rename from addons/crm/html/index.html rename to addons/crm/static/description/index.html diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 1ad729d9c09..b8f27b7e05e 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -221,41 +221,33 @@
- delivery.stock.picking_withcarrier.out.form.view - stock.picking.out + delivery.stock.picking_withcarrier.form.view + stock.picking + +