[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120927092639-nt6rua640zq3ujlk bzr revid: atp@tinyerp.com-20120927102739-0esc1w2aum4rs9pu
2012-09-27 15:57:39 +05:30
parent 1c1978fbb7 994fe31313
commit 41d11ed51f
6 changed files with 3873 additions and 1 deletions
@@ -117,6 +117,9 @@ class account_config_settings(osv.osv_memory):
        'group_multi_currency': fields.boolean('Allow multi currencies',
            implied_group='base.group_multi_currency',
            help="Allows you multi currency environment"),
+        'group_analytic_accounting': fields.boolean('Analytic accounting',
+            implied_group='analytic.group_analytic_accounting',
+            help="Allows you to use the analytic accounting."),
    }

    def _default_company(self, cr, uid, context=None):
@@ -129,6 +129,10 @@
                                <field name="module_account_accountant" class="oe_inline"/>
                                <label for="module_account_accountant"/>
                            </div>
+                            <div>
+                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <label for="group_analytic_accounting"/>
+                            </div>
                            <div>
                                <field name="module_account_asset" class="oe_inline"/>
                                <label for="module_account_asset"/>
@@ -1058,6 +1058,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
        'active': fields.boolean('Active', help="If the active field is set to \
         true, it will allow you to hide the event alarm information without removing it."),
        'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
+        'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
    }

    def create_attendees(self, cr, uid, ids, context):
@@ -0,0 +1,123 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-26 14:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-27 04:36+0000\n"
+"X-Generator: Launchpad (build 16033)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Имя пользователя"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Логин Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Ошибка импорта контактов Google!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Синхронизация "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Вы не можете создать двух пользователей с одним логином!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Ошибка"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Логин Google"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Пароль Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Аккаунт Google"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Имя пользователя Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Установите, пожалуйста, gdata-python-client с http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Контакт Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Логин"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Выбранная компания отсутствует в списке разрешённых компаний для этого "
+"пользователя"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Пароль"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Ошибка авторизации, проверьте имя пользователя и пароля!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "пример: user@gmail.com"
@@ -320,7 +320,9 @@ class test_mail(TestMailMockups):
        for sent_email in sent_emails:
            self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
            self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
-            self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils', 'sent_email body_alternative is incorrect')
+            # the html2plaintext uses etree or beautiful soup, so the result may be slighly different
+            # depending if you have installed beautiful soup.
+            self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
        # Test: mail_message: partner_ids = group followers
        message_pids = set([partner.id for partner in message.partner_ids])
        test_pids = set([p_a_id, p_b_id, p_c_id])