[MERGE] from parent

bzr revid: xmo@openerp.com-20131014085215-qoqytud1mkpdqbz0
This commit is contained in:
Xavier Morel
2013-10-14 10:52:15 +02:00
77 changed files with 317 additions and 199 deletions
+10
View File
@@ -91,6 +91,16 @@ Administrator</field>
<field eval="10" name="sequence"/>
</record>
<!--
A group dedicated to the portal users, making groups
restrictions more convenient.
-->
<record id="group_portal" model="res.groups">
<field name="name">Portal</field>
<field name="comment">Portal members have specific access rights (such as record rules and restricted menus).
They usually do not belong to the usual OpenERP groups.</field>
</record>
<!--
A group dedicated to the public user only, making groups
restrictions more convenient.
+2 -2
View File
@@ -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: 2013-09-25 05:17+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:37+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:17+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:38+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:17+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:38+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:17+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:38+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:18+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:18+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:18+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:18+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n"
"X-Generator: Launchpad (build 16799)\n"
"X-Poedit-Language: Czech\n"
#. module: base
+2 -2
View File
@@ -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: 2013-09-27 05:48+0000\n"
"X-Generator: Launchpad (build 16774)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+27 -12
View File
@@ -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: 2013-09-25 05:20+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:40+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -936,7 +936,7 @@ msgstr "Jordanien"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_hr
msgid "Croatia - RRIF 2012 COA"
msgstr ""
msgstr "Kroatien - RRIF 2012 COA"
#. module: base
#: help:ir.cron,nextcall:0
@@ -4506,7 +4506,7 @@ msgstr "Rekursive Einträge entdeckt"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_et
msgid "Ethiopia - Accounting"
msgstr ""
msgstr "Äthiopien - Accounting"
#. module: base
#: code:addons/base/module/module.py:366
@@ -6135,7 +6135,7 @@ msgstr "Sicherheit"
#. module: base
#: selection:base.language.install,lang:0
msgid "Portuguese / Português"
msgstr ""
msgstr "Portugiesisch / Português"
#. module: base
#: code:addons/base/ir/ir_model.py:372
@@ -7996,7 +7996,7 @@ msgstr "Manchmal BIC oder SWIFT genannt"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_in
msgid "Indian - Accounting"
msgstr ""
msgstr "Indien - Accounting"
#. module: base
#: field:res.lang,time_format:0
@@ -9494,7 +9494,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_import
msgid "Base import"
msgstr ""
msgstr "Standard Import"
#. module: base
#: report:ir.module.reference:0
@@ -11145,7 +11145,7 @@ msgstr "benutzerdefinierte Tastaturkürzel"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_si
msgid "Slovenian - Accounting"
msgstr ""
msgstr "Slowenien - Accounting"
#. module: base
#: model:ir.module.module,description:base.module_account_cancel
@@ -11989,7 +11989,7 @@ msgstr "Datum erstellt"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_cn
msgid "中国会计科目表 - Accounting"
msgstr ""
msgstr "China - Accounting"
#. module: base
#: sql_constraint:ir.model.constraint:0
@@ -12006,6 +12006,12 @@ msgid ""
"This module gives the details of the goods traded between the countries of\n"
"European Union."
msgstr ""
"\n"
"Dieses Modul fügt Intrastat Berichte hinzu.\n"
"=====================================\n"
"\n"
"Die Berichte zeigen Details über den innergemeinschaftlichen Handel von "
"Gütern innerhalb der Europäischen Union."
#. module: base
#: help:ir.actions.server,loop_action:0
@@ -16251,6 +16257,15 @@ msgid ""
" Unit price=225, Discount=0,00, Net price=225.\n"
" "
msgstr ""
"\n"
"Dieses Modul ermöglicht Ihnen, Rabatte in Aufträgen und Rechnungen mittels "
"der Partner-Preisliste zu kalkulieren.\n"
"============================================================================="
"==================================\n"
"\n"
"Am Ende des Preislisten-Formulars wird ein Kontrollkästchen \"Rabatt "
"sichtbar\" hinzugefügt.\n"
" "
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm
@@ -16509,7 +16524,7 @@ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
#. module: base
#: view:ir.translation:0
msgid "Web-only translations"
msgstr ""
msgstr "Übersetzungen fürs Web"
#. module: base
#: view:ir.rule:0
@@ -17736,7 +17751,7 @@ msgstr "Kanadische Buchführung"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_co
msgid "Colombian - Accounting"
msgstr ""
msgstr "Kolumbien - Accounting"
#. module: base
#: model:ir.module.module,description:base.module_account_voucher
@@ -18403,7 +18418,7 @@ msgstr "Russisch / русский язык"
#. module: base
#: model:ir.module.module,shortdesc:base.module_auth_signup
msgid "Signup"
msgstr ""
msgstr "Registrieren"
#~ msgid "SMS - Gateway: clickatell"
#~ msgstr "SMS - Gateway: clickatell"
+2 -2
View File
@@ -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: 2013-09-25 05:20+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:41+0000\n"
"X-Generator: Launchpad (build 16799)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:24+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:45+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:27+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:48+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:27+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:48+0000\n"
"X-Generator: Launchpad (build 16799)\n"
"Language: \n"
#. module: base
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:28+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:48+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:27+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:48+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+17 -17
View File
@@ -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: 2013-09-25 05:19+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:40+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -134,7 +134,7 @@ msgstr ""
#. module: base
#: help:res.partner,employee:0
msgid "Check this box if this contact is an Employee."
msgstr ""
msgstr "Märgi see valik, kui see kontakt on töötaja."
#. module: base
#: help:ir.model.fields,domain:0
@@ -383,7 +383,7 @@ msgstr ""
#. module: base
#: field:ir.module.category,child_ids:0
msgid "Child Applications"
msgstr ""
msgstr "Alam-moodulid"
#. module: base
#: field:res.partner,credit_limit:0
@@ -395,7 +395,7 @@ msgstr "Krediidilimiit"
#: field:ir.model.data,date_update:0
#: field:ir.model.relation,date_update:0
msgid "Update Date"
msgstr ""
msgstr "Uuendamise kuupäev"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
@@ -662,7 +662,7 @@ msgstr "Väljuvate kirjade server"
#: help:ir.actions.client,context:0
msgid ""
"Context dictionary as Python expression, empty by default (Default: {})"
msgstr ""
msgstr "Konteksti sõnastik Python avaldisena, vaikimisi tühi (Vaikimisi: {})"
#. module: base
#: field:res.company,logo_web:0
@@ -688,12 +688,12 @@ msgstr "Vali toimingu aken, aruanne, nõustaja mis käivitada"
#. module: base
#: sql_constraint:ir.config_parameter:0
msgid "Key must be unique."
msgstr ""
msgstr "Võti peab olema unikaalne."
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin_outlook
msgid "Outlook Plug-In"
msgstr ""
msgstr "Outlooki lisamoodul"
#. module: base
#: model:ir.module.module,description:base.module_account
@@ -778,7 +778,7 @@ msgstr ""
#. module: base
#: help:ir.cron,nextcall:0
msgid "Next planned execution date for this job."
msgstr ""
msgstr "Järgmine planeeritud kuupäev töö teostamiseks."
#. module: base
#: model:ir.model,name:base.model_ir_ui_view
@@ -793,7 +793,7 @@ msgstr "Eritrea"
#. module: base
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
msgstr "Ettevõtte nimi peab olema unikaalne !"
#. module: base
#: model:ir.ui.menu,name:base.menu_base_action_rule_admin
@@ -832,7 +832,7 @@ msgstr ""
#. module: base
#: view:ir.mail_server:0
msgid "Security and Authentication"
msgstr ""
msgstr "Turvalisus ja Autentimine"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_calendar
@@ -14963,7 +14963,7 @@ msgstr "Vaate nimi"
#. module: base
#: model:ir.model,name:base.model_res_groups
msgid "Access Groups"
msgstr ""
msgstr "Ligipääsu gruppid"
#. module: base
#: selection:base.language.install,lang:0
@@ -15025,7 +15025,7 @@ msgstr "Partneri kategooriad"
#. module: base
#: view:base.module.upgrade:0
msgid "System Update"
msgstr ""
msgstr "Süsteemivärskendus"
#. module: base
#: field:ir.actions.report.xml,report_sxw_content:0
@@ -15036,7 +15036,7 @@ msgstr ""
#. module: base
#: field:ir.attachment,file_size:0
msgid "File Size"
msgstr ""
msgstr "Faili suurus"
#. module: base
#: help:ir.sequence,prefix:0
@@ -15222,7 +15222,7 @@ msgstr ""
#. module: base
#: view:res.partner:0
msgid "Internal Notes"
msgstr ""
msgstr "Sisemised märkmed"
#. module: base
#: model:res.partner.title,name:base.res_partner_title_pvt_ltd
@@ -15286,7 +15286,7 @@ msgstr "Lõuna-Sudaan"
#. module: base
#: field:ir.filters,context:0
msgid "Context"
msgstr ""
msgstr "Kontekst"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_mrp
@@ -15366,7 +15366,7 @@ msgstr "Vene keel / русский язык"
#. module: base
#: model:ir.module.module,shortdesc:base.module_auth_signup
msgid "Signup"
msgstr ""
msgstr "Registreeri"
#~ msgid "Metadata"
#~ msgstr "Metaandmed"
+2 -2
View File
@@ -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: 2013-09-25 05:18+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:38+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:23+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n"
"X-Generator: Launchpad (build 16799)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
+2 -2
View File
@@ -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: 2013-09-25 05:28+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:49+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:19+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:40+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:19+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:40+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:20+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:41+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:20+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:41+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:20+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:41+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:20+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:41+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+51 -24
View File
@@ -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: 2013-09-25 05:24+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n"
"X-Generator: Launchpad (build 16799)\n"
"Language: hr\n"
#. module: base
@@ -383,6 +383,14 @@ msgid ""
"invoices from picking, OpenERP is able to add and compute the shipping "
"line.\n"
msgstr ""
"\n"
"Omogućuje dodavanje metoda isporuke u prodajne naloge i skladišno.\n"
"==============================================================\n"
"\n"
"Možete definirati svoje dostavljače i mreže isporuke za cijene. Kada se "
"kreiraju \n"
"računi iz skladišnih dokumenata, OpenERP je u mogućnosti dodati i izračunati "
" troškove dostave .\n"
#. module: base
#: code:addons/base/ir/ir_filters.py:80
@@ -1031,7 +1039,7 @@ msgstr "Španjolski"
#. module: base
#: field:res.partner,mobile:0
msgid "Mobile"
msgstr "Mobilni"
msgstr "Mobitel"
#. module: base
#: model:res.country,name:base.om
@@ -1437,7 +1445,7 @@ msgstr "Testovi"
#. module: base
#: field:ir.actions.report.xml,attachment:0
msgid "Save as Attachment Prefix"
msgstr ""
msgstr "Snimi kao prefiks priloga"
#. module: base
#: field:ir.ui.view_sc,res_id:0
@@ -3800,7 +3808,7 @@ msgstr "Izvještaji"
#: field:res.partner,title:0
#: field:res.partner.title,name:0
msgid "Title"
msgstr "Naslov"
msgstr "Titula"
#. module: base
#: help:ir.property,res_id:0
@@ -7406,7 +7414,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_report_intrastat
msgid "Intrastat Reporting"
msgstr ""
msgstr "Intrastat izvještaj"
#. module: base
#: code:addons/base/res/res_users.py:131
@@ -7616,7 +7624,7 @@ msgstr "Slijedeći broj ove sekvence"
#. module: base
#: view:res.partner:0
msgid "at"
msgstr ""
msgstr "na"
#. module: base
#: view:ir.rule:0
@@ -7758,7 +7766,7 @@ msgstr ""
#. module: base
#: view:ir.mail_server:0
msgid "Test Connection"
msgstr ""
msgstr "Testiraj Vezu"
#. module: base
#: model:res.country,name:base.mm
@@ -8073,7 +8081,7 @@ msgstr "Macau"
#. module: base
#: model:ir.actions.report.xml,name:base.res_partner_address_report
msgid "Labels"
msgstr "Labele"
msgstr "Etikete"
#. module: base
#: help:res.partner,use_parent_address:0
@@ -8431,7 +8439,7 @@ msgstr "Hong Kong"
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_sale
msgid "Portal Sale"
msgstr ""
msgstr "Portal prodaje"
#. module: base
#: field:ir.default,ref_id:0
@@ -8604,7 +8612,7 @@ msgstr "Nepal"
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_page
msgid "Document Page"
msgstr ""
msgstr "Stranica dokumenta"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ar
@@ -8663,6 +8671,9 @@ msgid ""
"If the selected language is loaded in the system, all documents related to "
"this contact will be printed in this language. If not, it will be English."
msgstr ""
"Ako je odabrani jezik instaliran, tada će se svi dokumenti povezani sa ovim "
"kontaktom ispisivati na tom jeziku. U suprotnom koristiti će se engleski "
"jezik."
#. module: base
#: model:ir.module.module,description:base.module_hr_evaluation
@@ -8714,7 +8725,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account
msgid "eInvoicing"
msgstr ""
msgstr "eFakturiranje"
#. module: base
#: code:addons/base/res/res_users.py:171
@@ -9708,7 +9719,7 @@ msgstr "Prilagođen"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_margin
msgid "Margins in Sales Orders"
msgstr ""
msgstr "Marža u prodajnim nalozima"
#. module: base
#: model:ir.module.module,shortdesc:base.module_purchase
@@ -9927,7 +9938,7 @@ msgstr ""
#. module: base
#: field:ir.attachment,store_fname:0
msgid "Stored Filename"
msgstr ""
msgstr "Pohranjeni naziv datoteke"
#. module: base
#: field:res.partner,use_parent_address:0
@@ -9984,6 +9995,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Pritisnite za kreiranje novog kontakta u adresaru.\n"
" </p><p>\n"
" Pomoću OpenERP-a moguće je jednostavno pratiti sve \n"
" aktivnosti povezane sa dobavljačima: diskusije, povijest \n"
" nabave, dokumenti i sl.\n"
" </p>\n"
" "
#. module: base
#: model:res.country,name:base.lr
@@ -10384,7 +10403,7 @@ msgstr "Guinea Bissau"
#. module: base
#: field:ir.actions.report.xml,header:0
msgid "Add RML Header"
msgstr ""
msgstr "Dodaj RML zaglavlje"
#. module: base
#: help:res.company,rml_footer:0
@@ -10394,7 +10413,7 @@ msgstr "Tekst podnožja prikazan na dnu svih izvještaja"
#. module: base
#: field:ir.module.module,icon:0
msgid "Icon URL"
msgstr ""
msgstr "URL ikone"
#. module: base
#: model:ir.module.module,shortdesc:base.module_note_pad
@@ -10838,7 +10857,7 @@ msgstr ""
#. module: base
#: help:res.partner,ean13:0
msgid "BarCode"
msgstr ""
msgstr "Barkod"
#. module: base
#: help:ir.model.fields,model_id:0
@@ -11130,7 +11149,7 @@ msgstr "Predefinirana organizacija po objektu"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_hello
msgid "Hello"
msgstr ""
msgstr "Pozdrav"
#. module: base
#: view:ir.actions.configuration.wizard:0
@@ -11953,7 +11972,7 @@ msgstr "Izraz petlje"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_16
msgid "Retailer"
msgstr ""
msgstr "Trgovac"
#. module: base
#: view:ir.model.fields:0
@@ -14072,7 +14091,7 @@ msgstr "Tajland"
#. module: base
#: model:ir.model,name:base.model_change_password_wizard
msgid "Change Password Wizard"
msgstr ""
msgstr "Čarobnjak za promjenu lozinke"
#. module: base
#: model:ir.module.module,summary:base.module_account_voucher
@@ -14152,7 +14171,7 @@ msgstr "Relacija objekta"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_voucher
msgid "eInvoicing & Payments"
msgstr ""
msgstr "eRačuni i Plaćanja"
#. module: base
#: view:ir.rule:0
@@ -14270,7 +14289,7 @@ msgstr "Korištenje akcije"
#. module: base
#: field:ir.module.module,name:0
msgid "Technical Name"
msgstr ""
msgstr "Tehnički naziv"
#. module: base
#: model:ir.model,name:base.model_workflow_workitem
@@ -14517,7 +14536,7 @@ msgstr "Aruba"
#: code:addons/base/module/wizard/base_module_import.py:58
#, python-format
msgid "File is not a zip file!"
msgstr ""
msgstr "Datoteka nij eu zip formatu !"
#. module: base
#: model:res.country,name:base.ar
@@ -15113,7 +15132,7 @@ msgstr "Uvjet"
#: model:ir.actions.client,name:base.modules_updates_act_cl
#: model:ir.ui.menu,name:base.menu_module_updates
msgid "Updates"
msgstr ""
msgstr "Nadogradnja"
#. module: base
#: help:res.currency,rate:0
@@ -15472,6 +15491,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Pritisnite za kreiranje novog kontakta u adresaru.\n"
" </p><p>\n"
" Pomoću OpenERP-a moguće je jednostavno pratiti sve \n"
" aktivnosti povezane sa kupcima: diskusije, povijest \n"
" prilika, dokumenti i sl.\n"
" </p>\n"
" "
#. module: base
#: model:res.partner.category,name:base.res_partner_category_2
+2 -2
View File
@@ -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: 2013-09-25 05:21+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:41+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:18+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:38+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:21+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:42+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:21+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:42+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:21+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:42+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+7 -3
View File
@@ -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: 2013-09-25 05:21+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:42+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -25,6 +25,10 @@ msgid ""
"================================================\n"
" "
msgstr ""
"\n"
"小切手作成・印刷のモジュール\n"
"================================================\n"
" "
#. module: base
#: model:res.country,name:base.sh
@@ -58,7 +62,7 @@ msgstr "ビューアーキテクチャ"
#. module: base
#: model:ir.module.module,summary:base.module_sale_stock
msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
msgstr ""
msgstr "見積書、販売オーダ、出荷、請求書コントロール"
#. module: base
#: selection:ir.sequence,implementation:0
+2 -2
View File
@@ -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: 2013-09-25 05:19+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:40+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:21+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:42+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:22+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:42+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:22+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:22+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:22+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:22+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:22+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:19+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:27+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:23+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:23+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:26+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:23+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:23+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:24+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:45+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:24+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:45+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:17+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:38+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:24+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:28+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:49+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:24+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:45+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:45+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:45+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+3 -3
View File
@@ -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: 2013-09-25 05:27+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:48+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -229,7 +229,7 @@ msgstr "基本字段的属性不能这样修改,请通过 Python 代码来修
#: code:addons/osv.py:151
#, python-format
msgid "Constraint Error"
msgstr "约束错误"
msgstr "约束性错误"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_custom
+2 -2
View File
@@ -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: 2013-09-25 05:25+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+2 -2
View File
@@ -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: 2013-09-25 05:27+0000\n"
"X-Generator: Launchpad (build 16771)\n"
"X-Launchpad-Export-Date: 2013-10-11 04:48+0000\n"
"X-Generator: Launchpad (build 16799)\n"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
+42 -4
View File
@@ -1,14 +1,17 @@
# -*- coding: utf-8 -*-
import cStringIO
import json
import datetime
import dateutil
import logging
import re
import traceback
import urllib
import xml # FIXME use lxml and etree
import Image
import werkzeug.utils
import xml # FIXME use lxml
import traceback
from openerp.osv import osv, orm, fields
_logger = logging.getLogger(__name__)
@@ -32,8 +35,22 @@ BUILTINS = {
'set': set,
'str': str,
'tuple': tuple,
'quote': urllib.quote,
'urlencode': urllib.urlencode,
'datetime': datetime,
# dateutil.relativedelta is an old-style class and cannot be directly
# instanciated wihtin a jinja2 expression, so a lambda "proxy" is
# is needed, apparently.
'relativedelta': lambda *a, **kw : dateutil.relativedelta.relativedelta(*a, **kw),
}
## We use a jinja2 sandboxed environment to render qWeb templates.
#from openerp.tools.safe_eval import safe_eval as eval
#from jinja2.sandbox import SandboxedEnvironment
#from jinja2.exceptions import SecurityError, UndefinedError
#UNSAFE = ["browse", "search", "read", "unlink", "read_group"]
#SAFE = ["_name"]
class QWebContext(dict):
def __init__(self, data, undefined_handler=None, loader=None):
self.loader = loader
@@ -51,6 +68,27 @@ class QWebContext(dict):
else:
return self.get(key, self.undefined_handler(key, self))
def safe_eval(self, expr):
# This is too slow, we should cached compiled expressions attribute of
# qweb to will be changed into a model object ir.qweb.
#
# The cache should be on qweb, and qweb context contructor take qweb as
# argument to store the cache.
#
#class QWebSandboxedEnvironment(SandboxedEnvironment):
# def is_safe_attribute(self, obj, attr, value):
# if str(attr) in SAFE:
# res = True
# else:
# res = super(QWebSandboxedEnvironment, self).is_safe_attribute(obj, attr, value)
# if str(attr) in UNSAFE or not res:
# raise SecurityError("access to attribute '%s' of '%s' object is unsafe." % (attr,obj))
# return res
#env = qWebSandboxedEnvironment(variable_start_string="${", variable_end_string="}")
#env.globals.update(context)
#env.compile_expression(expr)()
return eval(expr, None, self)
def copy(self):
return QWebContext(dict.copy(self),
undefined_handler=self.undefined_handler,
@@ -152,7 +190,7 @@ class QWeb(orm.AbstractModel):
def eval(self, expr, v):
try:
return eval(expr, None, v)
return v.safe_eval(expr)
except (osv.except_osv, orm.except_orm), err:
raise orm.except_orm("QWeb Error", "Invalid expression %r while rendering template '%s'.\n\n%s" % (expr, v.get('__template__'), err[1]))
except Exception:
@@ -605,4 +643,4 @@ def get_field_type(column, options):
"""
return options.get('widget', column._type)
# leave this, al.
# vim:et:
+14
View File
@@ -29,12 +29,14 @@ import time
import HTMLParser
from lxml import etree
import openerp
from openerp import tools
from openerp.osv import fields, osv, orm
from openerp.tools import graph, SKIPPED_ELEMENT_TYPES
from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools.view_validation import valid_view
from openerp.tools import misc
from openerp.osv.orm import browse_record, browse_record_list
_logger = logging.getLogger(__name__)
@@ -768,6 +770,18 @@ class view(osv.osv):
def render(self, cr, uid, id_or_xml_id, values, engine='ir.qweb', context=None):
if not context:
context = {}
def check_user_access(values):
for key in values:
value = isinstance(values, (dict,)) and values[key] or key
if isinstance(value, (browse_record,)):
if value.__dict__.get('_uid') == openerp.SUPERUSER_ID and uid != openerp.SUPERUSER_ID:
message = 'SUPERUSER_ID Access used for rendering "%s" in a xml view: %s' % (key, id_or_xml_id,)
_logger.warn(message)
elif isinstance(value, (dict, list, browse_record_list,)):
check_user_access(value)
check_user_access(values)
def loader(name):
return self.read_template(cr, uid, name, context=context)
@@ -57,6 +57,16 @@
<field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
</record>
<record model="ir.rule" id="res_partner_portal_public_rule">
<field name="name">res_partner: portal/public: read access on my commercial partner</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="domain_force">[('id', 'child_of', user.commercial_partner_id.id)]</field>
<field name="groups" eval="[(4, ref('base.group_portal')), (4, ref('base.group_public'))]"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_write" eval="False"/>
</record>
<record model="ir.rule" id="multi_company_default_rule">
<field name="name">Multi_company_default company</field>
<field name="model_id" ref="model_multi_company_default"/>
@@ -56,6 +56,8 @@
"access_res_groups_group_user","res_groups group_user","model_res_groups",,1,0,0,0
"access_res_lang_group_all","res_lang group_all","model_res_lang",,1,0,0,0
"access_res_lang_group_user","res_lang group_user","model_res_lang","group_system",1,1,1,1
"access_res_partner_public","res_partner group_public","model_res_partner","group_public",1,0,0,0
"access_res_partner_portal","res_partner group_portal","model_res_partner","group_portal",1,0,0,0
"access_res_partner_group_partner_manager","res_partner group_partner_manager","model_res_partner","group_partner_manager",1,1,1,1
"access_res_partner_group_user","res_partner group_user","model_res_partner","group_user",1,0,0,0
"access_res_partner_bank_group_user","res_partner_bank group_user","model_res_partner_bank","group_user",1,0,0,0
@@ -109,7 +111,6 @@
"access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1
"access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
"access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
"access_res_partner_public","res.partner","base.model_res_partner","base.group_public",1,0,0,0
access_ir_qweb,access_ir_qweb,model_ir_qweb,,0,0,0,0
access_ir_qweb_field,access_ir_qweb_field,model_ir_qweb_field,,0,0,0,0
access_ir_qweb_field_float,access_ir_qweb_field_float,model_ir_qweb_field_float,,0,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
56 access_res_groups_group_user res_groups group_user model_res_groups 1 0 0 0
57 access_res_lang_group_all res_lang group_all model_res_lang 1 0 0 0
58 access_res_lang_group_user res_lang group_user model_res_lang group_system 1 1 1 1
59 access_res_partner_public res_partner group_public model_res_partner group_public 1 0 0 0
60 access_res_partner_portal res_partner group_portal model_res_partner group_portal 1 0 0 0
61 access_res_partner_group_partner_manager res_partner group_partner_manager model_res_partner group_partner_manager 1 1 1 1
62 access_res_partner_group_user res_partner group_user model_res_partner group_user 1 0 0 0
63 access_res_partner_bank_group_user res_partner_bank group_user model_res_partner_bank group_user 1 0 0 0
111 access_ir_mail_server ir_mail_server model_ir_mail_server group_system 1 1 1 1
112 access_ir_actions_client ir_actions_client all model_ir_actions_client 1 0 0 0
113 access_ir_needaction_mixin ir_needaction_mixin model_ir_needaction_mixin 1 1 1 1
access_res_partner_public res.partner base.model_res_partner base.group_public 1 0 0 0
114 access_ir_qweb access_ir_qweb model_ir_qweb 0 0 0 0
115 access_ir_qweb_field access_ir_qweb_field model_ir_qweb_field 0 0 0 0
116 access_ir_qweb_field_float access_ir_qweb_field_float model_ir_qweb_field_float 0 0 0 0
+5
View File
@@ -168,6 +168,11 @@ def main(args):
import_translation()
sys.exit(0)
# This needs to be done now to ensure the use of the multiprocessing
# signaling mecanism for registries loaded with -d
if config['workers']:
openerp.multi_process = True
# preload registryies, needed for -u --stop_after_init
rc = 0
if config['db_name']:
-6
View File
@@ -793,11 +793,6 @@ class WorkerCron(Worker):
Worker.start(self)
self.multi.socket.close()
# chorus effect: make cron workers do not all start at first database
mct = config['max_cron_threads']
p = float(self.pid % mct) / mct
self.db_index = int(len(self._db_list()) * p)
#----------------------------------------------------------
# start/stop public api
#----------------------------------------------------------
@@ -833,7 +828,6 @@ def start():
global server
load_server_wide_modules()
if config['workers']:
openerp.multi_process = True
server = PreforkServer(openerp.service.wsgi_server.application)
elif openerp.evented:
server = GeventServer(openerp.service.wsgi_server.application)
+1 -1
View File
@@ -75,7 +75,7 @@ def py2exe_options():
"skip_archive": 1,
"optimize": 0, # keep the assert running, because the integrated tests rely on them.
"dist_dir": 'dist',
"packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "jinja2", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "pytz", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
"packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "jinja2", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "pytz", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml"],
"excludes" : ["Tkconstants","Tkinter","tcl"],
}
}