pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged with main server.

Browse Source 
bzr revid: tde@openerp.com-20120323091819-ais3o3jqjqsofi6r
This commit is contained in:
Thibault Delavallée
2012-03-23 10:18:19 +01:00
parent 6e0643868e 1ba39859e2
commit 19f6b095fd
90 changed files with 17494 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.bzrignore
+10 -15
View File
@@ -1,23 +1,18 @@
*.pyc
.*.swp
.bzrignore
.idea
.project
.pydevproject
.ropeproject
.settings
.DS_Store
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
bin/*
build/
bin/yolk
bin/pil*.py
.project
.pydevproject
.settings
include/
lib/
share/
openerp-server
+8 -3
View File
@@ -165,11 +165,16 @@ def dumpstacks(sig, frame):
""" Signal handler: dump a stack trace for each existing thread."""
# code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
# modified for python 2.5 compatibility
thread_map = dict(threading._active, **threading._limbo)
id2name = dict([(threadId, thread.getName()) for threadId, thread in thread_map.items()])
threads_info = dict([(th.ident, {'name': th.name,
'uid': getattr(th,'uid','n/a')})
for th in threading.enumerate()])
code = []
for threadId, stack in sys._current_frames().items():
code.append("\n# Thread: %s(%d)" % (id2name[threadId], threadId))
thread_info = threads_info.get(threadId)
code.append("\n# Thread: %s (id:%s) (uid:%s)" % \
(thread_info and thread_info['name'] or 'n/a',
threadId,
thread_info and thread_info['uid'] or 'n/a'))
for filename, lineno, name, line in traceback.extract_stack(stack):
code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
if line:
openerp/addons/base/base_data.xml
+2 -2
View File
@@ -199,7 +199,7 @@
<field name="code">cf</field>
</record>
<record id="cd" model="res.country">
<field name="name">Congo, The Democratic Republic of the</field>
<field name="name">Congo, Democratic Republic of the</field>
<field name="code">cd</field>
</record>
<record id="cg" model="res.country">
@@ -1373,7 +1373,7 @@
<record id="INR" model="res.currency">
<field name="name">INR</field>
<field name="symbol">Rs</field>
<field name="symbol">₹</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
openerp/addons/base/base_menu.xml
+4 -2
View File
@@ -27,8 +27,10 @@
parent="base.menu_custom" name="Reporting" sequence="30"
/>
<menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
groups="base.group_extended"/>
<menuitem id="base.menu_reporting" name="Reporting" sequence="45" groups="base.group_extended"/>
<menuitem id="base.menu_dasboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
<menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50"/>
<menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100"/>
</data>
</openerp>
openerp/addons/base/i18n/ab.po
+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: 2012-02-28 05:47+0000\n"
"X-Generator: Launchpad (build 14874)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/af.po
+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: 2012-02-09 05:45+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/am.po
+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: 2012-02-09 05:46+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ar.po
+189 -160
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/bg.po
+10 -8
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: 2012-02-09 05:47+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:47+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -108,6 +108,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
"Помага ви да управлявате своите проекти и задачи, като ги проследяване, "
"генерирайки планиране и др .."
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
@@ -166,7 +168,7 @@ msgstr ""
#. module: base
#: field:ir.actions.act_window,target:0
msgid "Target Window"
msgstr "Прозорец цел"
msgstr "Целеви прозорец"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -176,7 +178,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
msgid "Process"
msgstr ""
msgstr "Обработка"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
@@ -249,7 +251,7 @@ msgstr ""
#. module: base
#: field:ir.sequence,number_increment:0
msgid "Increment Number"
msgstr "Число за увеличаване"
msgstr "Стъпка на нарастване"
#. module: base
#: model:ir.actions.act_window,name:base.action_res_company_tree
@@ -267,7 +269,7 @@ msgstr ""
#: model:ir.module.category,name:base.module_category_sales_management
#: model:ir.module.module,shortdesc:base.module_sale
msgid "Sales Management"
msgstr ""
msgstr "Управление на продажби"
#. module: base
#: view:res.partner:0
@@ -368,12 +370,12 @@ msgstr ""
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
msgstr ""
msgstr "Управление на връзки с клиенти"
#. module: base
#: view:ir.module.module:0
msgid "Extra"
msgstr ""
msgstr "Допълнителни"
#. module: base
#: code:addons/orm.py:2526
openerp/addons/base/i18n/bs.po
+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: 2012-02-09 05:46+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ca.po
+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: 2012-02-09 05:47+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:47+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/cs.po
+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: 2012-02-10 04:45+0000\n"
"X-Generator: Launchpad (build 14771)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:47+0000\n"
"X-Generator: Launchpad (build 14914)\n"
"X-Poedit-Language: Czech\n"
#. module: base
openerp/addons/base/i18n/da.po
+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: 2012-02-09 05:47+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:47+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/de.po
+3 -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: 2012-02-10 04:45+0000\n"
"X-Generator: Launchpad (build 14771)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:48+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -12171,7 +12171,7 @@ msgstr "Report Type"
#: field:workflow.instance,state:0
#: field:workflow.workitem,state:0
msgid "State"
msgstr "Bundesland/Kanton/Region/Provinz"
msgstr "Status"
#. module: base
#: model:ir.module.module,description:base.module_hr_evaluation
openerp/addons/base/i18n/el.po
+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: 2012-02-09 05:48+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:48+0000\n"
"X-Generator: Launchpad (build 14914)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
openerp/addons/base/i18n/en_GB.po
+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: 2012-02-25 05:13+0000\n"
"X-Generator: Launchpad (build 14860)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:53+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es.po
+33 -14
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-02-20 08:50+0000\n"
"PO-Revision-Date: 2012-03-12 08:10+0000\n"
"Last-Translator: German Figueredo <Unknown>\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: 2012-02-21 05:54+0000\n"
"X-Generator: Launchpad (build 14838)\n"
"X-Launchpad-Export-Date: 2012-03-13 05:07+0000\n"
"X-Generator: Launchpad (build 14933)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -105,7 +105,7 @@ msgstr "Flujo"
#. module: base
#: selection:ir.sequence,implementation:0
msgid "No gap"
msgstr ""
msgstr "Sin hueco"
#. module: base
#: selection:base.language.install,lang:0
@@ -115,7 +115,7 @@ msgstr "Húngaro / Magyar"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (PY) / Español (PY)"
msgstr "Español (PY) / Español (PY)"
msgstr "Español (UY) / Español (UY)"
#. module: base
#: model:ir.module.category,description:base.module_category_project_management
@@ -203,7 +203,7 @@ msgstr "Distribución Analítica de Ventas"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
msgid "Process"
msgstr ""
msgstr "Proceso"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
@@ -242,7 +242,7 @@ msgstr "ir.ui.view.custom"
#: code:addons/base/ir/ir_model.py:313
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
msgstr "No está permitido renombrar el campo \"%s\""
#. module: base
#: model:res.country,name:base.sz
@@ -370,6 +370,11 @@ msgid ""
" - tree_but_open\n"
"For defaults, an optional condition"
msgstr ""
"Para accciones, uno de los posibles slots:\n"
" - client_action_multi\n"
" - client_print_multi\n"
" - client_action_relate\n"
" - tree_but_open"
#. module: base
#: sql_constraint:res.lang:0
@@ -419,7 +424,7 @@ msgstr "group_by no válido"
#. module: base
#: field:ir.module.category,child_ids:0
msgid "Child Applications"
msgstr ""
msgstr "Aplicaciones hijas"
#. module: base
#: field:res.partner,credit_limit:0
@@ -439,7 +444,7 @@ msgstr "Fecha de actualización"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
msgstr ""
msgstr "Reglas de acción automáticas"
#. module: base
#: view:ir.attachment:0
@@ -500,7 +505,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_pad_project
msgid "Specifications on PADs"
msgstr ""
msgstr "Especificaciones en PADs"
#. module: base
#: help:ir.filters,user_id:0
@@ -508,6 +513,8 @@ msgid ""
"The user this filter is available to. When left empty the filter is usable "
"by the system only."
msgstr ""
"El filtro está disponible para el usuario. Cuando se deja vacío el filtro se "
"puede utilizar por el único sistema."
#. module: base
#: help:res.partner,website:0
@@ -572,7 +579,7 @@ msgstr ""
#. module: base
#: view:ir.values:0
msgid "Action Binding"
msgstr ""
msgstr "Acción vinculada"
#. module: base
#: model:res.country,name:base.gf
@@ -601,7 +608,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_layout
msgid "Sales Orders Print Layout"
msgstr ""
msgstr "Diseño de la Impresión de Órdenes de Venta"
#. module: base
#: selection:base.language.install,lang:0
@@ -845,6 +852,10 @@ msgid ""
"Launch Manually Once: after hacing been launched manually, it sets "
"automatically to Done."
msgstr ""
"Manual: Se lanza manualmente.\n"
"Automático: Se ejecuta cuando el sistema se reconfigura.\n"
"Manual una vez: después de lanzarlo manualmente, automáticamente se marca "
"como Aceptado"
#. module: base
#: selection:base.language.install,lang:0
@@ -924,6 +935,8 @@ msgid ""
"The module adds google contact in partner address and add google calendar "
"events details in Meeting"
msgstr ""
"El módulo añade contacto de google en la dirección de la empresa y "
"calendario de google en las reuniones."
#. module: base
#: view:res.users:0
@@ -1070,6 +1083,12 @@ msgid ""
"If Value type is selected, the value will be used directly without "
"evaluation."
msgstr ""
"Expresión que contiene una especificación de valor.\n"
"Cuando se selecciona el tipo fórmula, este campo puede ser una expresión "
"Python que puede utilizar los mismos valores para el campo de condición de "
"la acción del servidor.\n"
"Si se selecciona el tipo valor, el valor se puede utilizar directamente sin "
"evaluación."
#. module: base
#: model:res.country,name:base.ad
@@ -1363,7 +1382,7 @@ msgstr ""
#. module: base
#: field:ir.module.category,parent_id:0
msgid "Parent Application"
msgstr ""
msgstr "Aplicación padre"
#. module: base
#: code:addons/base/res/res_users.py:222
@@ -1380,7 +1399,7 @@ msgstr "Para exportar un nuevo idioma, no seleccione un idioma."
#: model:ir.module.module,shortdesc:base.module_document
#: model:ir.module.module,shortdesc:base.module_knowledge
msgid "Document Management System"
msgstr ""
msgstr "Gestión documental"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_claim
openerp/addons/base/i18n/es_AR.po
+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: 2012-02-28 05:47+0000\n"
"X-Generator: Launchpad (build 14874)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:53+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es_CL.po
+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: 2012-02-09 05:54+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:53+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es_CR.po
+3 -3
View File
@@ -9,13 +9,13 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-02-10 17:23+0000\n"
"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
"Language-Team: Spanish (Costa Rica) <es_CR@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-02-11 05:06+0000\n"
"X-Generator: Launchpad (build 14771)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n"
"X-Generator: Launchpad (build 14914)\n"
"Language: \n"
#. module: base
openerp/addons/base/i18n/es_EC.po
+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: 2012-02-09 05:55+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/et.po
+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: 2012-02-09 05:47+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:47+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/eu.po
+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: 2012-02-09 05:46+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fa.po
+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: 2012-02-09 05:51+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
openerp/addons/base/i18n/fa_AF.po
+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: 2012-02-09 05:55+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fi.po
+185 -126
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/fr.po
+473 -85
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/gl.po
+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: 2012-02-09 05:48+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:48+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/gu.po
+174 -99
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-02-19 15:41+0000\n"
"PO-Revision-Date: 2012-03-13 11:33+0000\n"
"Last-Translator: Serpent Consulting Services <Unknown>\n"
"Language-Team: Gujarati <gu@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-02-20 05:39+0000\n"
"X-Generator: Launchpad (build 14833)\n"
"X-Launchpad-Export-Date: 2012-03-14 04:42+0000\n"
"X-Generator: Launchpad (build 14933)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -169,7 +169,7 @@ msgstr "સંદર્ભ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
msgid "Belgium - Structured Communication"
msgstr ""
msgstr "બેલ્જીયમ - સંરચિત સંચાર"
#. module: base
#: field:ir.actions.act_window,target:0
@@ -179,7 +179,7 @@ msgstr "લક્ષ્યાંક વિન્ડો"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
msgid "Sales Analytic Distribution"
msgstr ""
msgstr "વેંચાણ વિશ્લેષણાત્મક વર્ગીકરણ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
@@ -189,7 +189,7 @@ msgstr "પ્રક્રિયા"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
msgstr ""
msgstr "કરાર પર ના બિલ માટે ના દર"
#. module: base
#: code:addons/base/res/res_users.py:558
@@ -222,7 +222,7 @@ msgstr "ir.ui.view.custom"
#: code:addons/base/ir/ir_model.py:313
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
msgstr "સ્પાર્સ ફિલ્ડ \"%s\" નુ નામ બદલવુ માન્ય નથી."
#. module: base
#: model:res.country,name:base.sz
@@ -238,12 +238,12 @@ msgstr "સર્જન કર્યુ."
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_tr
msgid "Turkey - Accounting"
msgstr ""
msgstr "તુર્કી - નામા પધ્ધ્તી"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
msgid "MRP Subproducts"
msgstr ""
msgstr "એમ.આર.પી. પેટા-ઉત્પાદનો"
#. module: base
#: code:addons/base/module/module.py:390
@@ -277,7 +277,7 @@ msgstr "ઇનુક્રિટૂત / ᐃᓄᒃᑎᑐᑦ"
#: model:ir.module.category,name:base.module_category_sales_management
#: model:ir.module.module,shortdesc:base.module_sale
msgid "Sales Management"
msgstr ""
msgstr "વેચાણ વ્યવસ્થા"
#. module: base
#: view:res.partner:0
@@ -321,7 +321,7 @@ msgstr "મહત્તમ પરિમાણ"
#: model:ir.ui.menu,name:base.next_id_73
#: model:ir.ui.menu,name:base.reporting_menu
msgid "Reporting"
msgstr ""
msgstr "અહેવાલીકરણ"
#. module: base
#: view:res.partner:0
@@ -379,12 +379,12 @@ msgstr "વિઝાર્ડ નુ નામ"
#. module: base
#: model:res.groups,name:base.group_partner_manager
msgid "Partner Manager"
msgstr ""
msgstr "ભાગીદાર વ્યવસ્થાપક"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
msgstr ""
msgstr "ગ્રાહક સંબંધ વ્યવસ્થા(સી.આર.એમ.)"
#. module: base
#: view:ir.module.module:0
@@ -699,7 +699,7 @@ msgstr ""
#. module: base
#: help:ir.actions.server,action_id:0
msgid "Select the Action Window, Report, Wizard to be executed."
msgstr ""
msgstr "ચલિત કરવા માટે ની એકશન વિન્ડો, અહેવાલ(રિપોર્ટ) કે વિઝાર્ડ પસંદ કરો."
#. module: base
#: model:res.country,name:base.ai
@@ -709,7 +709,7 @@ msgstr ""
#. module: base
#: view:base.language.export:0
msgid "Export done"
msgstr ""
msgstr "નિકાસ સંપુર્ણ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin_outlook
@@ -720,23 +720,23 @@ msgstr ""
#: view:ir.model:0
#: field:ir.model,name:0
msgid "Model Description"
msgstr ""
msgstr "મોડેલ નુ વર્ણન"
#. module: base
#: help:ir.actions.act_window,src_model:0
msgid ""
"Optional model name of the objects on which this action should be visible"
msgstr ""
msgstr "ઓબ્જેક્ટ્સ ન મોડેલ નુ ગૌણ નામ કે જેના પર આ એકશન દ્રશ્યમાન થવુ જોઇયે."
#. module: base
#: field:workflow.transition,trigger_expr_id:0
msgid "Trigger Expression"
msgstr ""
msgstr "સમીકરણ(એક્સપ્રેશન) ચલિત કરવુ"
#. module: base
#: model:res.country,name:base.jo
msgid "Jordan"
msgstr ""
msgstr "જોર્ડન"
#. module: base
#: help:ir.cron,nextcall:0
@@ -752,7 +752,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.er
msgid "Eritrea"
msgstr ""
msgstr "એરિટ્રીયા"
#. module: base
#: sql_constraint:res.company:0
@@ -769,7 +769,7 @@ msgstr "વર્ણન"
#: model:ir.ui.menu,name:base.menu_base_action_rule
#: model:ir.ui.menu,name:base.menu_base_action_rule_admin
msgid "Automated Actions"
msgstr ""
msgstr "સ્વયંચાલિતકાર્યો(એકશન્સ)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ro
@@ -779,7 +779,7 @@ msgstr ""
#. module: base
#: view:partner.wizard.ean.check:0
msgid "Want to check Ean ? "
msgstr ""
msgstr "ઈ.એ.એન(EAN) સંકેત ચેક કરાવવુ છે? "
#. module: base
#: help:ir.actions.server,mobile:0
@@ -801,6 +801,9 @@ msgid ""
"Launchpad.net, our open source project management facility. We use their "
"online interface to synchronize all translations efforts."
msgstr ""
"ઓપન ઈ આર પી ભાષાંતરો(કેન્દ્ર્ભુત,મોડ્યુલો,ક્લાઈન્ટ્સ) Launchpad.net વડે "
"સંચાલિત છે, કે જે અમારી ઓપન સોર્સ પ્રોજેક્ટ સંચાલન સુવિધા છે. બધાજ ભાષાંતરો "
"ના પ્રયત્નો ને સમકાલીન કરવા માટે અમે તેનુ ઓનલાઈન ઇન્ટરફેસ વાપરીયે છે."
#. module: base
#: help:ir.actions.todo,type:0
@@ -814,22 +817,22 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Swedish / svenska"
msgstr ""
msgstr "સ્વિડીશ / svenska"
#. module: base
#: model:res.country,name:base.rs
msgid "Serbia"
msgstr ""
msgstr "સર્બિયા"
#. module: base
#: selection:ir.translation,type:0
msgid "Wizard View"
msgstr ""
msgstr "વિઝાર્ડ નુ દ્રશ્ય"
#. module: base
#: model:res.country,name:base.kh
msgid "Cambodia, Kingdom of"
msgstr ""
msgstr "કંબોડિયા, નુ રાજ્ય"
#. module: base
#: field:base.language.import,overwrite:0
@@ -840,7 +843,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_base_language_import
msgid "Language Import"
msgstr ""
msgstr "ભાષા આયાત"
#. module: base
#: help:ir.cron,interval_number:0
@@ -850,17 +853,17 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Albanian / Shqip"
msgstr ""
msgstr "અલ્બેનિયન / Shqip"
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
msgid "Opportunities"
msgstr ""
msgstr "તકો"
#. module: base
#: model:ir.model,name:base.model_base_language_export
msgid "base.language.export"
msgstr ""
msgstr "base.language.export"
#. module: base
#: help:ir.actions.server,write_id:0
@@ -873,6 +876,8 @@ msgstr ""
#: help:ir.actions.report.xml,report_type:0
msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
msgstr ""
"અહેવાલ પ્રકાર, ઉદાહરણ તરીકે pdf, html, raw, sxw, odt, html2html, mako2html, "
"..."
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_webdav
@@ -908,27 +913,27 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_4
msgid "Basic Partner"
msgstr ""
msgstr "સામાન્ય ભાગીદાર"
#. module: base
#: report:ir.module.reference.graph:0
msgid ","
msgstr ""
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
msgid "Spain"
msgstr ""
msgstr "સ્પેન"
#. module: base
#: view:base.module.update:0
@@ -940,28 +945,30 @@ msgstr ""
msgid ""
"Optional domain filtering of the destination data, as a Python expression"
msgstr ""
"ગૌણ શરતી ક્ષેત્ર(ડોમેઈન) કે જે લક્ષ્યાંક માહિતી(ડેટા) ને ફિલ્ટર કરે છે, "
"પાયથન સમીકરણ તરીકે."
#. module: base
#: 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
#: selection:base.language.install,lang:0
msgid "Spanish (UY) / Español (UY)"
msgstr ""
msgstr "સ્પેનિશ (UY) / Español (UY)"
#. module: base
#: field:res.partner,mobile:0
#: field:res.partner.address,mobile:0
msgid "Mobile"
msgstr ""
msgstr "મોબાઇલ"
#. module: base
#: model:res.country,name:base.om
msgid "Oman"
msgstr ""
msgstr "ઓમાન"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp
@@ -976,7 +983,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.nu
msgid "Niue"
msgstr ""
msgstr "ન્યુએઇ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_membership
@@ -986,24 +993,24 @@ msgstr ""
#. module: base
#: selection:ir.module.module,license:0
msgid "Other OSI Approved Licence"
msgstr ""
msgstr "બીજુ ઓ.એસ.આઇ(OSI) માન્ય લાઇસન્સ"
#. module: base
#: model:ir.actions.act_window,name:base.act_menu_create
#: view:wizard.ir.model.menu.create:0
msgid "Create Menu"
msgstr ""
msgstr "મેનુ સર્જન"
#. module: base
#: model:res.country,name:base.in
msgid "India"
msgstr ""
msgstr "ભારત"
#. module: base
#: model:ir.actions.act_window,name:base.res_request_link-act
#: model:ir.ui.menu,name:base.menu_res_request_link_act
msgid "Request Reference Types"
msgstr ""
msgstr "વિનંતી સંદર્ભ પ્રકારો"
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_base_account
@@ -1023,22 +1030,22 @@ msgstr ""
#. module: base
#: model:res.country,name:base.ad
msgid "Andorra, Principality of"
msgstr ""
msgstr "એન્ડોર્રા, ની હકૂમત"
#. module: base
#: field:res.partner.category,child_ids:0
msgid "Child Categories"
msgstr ""
msgstr "વંશજ વર્ગ(શ્રેણી)"
#. module: base
#: model:ir.model,name:base.model_ir_config_parameter
msgid "ir.config_parameter"
msgstr ""
msgstr "ir.config_parameter"
#. module: base
#: selection:base.language.export,format:0
msgid "TGZ Archive"
msgstr ""
msgstr "TGZ Archive"
#. module: base
#: view:res.groups:0
@@ -1049,7 +1056,7 @@ msgstr ""
#. module: base
#: view:res.lang:0
msgid "%B - Full month name."
msgstr ""
msgstr "%B - મહિના નુ પુરૂ નામ"
#. module: base
#: field:ir.actions.todo,type:0
@@ -1066,7 +1073,7 @@ msgstr ""
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Type"
msgstr ""
msgstr "પ્રકાર"
#. module: base
#: field:ir.mail_server,smtp_user:0
@@ -1080,17 +1087,19 @@ msgid ""
"Language with code \"%s\" is not defined in your system !\n"
"Define it through the Administration menu."
msgstr ""
"\"%s\" સંકેત વાળી ભાષા તમારા સિસ્ટમ મા સ્થાપિત નથી.!\n"
"સંચાલક મેનુ વળે તેને સ્થાપિત કરો."
#. module: base
#: model:res.country,name:base.gu
msgid "Guam (USA)"
msgstr ""
msgstr "ગુઆમ (યુએસએ)"
#. module: base
#: code:addons/base/res/res_users.py:558
#, python-format
msgid "Setting empty passwords is not allowed for security reasons!"
msgstr ""
msgstr "સુરક્ષા કારણો થી ખાલી પાસવર્ડ સેટ કરવા માન્ય નથી!"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:192
@@ -1102,40 +1111,40 @@ msgstr ""
#: selection:ir.actions.server,state:0
#: selection:workflow.activity,kind:0
msgid "Dummy"
msgstr ""
msgstr "નકલી"
#. module: base
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "દ્રશ્ય બંધારણ માટે અમાન્ય એક્સ.એમ.એલ!"
#. module: base
#: model:res.country,name:base.ky
msgid "Cayman Islands"
msgstr ""
msgstr "કેમેન ટાપુઓ"
#. module: base
#: model:res.country,name:base.kr
msgid "South Korea"
msgstr ""
msgstr "દક્ષિણ કોરિયા"
#. module: base
#: model:ir.actions.act_window,name:base.action_workflow_transition_form
#: model:ir.ui.menu,name:base.menu_workflow_transition
#: view:workflow.activity:0
msgid "Transitions"
msgstr ""
msgstr "ભાષાંતરો"
#. module: base
#: code:addons/orm.py:4615
#, python-format
msgid "Record #%d of %s not found, cannot copy!"
msgstr ""
msgstr "રેકોર્ડ #%d કે જે %s નો છે તે મળેલ નથી, પ્રતિકૃતિ અશક્ય!"
#. module: base
#: field:ir.module.module,contributors:0
msgid "Contributors"
msgstr ""
msgstr "યોગદાન આપનારાઓ"
#. module: base
#: model:ir.module.module,description:base.module_project_planning
@@ -1161,7 +1170,7 @@ msgstr ""
#. module: base
#: selection:ir.property,type:0
msgid "Char"
msgstr ""
msgstr "અક્ષરીય"
#. module: base
#: selection:base.language.install,lang:0
@@ -1171,32 +1180,32 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (AR) / Español (AR)"
msgstr ""
msgstr "સ્પેનિશ (AR) / Español (AR)"
#. module: base
#: model:res.country,name:base.ug
msgid "Uganda"
msgstr ""
msgstr "યુગાન્ડા"
#. module: base
#: field:ir.model.access,perm_unlink:0
msgid "Delete Access"
msgstr ""
msgstr "એક્સેસ રદ"
#. module: base
#: model:res.country,name:base.ne
msgid "Niger"
msgstr ""
msgstr "નાઇઝર"
#. module: base
#: selection:base.language.install,lang:0
msgid "Chinese (HK)"
msgstr ""
msgstr "ચાઇનીસ (HK)"
#. module: base
#: model:res.country,name:base.ba
msgid "Bosnia-Herzegovina"
msgstr ""
msgstr "બોસ્નિયા-હેર્ઝેગોવિના"
#. module: base
#: view:base.language.export:0
@@ -1248,39 +1257,39 @@ msgstr ""
#. module: base
#: model:res.country,name:base.gs
msgid "S. Georgia & S. Sandwich Isls."
msgstr ""
msgstr "દ.જોર્જિયા અને દ.સેન્ડવિચ ટાપુઓ"
#. module: base
#: field:ir.actions.url,url:0
msgid "Action URL"
msgstr ""
msgstr "એકશન યુ.આર.એલ (URL)"
#. module: base
#: field:base.module.import,module_name:0
msgid "Module Name"
msgstr ""
msgstr "મોડ્યુલ નુ નામ"
#. module: base
#: model:res.country,name:base.mh
msgid "Marshall Islands"
msgstr ""
msgstr "માર્શલ ટાપુઓ"
#. module: base
#: code:addons/base/ir/ir_model.py:368
#, python-format
msgid "Changing the model of a field is forbidden!"
msgstr ""
msgstr "ફિલ્ડ નુ મોડેલ બદલવુ પ્રતિબંધિત છે!"
#. module: base
#: model:res.country,name:base.ht
msgid "Haiti"
msgstr ""
msgstr "હેઇટી"
#. module: base
#: view:ir.ui.view:0
#: selection:ir.ui.view,type:0
msgid "Search"
msgstr ""
msgstr "શોધ"
#. module: base
#: code:addons/osv.py:132
@@ -1291,6 +1300,10 @@ msgid ""
"reference it\n"
"- creation/update: a mandatory field is not correctly set"
msgstr ""
"પ્રક્રિયા સંપુર્ણ થઈ શકે તેમ નથી, કદાચ નીચેના કારણોસર:\n"
"- વિનાશ : તમે જે રેકોર્ડ નો નાશ(ડિલીટ) કરવા માંગો છો તેના પર બીજા રેકોર્ડ "
"આધારિત છે.\n"
"- સર્જન/સુધાર : ફરજિયાત ફિલ્ડ ને યોગ્ય રીતે સેટ કરી નથી."
#. module: base
#: field:ir.module.category,parent_id:0
@@ -1301,12 +1314,12 @@ msgstr ""
#: code:addons/base/res/res_users.py:222
#, python-format
msgid "Operation Canceled"
msgstr ""
msgstr "પ્રક્રિયા રદ્"
#. module: base
#: help:base.language.export,lang:0
msgid "To export a new language, do not select a language."
msgstr ""
msgstr "નવી ભાષા ને નિકાસ કરવા માટે ભાષા પસંદ ન કરો."
#. module: base
#: model:ir.module.module,shortdesc:base.module_document
@@ -1322,17 +1335,17 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
msgid "Purchases"
msgstr ""
msgstr "ખરીદીઓ"
#. module: base
#: model:res.country,name:base.md
msgid "Moldavia"
msgstr ""
msgstr "મોલ્ડવિયા"
#. module: base
#: view:ir.module.module:0
msgid "Features"
msgstr ""
msgstr "લાક્ષણિકતાઓ"
#. module: base
#: model:ir.actions.act_window,help:base.bank_account_update
@@ -1347,7 +1360,7 @@ msgstr ""
#: view:ir.module.module:0
#: report:ir.module.reference.graph:0
msgid "Version"
msgstr ""
msgstr "આવૃત્તિ"
#. module: base
#: model:ir.module.module,description:base.module_sale_order_dates
@@ -1370,13 +1383,13 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_ir_exports
msgid "ir.exports"
msgstr ""
msgstr "ir.exports"
#. module: base
#: code:addons/base/module/wizard/base_update_translations.py:38
#, python-format
msgid "No language with code \"%s\" exists"
msgstr ""
msgstr "\"%s\" સંકેત વાળી કોઇ પણ ભાષા અસ્તિત્વ મા નથી."
#. module: base
#: model:ir.module.module,description:base.module_document
@@ -1406,7 +1419,7 @@ msgstr ""
#. module: base
#: view:res.lang:0
msgid "%Y - Year with century."
msgstr ""
msgstr "%Y - વર્ષ, શતક સાથે."
#. module: base
#: model:ir.module.module,description:base.module_web_gantt
@@ -1419,7 +1432,7 @@ msgstr ""
#. module: base
#: report:ir.module.reference.graph:0
msgid "-"
msgstr ""
msgstr "-"
#. module: base
#: view:publisher_warranty.contract.wizard:0
@@ -1449,7 +1462,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_ir_exports_line
msgid "ir.exports.line"
msgstr ""
msgstr "ir.exports.line"
#. module: base
#: model:ir.module.module,description:base.module_html_view
@@ -1478,18 +1491,20 @@ msgid ""
"If you check this box, your customized translations will be overwritten and "
"replaced by the official ones."
msgstr ""
"જો તમે આ બોક્સ ચેક કરશો તો તમારા પોતાના ભાષાંતરો મુખ્ય ભાષાંતરો વડે બદલાયી "
"જશે."
#. module: base
#: field:ir.actions.report.xml,report_rml:0
msgid "Main report file path"
msgstr ""
msgstr "મુખ્ય અહેવાલ ફાઇલ નો પાથ"
#. module: base
#: model:ir.actions.act_window,name:base.ir_action_report_xml
#: field:ir.module.module,reports_by_module:0
#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
msgid "Reports"
msgstr ""
msgstr "અહેવાલો"
#. module: base
#: help:ir.actions.act_window.view,multi:0
@@ -1498,11 +1513,13 @@ msgid ""
"If set to true, the action will not be displayed on the right toolbar of a "
"form view."
msgstr ""
"જો ખરુ કરેલ હશે તો એકશન ફોર્મ દ્રશ્ય(વ્યુ) ના જમણી બાજુ ના ટૂલબાર મ દેખાશે "
"નહી."
#. module: base
#: field:workflow,on_create:0
msgid "On Create"
msgstr ""
msgstr "સર્જન પર"
#. module: base
#: code:addons/base/ir/ir_model.py:681
@@ -1511,12 +1528,15 @@ msgid ""
"'%s' contains too many dots. XML ids should not contain dots ! These are "
"used to refer to other modules data, as in module.reference_id"
msgstr ""
"'%s' ઘણા બધા પૂર્ણવિરામો નો સમાવેશ કરે છે. એક્સ.એમ.એલ ઓળખ (આઇ.ડી.) મા "
"પૂર્ણવિરામો નો સમાવેશ થવો ન જોઇયે! તેઓ બીજા મોડ્યુલો ના ડેટા ને સંદર્ભે છે, "
"જેમકે, module.reference_id"
#. module: base
#: field:partner.sms.send,user:0
#: field:res.users,login:0
msgid "Login"
msgstr ""
msgstr "લોગ ઇન"
#. module: base
#: view:base.update.translations:0
@@ -1531,6 +1551,8 @@ msgid ""
"Access all the fields related to the current object using expressions, i.e. "
"object.partner_id.name "
msgstr ""
"વર્તમાન ઓબ્જેકટ સાથે સંક્ળાયેલ ફિલ્ડો નો ઉપયોગ સમિકરણ ની મદદ થી કરી શકાય છે. "
"જેમકે, object.partner_id.name "
#. module: base
#: model:ir.module.module,description:base.module_event
@@ -1558,7 +1580,7 @@ msgstr ""
#. module: base
#: selection:ir.property,type:0
msgid "Float"
msgstr ""
msgstr "ફ્લોટ"
#. module: base
#: model:ir.module.category,name:base.module_category_warehouse_management
@@ -2467,7 +2489,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.pg
msgid "Papua New Guinea"
msgstr ""
msgstr "પાપુઆ ન્યુ ગુએના"
#. module: base
#: model:res.country,name:base.zw
@@ -2482,7 +2504,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_translation_export
msgid "Import / Export"
msgstr ""
msgstr "આયાત / નિકાસ"
#. module: base
#: model:ir.actions.todo.category,name:base.category_tools_customization_config
@@ -2572,6 +2594,8 @@ msgstr ""
#, python-format
msgid "Error during communication with the publisher warranty server."
msgstr ""
"પ્રકાશક ખાતરી સહાયક (પબ્લિશર વોરન્ટી સર્વર) સાથે સંદેશાવ્યવહાર કરતી વખતે "
"આવતી ભૂલ."
#. module: base
#: model:res.groups,name:base.group_sale_manager
@@ -4021,7 +4045,7 @@ msgstr ""
#. module: base
#: view:res.request:0
msgid "Request Date"
msgstr ""
msgstr "વિનંતી તારિખ"
#. module: base
#: code:addons/base/module/wizard/base_export_language.py:52
@@ -4709,7 +4733,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_ir_actions_actions
msgid "ir.actions.actions"
msgstr ""
msgstr "ir.actions.actions"
#. module: base
#: selection:ir.model.fields,select_level:0
@@ -6228,7 +6252,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base.action_payterm_form
#: model:ir.model,name:base.model_res_payterm
msgid "Payment term"
msgstr ""
msgstr "ચુકવણી મુદદ્ત"
#. module: base
#: view:ir.actions.report.xml:0
@@ -6363,7 +6387,7 @@ msgstr ""
#. module: base
#: selection:ir.cron,interval_type:0
msgid "Work Days"
msgstr ""
msgstr "કાર્ય દિવસો"
#. module: base
#: model:ir.module.module,shortdesc:base.module_multi_company
@@ -9959,7 +9983,7 @@ msgstr ""
#: field:ir.model.access,perm_read:0
#: view:ir.rule:0
msgid "Read Access"
msgstr ""
msgstr "વાંચન પરવાનગી"
#. module: base
#: help:ir.actions.server,loop_action:0
@@ -10485,7 +10509,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_res_country_state
msgid "Country state"
msgstr ""
msgstr "દેશ નુ રાજ્ય"
#. module: base
#: model:ir.ui.menu,name:base.next_id_5
@@ -11023,7 +11047,7 @@ msgstr ""
#: view:ir.sequence:0
#: model:ir.ui.menu,name:base.menu_ir_sequence_form
msgid "Sequences"
msgstr ""
msgstr "અનુક્રમો"
#. module: base
#: model:res.partner.title,shortcut:base.res_partner_title_miss
@@ -13038,7 +13062,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
msgid "Contracts"
msgstr ""
msgstr "કરારો"
#. module: base
#: field:base.language.export,state:0
@@ -15227,3 +15251,54 @@ msgstr ""
#~ msgid "Schedule Upgrade"
#~ msgstr "નિર્ધારિત નવીનીકરણ"
#~ msgid "Certified"
#~ msgstr "પ્રમાણિત"
#~ msgid "New User"
#~ msgstr "નવો વપરાશકર્તા"
#~ msgid "Partner Form"
#~ msgstr "ભાગીદાર નુ ફોર્મ"
#~ msgid "Event Type"
#~ msgstr "કાર્યક્રમ નો પ્રકાર"
#~ msgid "res.config.users"
#~ msgstr "res.config.users"
#~ msgid ""
#~ "Groups are used to define access rights on objects and the visibility of "
#~ "screens and menus"
#~ msgstr ""
#~ "સમુદાય નો ઉપયોગ ઓબ્જેકટ્સ ઉપર ઉપયોગ ના અધિકારો આપવા અને મેનુ અને "
#~ "દ્રશ્યો(વ્યુ) ને દ્રશ્યમાન કરવા માટે થાય છે."
#~ msgid ""
#~ "Sets the language for the user's user interface, when UI translations are "
#~ "available"
#~ msgstr ""
#~ "વપરાશ્કર્તા ના યુઝર ઇન્ટરફેસ ની ભાષા ગોઠવે છે કે જ્યારે તે યુઝર ઇન્ટરફેસ ના "
#~ "ભાષાંતરો ઉપલબ્ધ હોય."
#, python-format
#~ msgid "The unlink method is not implemented on this object !"
#~ msgstr "આ ઓબ્જેક્ટ ઉપર અનલિંક મેથડ પ્રસ્થાપિત કરેલ નથી!"
#~ msgid "client_action_multi, client_action_relate"
#~ msgstr "client_action_multi, client_action_relate"
#~ msgid "Human Resources Dashboard"
#~ msgstr "માનવ સંશાધન ડેશબોર્ડ"
#~ msgid ""
#~ "2. Group-specific rules are combined together with a logical AND operator"
#~ msgstr ""
#~ "૨. સમુદાય માટે ના નિયમો તાર્કિક કારક એન્ડ (AND) ની મદદ થી એકસાથે જોડાય છે."
#~ msgid "Dashboard"
#~ msgstr "ડેશબોર્ડ"
#, python-format
#~ msgid "The search method is not implemented on this object !"
#~ msgstr "સર્ચ મેથડ આ ઓબ્જેક્ટ પર પ્રસ્થાપિત કરેલ નથી!"
openerp/addons/base/i18n/he.po
+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: 2012-02-09 05:48+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:48+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/hr.po
+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: 2012-02-09 05:52+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:51+0000\n"
"X-Generator: Launchpad (build 14914)\n"
"Language: hr\n"
#. module: base
openerp/addons/base/i18n/hu.po
+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: 2012-02-09 05:49+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/hy.po
+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: 2012-02-09 05:46+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/id.po
+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: 2012-02-09 05:49+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/is.po
+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: 2012-02-09 05:49+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/it.po
+79 -38
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: 2012-02-17 04:57+0000\n"
"X-Generator: Launchpad (build 14814)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -71,6 +71,20 @@ msgid ""
" * Graph of My Remaining Hours by Project\n"
" "
msgstr ""
"\n"
"Il modulo Gestione Progetti tiene traccia dei progetti multi-livello, "
"attività, esecuzioni sulle attività, etc etc.\n"
"============================================================================="
"=========\n"
"E' in grado di creare pianificazioni, ordinare attività e altro.\n"
"\n"
"La Dashboard della gestione progetti include:\n"
"--------------------------------------------\n"
" * Lista delle mie attività aperte\n"
" * Lista delle mie attività delegate\n"
" * Grafico dei Miei Progetti: Ore Pianificate vs Ore Totali\n"
" * Grafico delle Mie Ore Rimanenti per Progetto\n"
" "
#. module: base
#: field:base.language.import,code:0
@@ -90,7 +104,7 @@ msgstr "Workflow"
#. module: base
#: selection:ir.sequence,implementation:0
msgid "No gap"
msgstr ""
msgstr "Nessun gap"
#. module: base
#: selection:base.language.install,lang:0
@@ -108,6 +122,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
"Ti aiuta a gestire i tuoi progetti e le tue attività tenendone traccia, "
"generando pianificazioni, etc..."
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
@@ -119,6 +135,8 @@ msgstr "Mostra suggerimenti menù"
msgid ""
"Model name on which the method to be called is located, e.g. 'res.partner'."
msgstr ""
"Nome del modulo sul quale è localizzato il metodo che verrà richiamato, es: "
"'res.partner'."
#. module: base
#: view:ir.module.module:0
@@ -144,6 +162,12 @@ msgid ""
"\n"
"This module allows you to create retro planning for managing your events.\n"
msgstr ""
"\n"
"Organizzazione e gestione di eventi.\n"
"======================================\n"
"\n"
"Questo modulo ti aiuta a gestire i tuoi eventi tramite la retro "
"pianificazione.\n"
#. module: base
#: help:ir.model.fields,domain:0
@@ -184,7 +208,7 @@ msgstr "Processo"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
msgstr ""
msgstr "Tariffe sui Contratti"
#. module: base
#: code:addons/base/res/res_users.py:558
@@ -218,7 +242,7 @@ msgstr "ir.ui.view.custom"
#: code:addons/base/ir/ir_model.py:313
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
msgstr "Non è possibile rinominare il campo \"%s\""
#. module: base
#: model:res.country,name:base.sz
@@ -234,7 +258,7 @@ msgstr "creato."
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_tr
msgid "Turkey - Accounting"
msgstr ""
msgstr "Turchia - Contabilità"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
@@ -345,6 +369,12 @@ msgid ""
" - tree_but_open\n"
"For defaults, an optional condition"
msgstr ""
"Come azioni, una tra le seguenti possibilità: \n"
" - client_action_multi\n"
" - client_print_multi\n"
" - client_action_relate\n"
" - tree_but_open\n"
"Come defaults, una condizione opzionale"
#. module: base
#: sql_constraint:res.lang:0
@@ -359,6 +389,11 @@ msgid ""
" complex data from other software\n"
" "
msgstr ""
"\n"
" Questo modulo mette a disposizione una classe import_framework che "
"facilita l'importazione \n"
" di dati complessi da altri software\n"
" "
#. module: base
#: field:ir.actions.wizard,wiz_name:0
@@ -373,7 +408,7 @@ msgstr "Partner Manager"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
msgstr ""
msgstr "Customer Relationship Management"
#. module: base
#: view:ir.module.module:0
@@ -389,7 +424,7 @@ msgstr "group_by non valido"
#. module: base
#: field:ir.module.category,child_ids:0
msgid "Child Applications"
msgstr ""
msgstr "Applicazioni Figlie"
#. module: base
#: field:res.partner,credit_limit:0
@@ -399,7 +434,7 @@ msgstr "Limite Credito"
#. module: base
#: model:ir.module.module,description:base.module_web_graph
msgid "Openerp web graph view"
msgstr ""
msgstr "Openerp vista grafico web"
#. module: base
#: field:ir.model.data,date_update:0
@@ -409,7 +444,7 @@ msgstr "Data Aggiornamento"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
msgstr ""
msgstr "Regole Azione Automatiche"
#. module: base
#: view:ir.attachment:0
@@ -424,7 +459,7 @@ msgstr "Oggetto Origine"
#. module: base
#: model:res.partner.bank.type,format_layout:base.bank_normal
msgid "%(bank_name)s: %(acc_number)s"
msgstr ""
msgstr "%(bank_name)s: %(acc_number)s"
#. module: base
#: view:ir.actions.todo:0
@@ -454,6 +489,8 @@ msgid ""
"Invalid date/time format directive specified. Please refer to the list of "
"allowed directives, displayed when you edit a language."
msgstr ""
"Formato data/tempo non valido. Fare riferimento alla lista delle direttive "
"ammesse, mostrate quando viene modificata la lungua."
#. module: base
#: code:addons/orm.py:3895
@@ -468,7 +505,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_pad_project
msgid "Specifications on PADs"
msgstr ""
msgstr "Specifiche su PAD"
#. module: base
#: help:ir.filters,user_id:0
@@ -476,11 +513,13 @@ msgid ""
"The user this filter is available to. When left empty the filter is usable "
"by the system only."
msgstr ""
"L'utente per il quale questo filtro è disponibile. Se lasciato vuoto, il "
"filtro è usabile solo dal sistema."
#. module: base
#: help:res.partner,website:0
msgid "Website of Partner."
msgstr ""
msgstr "Sito web del Partner."
#. module: base
#: help:ir.actions.act_window,views:0
@@ -509,7 +548,7 @@ msgstr "Formato data"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_report_designer
msgid "OpenOffice Report Designer"
msgstr ""
msgstr "OpenOffice Report Designer"
#. module: base
#: field:res.bank,email:0
@@ -540,7 +579,7 @@ msgstr ""
#. module: base
#: view:ir.values:0
msgid "Action Binding"
msgstr ""
msgstr "Binding Azione"
#. module: base
#: model:res.country,name:base.gf
@@ -570,7 +609,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_layout
msgid "Sales Orders Print Layout"
msgstr ""
msgstr "Layout Stampa Ordine di Vendita"
#. module: base
#: selection:base.language.install,lang:0
@@ -580,7 +619,7 @@ msgstr "Spanish (VE) / Español (VE)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
msgid "Invoice on Timesheets"
msgstr ""
msgstr "Fatturazione su Timesheet"
#. module: base
#: view:base.module.upgrade:0
@@ -686,7 +725,7 @@ msgstr "I Campi personalizzati devono avere un nome che inizia con 'x_' !"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_mx
msgid "Mexico - Accounting"
msgstr ""
msgstr "Messico - Contabilità"
#. module: base
#: help:ir.actions.server,action_id:0
@@ -706,7 +745,7 @@ msgstr "Esportazione Completata"
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin_outlook
msgid "Outlook Plug-In"
msgstr ""
msgstr "Plug-In Outlook"
#. module: base
#: view:ir.model:0
@@ -735,7 +774,7 @@ msgstr "Giordania"
#. module: base
#: help:ir.cron,nextcall:0
msgid "Next planned execution date for this job."
msgstr ""
msgstr "Prossima data di esecuzione pianificata per questo job."
#. module: base
#: code:addons/base/ir/ir_model.py:139
@@ -751,7 +790,7 @@ msgstr "Eritrea"
#. module: base
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
msgstr "Il nome azienda deve essere unico!"
#. module: base
#: view:res.config:0
@@ -768,7 +807,7 @@ msgstr "Azioni automatiche"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ro
msgid "Romania - Accounting"
msgstr ""
msgstr "Romania - Contabilità"
#. module: base
#: view:partner.wizard.ean.check:0
@@ -789,7 +828,7 @@ msgstr ""
#. module: base
#: view:ir.mail_server:0
msgid "Security and Authentication"
msgstr ""
msgstr "Sicurezza ed Autenticazione"
#. module: base
#: view:base.language.export:0
@@ -880,7 +919,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_webdav
msgid "Shared Repositories (WebDAV)"
msgstr ""
msgstr "Archivi Condivisi (WebDAV)"
#. module: base
#: model:ir.module.module,description:base.module_import_google
@@ -888,11 +927,13 @@ msgid ""
"The module adds google contact in partner address and add google calendar "
"events details in Meeting"
msgstr ""
"Questo modulo aggiunge i contatti Google tra gli indirizzi partner e "
"aggiunge gli appuntamenti di Google Calendar negli Appuntamenti."
#. module: base
#: view:res.users:0
msgid "Email Preferences"
msgstr ""
msgstr "Preferenze Email"
#. module: base
#: model:ir.module.module,description:base.module_audittrail
@@ -971,7 +1012,7 @@ msgstr "Oman"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp
msgid "MRP"
msgstr ""
msgstr "MRP"
#. module: base
#: report:ir.module.reference.graph:0
@@ -986,7 +1027,7 @@ msgstr "Niue"
#. module: base
#: model:ir.module.module,shortdesc:base.module_membership
msgid "Membership Management"
msgstr ""
msgstr "Gestione Associati"
#. module: base
#: selection:ir.module.module,license:0
@@ -1013,7 +1054,7 @@ msgstr "Tipo richiesta di riferimento"
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_base_account
msgid "Google Users"
msgstr ""
msgstr "Utenti Google"
#. module: base
#: help:ir.server.object.lines,value:0
@@ -1076,7 +1117,7 @@ msgstr "Tipo"
#. module: base
#: field:ir.mail_server,smtp_user:0
msgid "Username"
msgstr ""
msgstr "Utente"
#. module: base
#: code:addons/orm.py:398
@@ -1103,7 +1144,7 @@ msgstr "Non è permesso impostare password vuote per motivi di sicurezza!"
#: code:addons/base/ir/ir_mail_server.py:192
#, python-format
msgid "Connection test failed!"
msgstr ""
msgstr "Test connessione fallito!"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1225,12 +1266,12 @@ msgstr "Spanish (GT) / Español (GT)"
#. module: base
#: field:ir.mail_server,smtp_port:0
msgid "SMTP Port"
msgstr ""
msgstr "Porta SMTP"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
msgid "SugarCRM Import"
msgstr ""
msgstr "Importazione SugarCRM"
#. module: base
#: view:res.lang:0
@@ -1247,12 +1288,12 @@ msgstr ""
#: code:addons/base/module/wizard/base_language_install.py:55
#, python-format
msgid "Language Pack"
msgstr ""
msgstr "Language Pack"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_tests
msgid "Tests"
msgstr ""
msgstr "Test"
#. module: base
#: field:ir.ui.view_sc,res_id:0
@@ -1331,12 +1372,12 @@ msgstr "Per esportare una nuova lingua, non selezionare una lingua"
#: model:ir.module.module,shortdesc:base.module_document
#: model:ir.module.module,shortdesc:base.module_knowledge
msgid "Document Management System"
msgstr ""
msgstr "Document Management System"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_claim
msgid "Claims Management"
msgstr ""
msgstr "Gestione Reclami"
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
@@ -2047,7 +2088,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_administration
msgid "Settings"
msgstr ""
msgstr "Configurazione"
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -9321,7 +9362,7 @@ msgstr "completato"
#. module: base
#: view:ir.actions.act_window:0
msgid "General Settings"
msgstr "Impostazioni generali"
msgstr "Impostazioni Generali"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_uy
openerp/addons/base/i18n/ja.po
+241 -91
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-02-28 16:02+0000\n"
"PO-Revision-Date: 2012-03-23 02:33+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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-02-29 04:41+0000\n"
"X-Generator: Launchpad (build 14874)\n"
"X-Launchpad-Export-Date: 2012-03-23 04:41+0000\n"
"X-Generator: Launchpad (build 14996)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -112,7 +112,7 @@ msgstr "ハンガリー語 / マジャール語"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (PY) / Español (PY)"
msgstr "スペイン語（パラグアイ）"
msgstr "スペイン語（パラグアイ）/ Español (PY)"
#. module: base
#: model:ir.module.category,description:base.module_category_project_management
@@ -178,7 +178,7 @@ msgstr "参照"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
msgid "Belgium - Structured Communication"
msgstr "ベルギー－構造化されたコミュニケーション"
msgstr "ベルギー－構造化された通信"
#. module: base
#: field:ir.actions.act_window,target:0
@@ -591,7 +591,7 @@ msgstr "受注のプリントレイアウト"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (VE) / Español (VE)"
msgstr "スペイン語（ベネズエラ）"
msgstr "スペイン語（ベネズエラ）/ Español (VE)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
@@ -970,7 +970,7 @@ msgstr "モジュール更新"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (UY) / Español (UY)"
msgstr "スペイン語（ウルグアイ）"
msgstr "スペイン語（ウルグアイ）/ Español (UY)"
#. module: base
#: field:res.partner,mobile:0
@@ -1208,7 +1208,7 @@ msgstr "スロバキア語"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (AR) / Español (AR)"
msgstr "スペイン語（アルゼンチン）"
msgstr "スペイン語（アルゼンチン）/ Español (AR)"
#. module: base
#: model:res.country,name:base.ug
@@ -1248,7 +1248,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (GT) / Español (GT)"
msgstr "スペイン語（グアテマラ）"
msgstr "スペイン語（グアテマラ）/ Español (GT)"
#. module: base
#: field:ir.mail_server,smtp_port:0
@@ -2247,7 +2247,7 @@ msgstr "スペイン語"
#. module: base
#: selection:base.language.install,lang:0
msgid "Korean (KP) / 한국어 (KP)"
msgstr "北朝鮮"
msgstr "韓国語（北朝鮮） / 한국어 (KP)"
#. module: base
#: view:base.module.update:0
@@ -2451,7 +2451,7 @@ msgstr "グループ"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (CL) / Español (CL)"
msgstr "スペイン語（チリ）"
msgstr "スペイン語（チリ） / Español (CL)"
#. module: base
#: model:res.country,name:base.bz
@@ -2608,7 +2608,7 @@ msgstr "請求書"
#. module: base
#: selection:base.language.install,lang:0
msgid "Portugese (BR) / Português (BR)"
msgstr "ポルトガル語（ブラジル）"
msgstr "ポルトガル語（ブラジル）/ Português (BR)"
#. module: base
#: model:res.country,name:base.bb
@@ -2761,7 +2761,7 @@ msgstr "Eメールアドレス"
#. module: base
#: selection:base.language.install,lang:0
msgid "French (BE) / Français (BE)"
msgstr "フランス語（ベルギー）"
msgstr "フランス語（ベルギー）/ Français (BE)"
#. module: base
#: view:ir.actions.server:0
@@ -3018,7 +3018,7 @@ msgstr "ノーフォーク島"
#. module: base
#: selection:base.language.install,lang:0
msgid "Korean (KR) / 한국어 (KR)"
msgstr "韓国"
msgstr "韓国語（韓国）/ 한국어 (KR)"
#. module: base
#: help:ir.model.fields,model:0
@@ -3483,7 +3483,7 @@ msgstr "翻訳者がエクスポートする際に、ファイルのエンコー
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (DO) / Español (DO)"
msgstr "スペイン語（ドミニカ共和国）"
msgstr "スペイン語（ドミニカ共和国）/ Español (DO)"
#. module: base
#: model:res.country,name:base.na
@@ -4826,7 +4826,7 @@ msgstr "ギリシャ－会計"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (HN) / Español (HN)"
msgstr "スペイン語（ホンジュラス）"
msgstr "スペイン語（ホンジュラス）/ Español (HN)"
#. module: base
#: view:ir.sequence.type:0
@@ -5056,7 +5056,7 @@ msgstr "選択されたモジュールは更新あるいはインストールさ
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (PR) / Español (PR)"
msgstr "スペイン語（プエルトリコ）"
msgstr "スペイン語（プエルトリコ）/ Español (PR)"
#. module: base
#: model:res.country,name:base.gt
@@ -5473,7 +5473,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (PA) / Español (PA)"
msgstr "スペイン語（パナマ）"
msgstr "スペイン語（パナマ）/ Español (PA)"
#. module: base
#: view:res.currency:0
@@ -6431,7 +6431,7 @@ msgstr "モジュール品質の分析"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (BO) / Español (BO)"
msgstr "スペイン語（ボリビア）"
msgstr "スペイン語（ボリビア）/ Español (BO)"
#. module: base
#: model:ir.actions.act_window,name:base.ir_access_act
@@ -7053,7 +7053,7 @@ msgstr "非表示"
#. module: base
#: selection:base.language.install,lang:0
msgid "Serbian (Latin) / srpski"
msgstr "セルビア語"
msgstr "セルビア語（ラテン）/ srpski"
#. module: base
#: model:res.country,name:base.il
@@ -7924,7 +7924,7 @@ msgstr "閉じる"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (MX) / Español (MX)"
msgstr "スペイン語（メキシコ）"
msgstr "スペイン語（メキシコ）/ Español (MX)"
#. module: base
#: code:addons/base/publisher_warranty/publisher_warranty.py:145
@@ -8170,7 +8170,7 @@ msgstr "項目が定義されているモジュールのリスト"
#. module: base
#: selection:base.language.install,lang:0
msgid "Chinese (CN) / 简体中文"
msgstr "中国語（简体中文）"
msgstr "中国語 / 简体中文"
#. module: base
#: field:res.bank,street:0
@@ -8310,11 +8310,14 @@ msgid ""
"interface, which has less features but is easier to use. You can switch to "
"the other interface from the User/Preferences menu at any time."
msgstr ""
"OpenERPは簡易 / "
"拡張の２種類のユーザインタフェースを提供します。最初にOpenERPを使う場合は、機能は少ないながらも、使い易い簡易なユーザインタフェースを選択することを"
"強くお勧めします。なお、いつでも設定メニューから拡張インタフェースに変更できます。"
#. module: base
#: model:res.country,name:base.cc
msgid "Cocos (Keeling) Islands"
msgstr ""
msgstr "ココス諸島"
#. module: base
#: selection:base.language.install,state:0
@@ -8326,22 +8329,22 @@ msgstr ""
#. module: base
#: view:res.lang:0
msgid "11. %U or %W ==> 48 (49th week)"
msgstr ""
msgstr "11. %U or %W ==> 48（49番目の週）"
#. module: base
#: model:ir.model,name:base.model_res_partner_bank_type_field
msgid "Bank type fields"
msgstr ""
msgstr "銀行タイプ項目"
#. module: base
#: selection:base.language.install,lang:0
msgid "Dutch / Nederlands"
msgstr ""
msgstr "オランダ"
#. module: base
#: selection:res.company,paper_format:0
msgid "US Letter"
msgstr ""
msgstr "US レター"
#. module: base
#: model:ir.module.module,description:base.module_stock_location
@@ -8433,6 +8436,63 @@ msgid ""
"from Gate A\n"
" "
msgstr ""
"\n"
"このモジュールはプッシュ / プル倉庫フローを効果的に実行する倉庫アプリケーションを補います。\n"
"============================================================================="
"===============================\n"
"\n"
"典型的な利用例：\n"
" * 製品製造チェーンの管理\n"
" * 製品ごとのデフォルトロケーションの管理\n"
" * 以下のようなビジネス要求による倉庫の中の経路の定義：\n"
" - 品質管理\n"
" - 販売サービスの後\n"
" - サプライヤ返品\n"
"\n"
" * レンタル製品の自動返品を生成することでレンタル管理を助けます。\n"
"\n"
"ひとたびこのモジュールがインストールされたら、製品フォームに追加タブが現れます。\n"
"そこで、プッシュとプルのフローの仕様を加えることができます。\n"
"CPU１製品のプッシュとプルのデモデータ：\n"
"\n"
"プッシュフロー\n"
"----------\n"
"プッシュフローは、一定の製品が常に必要に応じて他の場所に対応して動くように到着する時、\n"
"オプションとして一定の遅延がある時に役立ちます。\n"
"オリジナルの倉庫アプリケーションは既にそれ自身にプッシュフローの仕様をサポートしています。\n"
"しかし、これは製品ごとに改良されません。\n"
"\n"
"プッシュプローの仕様は、どの場所がどの場所と何のパラメータでつながれているかを示します。\n"
"製品の所定の量が供給元の場所で動きがあるや否や結び付けられた動作がフロー定義\n"
"（目的地の場所、遅延、移動の種類、ジャーナル他）でセットされたパラメータにしたがって\n"
"自動的に予測されます。\n"
"この新しい動きはパラメータにしたがって自動的に実行されるか、手動確認を要求します。\n"
"\n"
"プルフロー\n"
"----------\n"
"プルフローはプッシュフローとは少し異なっています。これは製品の動きの処理には関係せず、\n"
"むしろ調達した注文の処理に関係します。直接の商品ではなくニーズに依ります。\n"
"プルフローの古典的な例は、供給に責任を持つ親会社を持つアウトレット会社です。\n"
"\n"
" [ 顧客 ] <- A - [ アウトレット ] <- B - [ 親会社 ] <~ C ~ [ 供給者 ]\n"
"\n"
"新しい調達注文（A：例として注文の確認が来ます）がアウトレットに到着すると、それは親会社から要求されたもう一つの調達注文に変換されます（B：プルフローのタ"
"イプは'move'）。親会社により調達注文Bが処理される時、そしてその製品が在庫切れの時、それは供給者からの受注（C：プルフローのタイプは購入）に変換され"
"ます。結果として調達注文、ニーズは顧客と供給者の間の全てにプッシュされます。\n"
"\n"
"技術的には、プルフローは調達注文と別に処理することを許します。製品に対しての考慮に依存するのみならず、その製品のニーズを持つ場所（即ち調達注文の目的地）に"
"依存します。\n"
"\n"
"使用例\n"
"--------\n"
"\n"
"以下のデモデータを使います：\n"
" CPU1：ショップ1からいくらかのCPU1を売り、スケジューラを走らせます。\n"
" - 倉庫：配達注文，ショップ1: 受付\n"
" CPU3:\n"
" - 商品を受け取る時、それは品質管理場所に行き、棚2に保管されます。\n"
" - 顧客に配達する時：ピックリスト -> 梱包 -> GateAから配達注文\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_marketing
@@ -8444,21 +8504,27 @@ msgid ""
"Contains the installer for marketing-related modules.\n"
" "
msgstr ""
"\n"
"マーケティングメニュー\n"
"===================\n"
"\n"
"マーケティング関連のモジュールのインストーラを含んでいます。\n"
" "
#. module: base
#: model:ir.module.category,name:base.module_category_knowledge_management
msgid "Knowledge Management"
msgstr ""
msgstr "知識管理"
#. module: base
#: model:ir.actions.act_window,name:base.bank_account_update
msgid "Company Bank Accounts"
msgstr ""
msgstr "顧客銀行口座"
#. module: base
#: help:ir.mail_server,smtp_pass:0
msgid "Optional password for SMTP authentication"
msgstr ""
msgstr "SMTP認証のための任意のパスワード"
#. module: base
#: model:ir.module.module,description:base.module_project_mrp
@@ -8491,6 +8557,25 @@ msgid ""
"task is completed.\n"
"\n"
msgstr ""
"\n"
"自動的に調達ラインからプロジェクトタスクの生成します。\n"
"==========================================================\n"
"\n"
"対応する製品が以下の特徴を満たす場合、このモジュールはそれぞれの調達注文ライン\n"
"（例えば販売注文ライン）のための新しいタスクを作成します。\n"
"\n"
" ・ タイプ ＝ サービス\n"
" ・ 調達手法（注文実現） ＝ MTO（受注生産）\n"
" ・ 供給 / 調達手法 ＝ 産物\n"
"\n"
"もし先頭のプロジェクトが製品フォーム（調達タブ）で定義されているなら、新しいタスクは\n"
"その特定のプロジェクトの中に作られます。\n"
"それ以外の場合は、新しいタスクはどんなプロジェクトにも属さず、後で手作業でプロジェクトに\n"
"追加されるかも知れません。\n"
"\n"
"プロジェクトのタスクが完了するか、中止される時、調達ラインに対応するワークフローはそれに応じて更新されます。\n"
"例えば、もしこの調達が受注ラインに対応するなら、仕事が完了する時に受注ラインは配達されたと考えられます。\n"
"\n"
#. module: base
#: code:addons/base/res/res_config.py:348
@@ -8500,6 +8585,9 @@ msgid ""
"\n"
"This addon is already installed on your system"
msgstr ""
"\n"
"\n"
"このアドオンは既にシステムにインストール済みです。"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -8508,11 +8596,14 @@ msgid ""
" Module for the Check writing and check printing \n"
" "
msgstr ""
"\n"
" チェックの作成と印刷のためのモジュール \n"
" "
#. module: base
#: model:res.partner.bank.type,name:base.bank_normal
msgid "Normal Bank Account"
msgstr ""
msgstr "通常の銀行口座"
#. module: base
#: view:ir.actions.wizard:0
@@ -8542,6 +8633,21 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"このモジュールは受信したEメールを元に自動的にプロジェクトタスクを生成します。\n"
"===========================================================================\n"
"\n"
"所定のメールボックスに到着した新しいEメールを元にタスクの生成を許します。\n"
"同様にCRMアプリケーションがリード / オポチュニティを持つもの。\n"
"メールボックス統合の設定のために２つの共通の選択肢があります：\n"
"\n"
" ・ fetchmailモジュールをインストールし、新しいメールボックスを設定し、それから\n"
"　 受信EメールのためにProject Tasksをターゲットとして選んで下さい。\n"
" ・ mail gatewayスクリプトが提供したmailモジュールに基づいて、メールサーバを手作業で設定して、\n"
"　 そしてproject.taskモデルにそれを接続して下さい。\n"
"\n"
"\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_membership
@@ -8561,6 +8667,18 @@ msgid ""
"invoice and send propositions for membership renewal.\n"
" "
msgstr ""
"\n"
"このモジュールはメンバーシップの管理のために、全ての管理操作を許可します。\n"
"=========================================================================\n"
"\n"
"以下の異なった種類の会員をサポートします：\n"
"・ 無料会員\n"
"・ 関連会員（例：全ての子会社のメンバーシップのためのグループ加入）\n"
"・ 有料会員\n"
"・ 特別な会員価格など\n"
"\n"
"メンバーシップ更新のための請求書を作り、条件書を送付するために、これは販売と会計と統合されます。\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_hr_attendance
@@ -8573,46 +8691,52 @@ msgid ""
"actions(Sign in/Sign out) performed by them.\n"
" "
msgstr ""
"\n"
"このモジュールは従業員の出勤管理を目指しています。\n"
"==================================================\n"
"\n"
"従業員自身が行ったサインイン / サインアウトの行動をベースにして、従業員の出勤の根拠を保持します。\n"
" "
#. module: base
#: field:ir.module.module,maintainer:0
msgid "Maintainer"
msgstr ""
msgstr "保守担当者"
#. module: base
#: field:ir.sequence,suffix:0
msgid "Suffix"
msgstr ""
msgstr "サフィックス"
#. module: base
#: model:res.country,name:base.mo
msgid "Macau"
msgstr ""
msgstr "マカオ"
#. module: base
#: model:ir.actions.report.xml,name:base.res_partner_address_report
msgid "Labels"
msgstr ""
msgstr "ラベル"
#. module: base
#: field:partner.massmail.wizard,email_from:0
msgid "Sender's email"
msgstr ""
msgstr "送信者のEメール"
#. module: base
#: field:ir.default,field_name:0
msgid "Object Field"
msgstr ""
msgstr "オブジェクト項目"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (PE) / Español (PE)"
msgstr ""
msgstr "スペイン語（ペルー）/ Español (PE)"
#. module: base
#: selection:base.language.install,lang:0
msgid "French (CH) / Français (CH)"
msgstr ""
msgstr "フランス語（スイス）/ Français (CH)"
#. module: base
#: help:ir.actions.server,subject:0
@@ -8621,6 +8745,8 @@ msgid ""
"the same values as those available in the condition field, e.g. `Hello [[ "
"object.partner_id.name ]]`"
msgstr ""
"電子メールの件名には条件項目で使用可能な同じ値を元にした二重括弧で囲まれた表現、例えば、‘こんにちは[[ object.partner_id.name "
"]]’を含むことができます。"
#. module: base
#: model:ir.module.module,description:base.module_account_sequence
@@ -8639,11 +8765,24 @@ msgid ""
" * Number Padding\n"
" "
msgstr ""
"\n"
"このモジュールは会計項目のために内部の連続番号を維持管理します。\n"
"======================================================================\n"
"\n"
"あなたは会計の順序が維持されるように設定することができます。\n"
"\n"
"以下の順序の属性をカスタマイズできます：\n"
"　・ プレフィックス（接頭辞）\n"
"　・ サフィックス（接尾辞）\n"
"　・ 次の番号\n"
"　・ 増分番号\n"
"　・ 番号埋め文字\n"
" "
#. module: base
#: model:res.country,name:base.to
msgid "Tonga"
msgstr ""
msgstr "トンガ"
#. module: base
#: help:ir.model.fields,serialization_field_id:0
@@ -8652,35 +8791,37 @@ msgid ""
"serialization field, instead of having its own database column. This cannot "
"be changed after creation."
msgstr ""
"もしセットする場合、この項目は自身のデータベースのカラムの代わりに、シリアライズされた項目の疎な構造の中に保存されます。これを作成した後で、変更することは"
"できません。"
#. module: base
#: view:res.partner.bank:0
msgid "Bank accounts belonging to one of your companies"
msgstr ""
msgstr "銀行口座はあなたの会社の一つに属します。"
#. module: base
#: help:res.users,action_id:0
msgid ""
"If specified, this action will be opened at logon for this user, in addition "
"to the standard menu."
msgstr ""
msgstr "もし指定された場合，このアクションは標準メニューに追加され、このユーザに対してログイン時に開かれます。"
#. module: base
#: selection:ir.module.module,complexity:0
msgid "Easy"
msgstr ""
msgstr "易しい"
#. module: base
#: view:ir.values:0
msgid "Client Actions"
msgstr ""
msgstr "顧客アクション"
#. module: base
#: help:ir.actions.server,trigger_obj_id:0
msgid ""
"The field on the current object that links to the target object record (must "
"be a many2one, or an integer field with the record ID)"
msgstr ""
msgstr "現在のオブジェクトのその項目は、目的のオブジェクトレコード（レコードIDを持ち多対１の関係か、または整数項目である）にリンクします。"
#. module: base
#: code:addons/base/module/module.py:423
@@ -8689,18 +8830,20 @@ msgid ""
"You try to upgrade a module that depends on the module: %s.\n"
"But this module is not available in your system."
msgstr ""
"あなたは次のモジュールに依存するモジュールをアップグレードしようとしています： %s.\n"
"しかし、そのモジュールはあなたのシステムでは使用できません。"
#. module: base
#: field:workflow.transition,act_to:0
msgid "Destination Activity"
msgstr ""
msgstr "目的地のアクティビティ"
#. module: base
#: help:res.currency,position:0
msgid ""
"Determines where the currency symbol should be placed after or before the "
"amount."
msgstr ""
msgstr "通貨記号が金額の前後、どちらに置かれるべきなのかを決定します。"
#. module: base
#: model:ir.model,name:base.model_base_update_translations
@@ -8710,7 +8853,7 @@ msgstr ""
#. module: base
#: field:res.partner.category,parent_id:0
msgid "Parent Category"
msgstr ""
msgstr "親分類"
#. module: base
#: selection:ir.property,type:0
@@ -8721,12 +8864,12 @@ msgstr ""
#: selection:res.partner.address,type:0
#: selection:res.partner.title,domain:0
msgid "Contact"
msgstr ""
msgstr "コンタクト"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_at
msgid "Austria - Accounting"
msgstr ""
msgstr "オーストラリア－会計"
#. module: base
#: model:ir.model,name:base.model_ir_ui_menu
@@ -8737,39 +8880,39 @@ msgstr ""
#: model:ir.module.category,name:base.module_category_project_management
#: model:ir.module.module,shortdesc:base.module_project
msgid "Project Management"
msgstr ""
msgstr "プロジェクト管理"
#. module: base
#: model:res.country,name:base.us
msgid "United States"
msgstr ""
msgstr "アメリカ合衆国"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_fundraising
msgid "Fundraising"
msgstr ""
msgstr "募金"
#. module: base
#: view:ir.module.module:0
msgid "Cancel Uninstall"
msgstr ""
msgstr "アンインストールのキャンセル"
#. module: base
#: view:res.bank:0
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Communication"
msgstr ""
msgstr "通信"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic
msgid "Analytic Accounting"
msgstr ""
msgstr "分析会計"
#. module: base
#: view:ir.actions.report.xml:0
msgid "RML Report"
msgstr ""
msgstr "RMLレポート"
#. module: base
#: model:ir.model,name:base.model_ir_server_object_lines
@@ -8779,23 +8922,23 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be
msgid "Belgium - Accounting"
msgstr ""
msgstr "ベルギー－会計"
#. module: base
#: code:addons/base/module/module.py:622
#, python-format
msgid "Module %s: Invalid Quality Certificate"
msgstr ""
msgstr "モジュール %s： 無効な品質証明書"
#. 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
@@ -8804,23 +8947,25 @@ msgid ""
"Keep empty to not save the printed reports. You can use a python expression "
"with the object and time variables."
msgstr ""
"これは印刷結果を保存するために使われる添付ファイルのファイル名です。印刷レポートを保存しない場合は、空の状態にして下さい。オブジェクトと時間変数にはpyt"
"hon表現を使うことができます。"
#. module: base
#: sql_constraint:ir.model.data:0
msgid ""
"You cannot have multiple records with the same external ID in the same "
"module!"
msgstr ""
msgstr "同じモジュールの中に、同じ外部IDで複数のレコードを持つことはできません。"
#. module: base
#: selection:ir.property,type:0
msgid "Many2One"
msgstr ""
msgstr "多対１"
#. module: base
#: model:res.country,name:base.ng
msgid "Nigeria"
msgstr ""
msgstr "ナイジェリア"
#. module: base
#: model:ir.module.module,description:base.module_crm_caldav
@@ -8831,41 +8976,46 @@ msgid ""
"\n"
" * Share meeting with other calendar clients like sunbird\n"
msgstr ""
"\n"
"ミーティングにおけるCaldavの機能\n"
"===========================\n"
"\n"
"　・ Sunbirdなど他のカレンダークライアントとミーティング情報を共有できます。\n"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_iban
msgid "IBAN Bank Accounts"
msgstr ""
msgstr "IBAN銀行口座"
#. module: base
#: field:res.company,user_ids:0
msgid "Accepted Users"
msgstr ""
msgstr "受け入れられたユーザ"
#. module: base
#: field:ir.ui.menu,web_icon_data:0
msgid "Web Icon Image"
msgstr ""
msgstr "Webアイコンイメージ"
#. module: base
#: field:ir.actions.server,wkf_model_id:0
msgid "Target Object"
msgstr ""
msgstr "目的のオブジェクト"
#. module: base
#: selection:ir.model.fields,select_level:0
msgid "Always Searchable"
msgstr ""
msgstr "常時検索可能"
#. module: base
#: model:res.country,name:base.hk
msgid "Hong Kong"
msgstr ""
msgstr "香港"
#. module: base
#: field:ir.default,ref_id:0
msgid "ID Ref."
msgstr ""
msgstr "ID参照"
#. module: base
#: model:ir.actions.act_window,help:base.action_partner_address_form
@@ -9337,7 +9487,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (EC) / Español (EC)"
msgstr ""
msgstr "スペイン語（エクアドル）/ Español (EC)"
#. module: base
#: help:ir.ui.view,xml_id:0
@@ -9964,7 +10114,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Flemish (BE) / Vlaams (BE)"
msgstr ""
msgstr "フラマン語（ベルギー）/ Vlaams (BE)"
#. module: base
#: field:ir.cron,interval_number:0
@@ -10817,7 +10967,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (CO) / Español (CO)"
msgstr ""
msgstr "スペイン語（コロンビア）/ Español (CO)"
#. module: base
#: view:base.module.configuration:0
@@ -10935,7 +11085,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_cn
msgid "中国会计科目表 - Accounting"
msgstr ""
msgstr "中国－会計"
#. module: base
#: view:ir.model.access:0
@@ -10964,7 +11114,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Chinese (TW) / 正體字"
msgstr ""
msgstr "中国語（台湾）/ 正體字"
#. module: base
#: model:ir.model,name:base.model_res_request
@@ -11433,7 +11583,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (CR) / Español (CR)"
msgstr ""
msgstr "スペイン語（コスタリカ）/ Español (CR)"
#. module: base
#: view:ir.rule:0
@@ -11653,7 +11803,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_br
msgid "Brazilian - Accounting"
msgstr ""
msgstr "ブラジル－会計"
#. module: base
#: model:res.country,name:base.pk
@@ -12328,7 +12478,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (NI) / Español (NI)"
msgstr ""
msgstr "スペイン語（ニカラグア）/ Español (NI)"
#. module: base
#: model:ir.module.module,description:base.module_product_visible_discount
@@ -12666,7 +12816,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_uk
msgid "UK - Accounting"
msgstr ""
msgstr "イギリス－会計"
#. module: base
#: model:ir.module.module,description:base.module_project_scrum
@@ -12737,7 +12887,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_in
msgid "India - Accounting"
msgstr ""
msgstr "インド－会計"
#. module: base
#: field:ir.actions.server,expression:0
@@ -12752,7 +12902,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_gt
msgid "Guatemala - Accounting"
msgstr ""
msgstr "グアテマラ－会計"
#. module: base
#: help:ir.cron,args:0
@@ -13713,7 +13863,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_th
msgid "Thailand - Accounting"
msgstr ""
msgstr "タイ－会計"
#. module: base
#: view:res.lang:0
@@ -14334,7 +14484,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_es
msgid "Spanish - Accounting (PGCE 2008)"
msgstr ""
msgstr "スペイン－会計（PGCE 2008）"
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
@@ -14429,7 +14579,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_nl
msgid "Netherlands - Accounting"
msgstr ""
msgstr "オランダ－会計"
#. module: base
#: field:res.bank,bic:0
@@ -14743,7 +14893,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Serbian (Cyrillic) / српски"
msgstr ""
msgstr "セルビア語（キリル文字）/ српски"
#. module: base
#: code:addons/orm.py:2527
@@ -15137,7 +15287,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_de
msgid "Deutschland - Accounting"
msgstr ""
msgstr "ドイツ－会計"
#. module: base
#: model:ir.module.module,shortdesc:base.module_auction
@@ -15391,7 +15541,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_fr
msgid "France - Accounting"
msgstr ""
msgstr "フランス－会計"
#. module: base
#: view:ir.actions.todo:0
@@ -15720,7 +15870,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (SV) / Español (SV)"
msgstr ""
msgstr "スペイン語（エルサルバドル）/ Español (SV)"
#. module: base
#: help:res.lang,grouping:0
@@ -15803,7 +15953,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ca
msgid "Canada - Accounting"
msgstr ""
msgstr "カナダ－会計"
#. module: base
#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
@@ -15842,7 +15992,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ve
msgid "Venezuela - Accounting"
msgstr ""
msgstr "ベネズエラ－会計"
#. module: base
#: model:res.country,name:base.cl
openerp/addons/base/i18n/ka.po
+15313
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/kk.po
+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: 2012-02-09 05:49+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ko.po
+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: 2012-02-09 05:50+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/lt.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2011-01-16 11:33+0000\n"
"Last-Translator: Paulius Sladkevičius <komsas@gmail.com>\n"
"Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\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: 2012-02-09 05:50+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/lv.po
+3 -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: 2012-02-09 05:50+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:49+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -13981,7 +13981,7 @@ msgstr ""
#: 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 "Adrešu grāmata"
#. module: base
#: model:ir.module.module,description:base.module_l10n_ma
openerp/addons/base/i18n/mk.po
+6 -6
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: 2012-02-09 05:50+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -25,7 +25,7 @@ msgstr "Света Елена"
#. module: base
#: view:ir.actions.report.xml:0
msgid "Other Configuration"
msgstr ""
msgstr "Останати поставки"
#. module: base
#: selection:ir.property,type:0
@@ -111,7 +111,7 @@ msgstr ""
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
msgid "Display Menu Tips"
msgstr "Прикажи ги советите во менито"
msgstr ""
#. module: base
#: help:ir.cron,model:0
@@ -175,7 +175,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
msgid "Process"
msgstr ""
msgstr "Процес"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
@@ -515,7 +515,7 @@ msgstr "Холандски антили"
#. module: base
#: model:res.country,name:base.ro
msgid "Romania"
msgstr ""
msgstr "Романија"
#. module: base
#: code:addons/base/res/res_users.py:396
openerp/addons/base/i18n/mn.po
+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: 2012-02-09 05:50+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/nb.po
+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: 2012-02-09 05:50+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/nl.po
+67 -27
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: 2012-02-20 05:39+0000\n"
"X-Generator: Launchpad (build 14833)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:47+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -90,7 +90,7 @@ msgstr "Werkschema"
#. module: base
#: selection:ir.sequence,implementation:0
msgid "No gap"
msgstr "Geen kloof"
msgstr "Aaneengesloten"
#. module: base
#: selection:base.language.install,lang:0
@@ -186,7 +186,7 @@ msgstr "Verwerken"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
msgstr ""
msgstr "Factureertarieven op contracten"
#. module: base
#: code:addons/base/res/res_users.py:558
@@ -371,7 +371,7 @@ msgstr "Naam assistent"
#. module: base
#: model:res.groups,name:base.group_partner_manager
msgid "Partner Manager"
msgstr "Partner beheer"
msgstr "Relatie manager"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
@@ -412,7 +412,7 @@ msgstr "Wijzigingsdatum"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
msgstr "Automatische aktie regels"
msgstr "Automatische actie regels"
#. module: base
#: view:ir.attachment:0
@@ -1569,7 +1569,7 @@ msgstr "Gebruiker"
#: model:ir.actions.act_window,name:base.action_wizard_update_translations
#: model:ir.ui.menu,name:base.menu_wizard_update_translations
msgid "Synchronize Terms"
msgstr "Synchroniseer Terms"
msgstr "Synchroniseer termen"
#. module: base
#: view:ir.actions.server:0
@@ -1865,7 +1865,7 @@ msgstr " (kopie)"
#. module: base
#: field:res.company,rml_footer1:0
msgid "General Information Footer"
msgstr "Algemene Info Voettekst"
msgstr "Algemene informatie voettekst"
#. module: base
#: view:res.lang:0
@@ -2331,7 +2331,7 @@ msgstr "Beginpagina componenten beheer"
#. module: base
#: field:res.company,rml_header1:0
msgid "Report Header / Company Slogan"
msgstr "Rapporthoofd / Bedrijfs slogan"
msgstr "Rapport koptekst / Bedrijfsslogan"
#. module: base
#: model:res.country,name:base.pl
@@ -2661,7 +2661,7 @@ msgstr "Fout tijdens communicatie met de uitgevers garantie server."
#: model:res.groups,name:base.group_sale_manager
#: model:res.groups,name:base.group_tool_manager
msgid "Manager"
msgstr "Beheer"
msgstr "Manager"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -3283,7 +3283,7 @@ msgstr "Uruguay"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_crm
msgid "eMail Gateway for Leads"
msgstr "eMail Gateway voor Leads"
msgstr "E-Mail Gateway voor Leads"
#. module: base
#: selection:base.language.install,lang:0
@@ -3918,7 +3918,7 @@ msgstr "iCal ondersteuning"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail
msgid "Email Gateway"
msgstr "Email Gateway"
msgstr "E-mail Gateway"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:439
@@ -4143,7 +4143,7 @@ msgstr "Xor"
#. module: base
#: model:ir.module.category,name:base.module_category_localization_account_charts
msgid "Account Charts"
msgstr ""
msgstr "Rekeningschema's"
#. module: base
#: view:res.request:0
@@ -4382,7 +4382,7 @@ msgstr "`code`moet uniek zijn."
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_expense
msgid "Expenses Management"
msgstr ""
msgstr "Uitgave beheer"
#. module: base
#: view:workflow.activity:0
@@ -4713,7 +4713,7 @@ msgstr "Lesotho"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_vat
msgid "VAT Number Validation"
msgstr "BTW nummer validaatie"
msgstr "BTW nummer validatie"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_partner_assign
@@ -4849,7 +4849,7 @@ msgstr "Dat contract is al geregisteerd in het systeem."
#: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
msgid "Bank Account Types"
msgstr ""
msgstr "Bankrekening soorten"
#. module: base
#: help:ir.sequence,suffix:0
@@ -4919,7 +4919,7 @@ msgstr "Web Chat"
#. module: base
#: field:res.company,rml_footer2:0
msgid "Bank Accounts Footer"
msgstr ""
msgstr "Bankrekening voettekst"
#. module: base
#: model:res.country,name:base.mu
@@ -6636,7 +6636,7 @@ msgstr ""
#. module: base
#: selection:res.currency,position:0
msgid "After Amount"
msgstr ""
msgstr "Achter bedrag"
#. module: base
#: selection:base.language.install,lang:0
@@ -7143,7 +7143,7 @@ msgstr "Aangemaakte menu's"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_analytic_default
msgid "Account Analytic Defaults"
msgstr ""
msgstr "Standaard kostenplaatsen"
#. module: base
#: model:ir.module.module,description:base.module_hr_contract
@@ -7212,7 +7212,7 @@ msgstr ""
#. module: base
#: view:res.log:0
msgid "My Logs"
msgstr "Mijn logboeVken"
msgstr "Mijn logboeken"
#. module: base
#: model:res.country,name:base.bt
@@ -7275,7 +7275,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_payroll
msgid "Payroll"
msgstr "Loonlijst"
msgstr "Loonadministratie"
#. module: base
#: model:ir.actions.act_window,help:base.action_country_state
@@ -8755,6 +8755,16 @@ msgid ""
"* Date\n"
" "
msgstr ""
"Stelt standaard waarden in voor kostenplaatsen\n"
"Maakt het mogelijk om automatisch kostenplaatsen te selecteren op basis van "
"criteria:\n"
"======================================================================\n"
"* Product\n"
"* Relatie\n"
"* Gebruiker\n"
"* Bedrijf\n"
"* Datum\n"
" "
#. module: base
#: model:res.country,name:base.ae
@@ -9161,7 +9171,7 @@ msgstr "Vertalingen"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_gtd
msgid "Todo Lists"
msgstr ""
msgstr "Todo lijst"
#. module: base
#: view:ir.actions.report.xml:0
@@ -9780,6 +9790,33 @@ msgid ""
"module named account_voucher.\n"
" "
msgstr ""
"\n"
"Boekhouding en Financieel management.\n"
"=================================\n"
"Financial and accounting module that covers:\n"
"--------------------------------------------\n"
"General accountings\n"
"Cost / Analytic accounting\n"
"Third party accounting\n"
"Taxes management\n"
"Budgets\n"
"Customer and Supplier Invoices\n"
"Bank statements\n"
"Reconciliation process by partner\n"
"\n"
"Creates a dashboard for accountants that includes:\n"
"--------------------------------------------------\n"
"* List of Customer Invoice to Approve\n"
"* Company Analysis\n"
"* Graph of Aged Receivables\n"
"* Graph of Treasury\n"
"\n"
"The processes like maintaining of general ledger is done through the defined "
"financial Journals (entry move line or\n"
"grouping is maintained through journal) for a particular financial year and "
"for preparation of vouchers there is a\n"
"module named account_voucher.\n"
" "
#. module: base
#: help:ir.actions.act_window,view_type:0
@@ -11590,7 +11627,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr
msgid "Employee Directory"
msgstr "Medewerkers map"
msgstr "Werknemers map"
#. module: base
#: view:ir.cron:0
@@ -13138,7 +13175,7 @@ msgstr "Onderwerp"
#. module: base
#: selection:res.currency,position:0
msgid "Before Amount"
msgstr ""
msgstr "Voor bedrag"
#. module: base
#: field:res.request,act_from:0
@@ -13212,7 +13249,7 @@ msgstr "Huidige gebruiker"
#. module: base
#: field:res.company,company_registry:0
msgid "Company Registry"
msgstr ""
msgstr "KvK gegevens"
#. module: base
#: view:ir.actions.report.xml:0
@@ -13580,7 +13617,7 @@ msgstr ""
#. module: base
#: field:res.company,vat:0
msgid "Tax ID"
msgstr "BTW Id"
msgstr "BTW Nr."
#. module: base
#: field:ir.model.fields,field_description:0
@@ -14247,6 +14284,9 @@ msgid ""
"later is slower than the former but forbids any gap in the sequence (while "
"they are possible in the former)."
msgstr ""
"Twee reeksen object implementaties worden aangeboden: standaard en "
"'Aaneengesloten'. De laatste is langzamer dan de eerste, maar verbiedt een "
"gat in de reeks (terwijl ze wel mogelijk zijn in de eerste)."
#. module: base
#: model:res.country,name:base.gn
@@ -14397,7 +14437,7 @@ msgstr "Object relatie"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_voucher
msgid "eInvoicing & Payments"
msgstr "eFacturering & Betalingen"
msgstr "Bonnen & Betalingen"
#. module: base
#: view:ir.rule:0
openerp/addons/base/i18n/nl_BE.po
+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: 2012-02-09 05:54+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:53+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pl.po
+217 -180
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/pt.po
+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: 2012-02-09 05:51+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pt_BR.po
+123 -6
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: 2012-02-16 05:03+0000\n"
"X-Generator: Launchpad (build 14781)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:53+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -102,7 +102,7 @@ msgstr "Código (ex: pt__BR)"
#: field:workflow.transition,wkf_id:0
#: field:workflow.workitem,wkf_id:0
msgid "Workflow"
msgstr "Fluxo de Trabalho"
msgstr "Fluxo de trabalho"
#. module: base
#: selection:ir.sequence,implementation:0
@@ -372,6 +372,12 @@ msgid ""
" - tree_but_open\n"
"For defaults, an optional condition"
msgstr ""
"Para ações, uma das possíveis ações abaixo: \n"
" - client_action_multi\n"
" - client_print_multi\n"
" - client_action_relate\n"
" - tree_but_open\n"
"Por padrão, uma condição opcional"
#. module: base
#: sql_constraint:res.lang:0
@@ -526,6 +532,10 @@ msgid ""
"and reference view. The result is returned as an ordered list of pairs "
"(view_id,view_mode)."
msgstr ""
"Esta função de campo calcula uma lista ordenada das views que devem estar "
"habilitadas quando mostrando o resultado de uma ação, modo federado de "
"visão, visões e visões de referência. O resultado é retornado como uma lista "
"ordenada de pares (view_id, view_mode)."
#. module: base
#: model:res.country,name:base.tv
@@ -652,6 +662,32 @@ msgid ""
" Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
"\n"
msgstr ""
"\n"
"Modulo para automatizar emissão de cartas para faturas não conciliadas, com "
"rechamadas de nível múltipo.\n"
"============================================================================="
"==========\n"
"\n"
"Você pode definir seus níveis múltiplos de carta de cobrança através do "
"menu:\n"
"Contabilidade / Configuração / Diversos / Acompanhamento\n"
"\n"
"Quando isto é definido, você pode imprimir automaticamente e diariamente "
"a(s) carta(s)-lembrete através de um simples clique no menu:\n"
"Contabilidade / Processamentos periódicos / Faturamento / Enviar "
"acompanhamento\n"
"\n"
"Isso irá gerar um PDF com todas as cartas de acordo com os diferentes níveis "
"de lembrete definido.\n"
"Você pode definir diferentes políticas para diferentes empresas. Você também "
"pode enviar correspondência\n"
"para os clientes.\n"
"\n"
"Lembre-se de que se você quiser verificar o nível de acompanhamento para um "
"dado parceiro / entrada de conta, você pode fazê-lo do menu :\n"
"Contabilidade / Relatórios / Relatórios genéricos / Parceiros / Envio de "
"acompanhamento\n"
"\n"
#. module: base
#: field:res.country,name:0
@@ -947,6 +983,16 @@ msgid ""
"delete on objects and can check logs.\n"
" "
msgstr ""
"\n"
"Este módulo permite aos administradores a traçabilidate de cada operação dos "
"usuários em todos os objetos do sistema.\n"
"============================================================================="
"=======================\n"
"\n"
"O Administrador pode atribuir regras para leitura, escrita e deleção nos "
"objetos\n"
"e pode também verificar os logs.\n"
" "
#. module: base
#: model:res.partner.category,name:base.res_partner_category_4
@@ -1806,6 +1852,20 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Este módulo adiciona um botão de compartilhamento que está disponível no "
"client WEB para compartilhar qualquer tipo de dados OpenERP com colegas, "
"clientes, amigos, etc.\n"
"\n"
"O sistema ira criar novos usuários, e grupos automaticamente, e pela "
"combinação apropriada de direitors de acessos e regras poderá assegurar que "
"os novos usuários apenas tenham acesso aos dados que tenham sido "
"compartilhados com eles.\n"
"\n"
"Isto é extremamente útil para um trabalho colaborativo, compartilhamento de "
"conhecimento, sincronização com outras empresas, etc.\n"
"\n"
" "
#. module: base
#: field:res.currency,accuracy:0
@@ -1922,6 +1982,20 @@ msgid ""
"The managers can obtain an easy view of best ideas from all the users.\n"
"Once installed, check the menu 'Ideas' in the 'Tools' main menu."
msgstr ""
"\n"
"Este modulo permite a seu usuário fácil e eficientemente de participar do "
"processo de inovação da empresa.\n"
"============================================================================="
"==============\n"
"\n"
"Ele permite a qualquer pessoa expressar idéias sobre diferentes assuntos.\n"
"Então, outros usuários poderão comentar sobre as idéias postadas e votar em "
"idéias postadas.\n"
"Cada idéia tem sua pontuação baseada nas diferentes votações.\n"
"Os gerentes podem obter uma visão fácil das melhores idéias de todas essas "
"pessoas.\n"
"Uma vez instalado, verifique o menu \"Idéias\" do menu principal "
"\"Utilitários\"."
#. module: base
#: model:ir.model,name:base.model_ir_rule
@@ -2149,6 +2223,47 @@ msgid ""
"today don't come with any additional paid permission for online use of "
"'private modules'."
msgstr ""
"\n"
"Módulo base para a localização Brasileira\n"
"================================\n"
"\n"
"Este módulo consiste em de :\n"
"\n"
" - Plano de contas brasileiro genérico\n"
" - Impostos brasileiros, tais como :\n"
"\n"
" - IPI\n"
" - ICMS\n"
" - PIS\n"
" - COFINS\n"
" - ISS\n"
" - IR\n"
" - IRPJ\n"
" - CSLL\n"
"\n"
" - Código de situação tributária (CST) necessário para a nota fiscal "
"eletrônica (NFe)\n"
"\n"
"O campo tax_discount foi também adicionado nos objetos account.tax.template "
"e account.tax para permitir o melhor cálculo de alguns impostos brasileiros "
"tais como ICMS. O assistente de criação do plano de contas foi estendido "
"para propagar estas novas propriedades de dados.\n"
"\n"
"É importante notar, entretanto, que este modulo ainda precisa de várias "
"implementações para se usar o OpenERP regularmente no Brasil. Estas "
"implementações (tais como a Nota Fiscal Eletrônica, que já está operacional) "
"foram incorporadas por mais de 15 módulos adicionais de projetos da "
"Launchpad da localização brasileira https://launchpad.net/openerp.pt-br-"
"localiz e suas dependências no branch de addons extra. O objetivo desses "
"módulos é manter a remarcável modularidade do OpenERP, e é por isso que são "
"muitos, mas pequenos. Uma das razões para a manutenção desses módulos "
"separadamente é que os líderes da localização Brasileira precisam ter "
"agilidade para a confirmação das mudanças para completar a localização como "
"as empresas que financiam os requerimentos legais faltantes (tais como em "
"breve a contabilidade fiscal, contabilidade SPED, SPED fiscal e PAF ECF que "
"ainda estão faltando desde Setembro de 2011). Esses módulos também são "
"estritamente licenciados sob AGPL V3 e atualmente não vem com permissão paga "
"adicional para uso online dos 'modulos privados'."
#. module: base
#: view:res.request:0
@@ -3640,7 +3755,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_report_webkit
msgid "Webkit Report Engine"
msgstr ""
msgstr "Motor de Relatório Webkit"
#. module: base
#: selection:publisher_warranty.contract,state:0
@@ -4071,6 +4186,8 @@ msgid ""
"Mail delivery failed via SMTP server '%s'.\n"
"%s: %s"
msgstr ""
"Entrega de email falhou servidor SMTP '%s'.\n"
"%s:%s"
#. module: base
#: view:ir.cron:0
@@ -6575,7 +6692,7 @@ msgstr "OHADA - contabilidade"
#. module: base
#: help:res.bank,bic:0
msgid "Sometimes called BIC or Swift."
msgstr ""
msgstr "As vezes chamado de BIC ou Swift."
#. module: base
#: model:ir.module.module,description:base.module_l10n_mx
@@ -7326,7 +7443,7 @@ msgstr "Ativo"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ma
msgid "Maroc - Accounting"
msgstr ""
msgstr "Plano de contas Marroquino"
#. module: base
#: model:res.country,name:base.mn
openerp/addons/base/i18n/ro.po
+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: 2012-02-09 05:51+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:51+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ru.po
+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: 2012-02-09 05:51+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:51+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sk.po
+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: 2012-02-09 05:52+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:51+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sl.po
+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: 2012-02-09 05:52+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:51+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sq.po
+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: 2012-02-09 05:45+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sr.po
+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: 2012-02-09 05:52+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:51+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sr@latin.po
+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: 2012-02-16 05:04+0000\n"
"X-Generator: Launchpad (build 14781)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sv.po
+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: 2012-02-09 05:53+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/th.po
+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: 2012-02-09 05:53+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/tlh.po
+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: 2012-02-09 05:53+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/tr.po
+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: 2012-02-10 04:46+0000\n"
"X-Generator: Launchpad (build 14771)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/uk.po
+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: 2012-02-09 05:53+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ur.po
+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: 2012-02-09 05:53+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/vi.po
+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: 2012-02-09 05:54+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_CN.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-02-22 15:34+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"PO-Revision-Date: 2012-03-11 06:21+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2012-02-23 04:38+0000\n"
"X-Generator: Launchpad (build 14855)\n"
"X-Launchpad-Export-Date: 2012-03-12 04:39+0000\n"
"X-Generator: Launchpad (build 14933)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -10426,7 +10426,7 @@ msgstr "此处决定是否在用户执行操作时显示提示信息"
#: model:ir.module.module,shortdesc:base.module_base
#: field:res.currency,base:0
msgid "Base"
msgstr "基本信息"
msgstr "本位币"
#. module: base
#: field:ir.model.data,model:0
openerp/addons/base/i18n/zh_HK.po
+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: 2012-02-09 05:54+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:52+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_TW.po
+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: 2012-02-09 05:55+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-03-10 04:53+0000\n"
"X-Generator: Launchpad (build 14914)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/ir/ir_attachment.py
+5 -5
View File
@@ -54,11 +54,11 @@ class ir_attachment(osv.osv):
ima.check(cr, uid, model, mode)
self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
ids = super(ir_attachment, self).search(cr, uid, args, offset=offset,
limit=limit, order=order,
context=context, count=False)
def _search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
ids = super(ir_attachment, self)._search(cr, uid, args, offset=offset,
limit=limit, order=order,
context=context, count=count,
access_rights_uid=access_rights_uid)
if not ids:
if count:
return 0
openerp/addons/base/ir/ir_mail_server.py
+35 -8
View File
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2011 OpenERP S.A (<http://www.openerp.com>)
# Copyright (C) 2011-2012 OpenERP S.A (<http://www.openerp.com>)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -22,6 +22,7 @@
from email.MIMEText import MIMEText
from email.MIMEBase import MIMEBase
from email.MIMEMultipart import MIMEMultipart
from email.Charset import Charset
from email.Header import Header
from email.Utils import formatdate, make_msgid, COMMASPACE
from email import Encoders
@@ -97,6 +98,26 @@ def encode_header(header_text):
return header_text_ascii if header_text_ascii\
else Header(header_text_utf8, 'utf-8')
def encode_header_param(param_text):
"""Returns an appropriate RFC2047 encoded representation of the given
header parameter value, suitable for direct assignation as the
param value (e.g. via Message.set_param() or Message.add_header())
RFC2822 assumes that headers contain only 7-bit characters,
so we ensure it is the case, using RFC2047 encoding when needed.
:param param_text: unicode or utf-8 encoded string with header value
:rtype: string
:return: if ``param_text`` represents a plain ASCII string,
return the same 7-bit string, otherwise returns an
ASCII string containing the RFC2047 encoded text.
"""
# For details see the encode_header() method that uses the same logic
if not param_text: return ""
param_text_utf8 = tools.ustr(param_text).encode('utf-8')
param_text_ascii = try_coerce_ascii(param_text_utf8)
return param_text_ascii if param_text_ascii\
else Charset('utf8').header_encode(param_text_utf8)
name_with_email_pattern = re.compile(r'("[^<@>]+")\s*<([^ ,<@]+@[^> ,]+)>')
address_pattern = re.compile(r'([^ ,<@]+@[^> ,]+)')
@@ -232,6 +253,11 @@ class ir_mail_server(osv.osv):
if user:
# Attempt authentication - will raise if AUTH service not supported
# The user/password must be converted to bytestrings in order to be usable for
# certain hashing schemes, like HMAC.
# See also bug #597143 and python issue #5285
user = tools.ustr(user).encode('utf-8')
password = tools.ustr(password).encode('utf-8')
connection.login(user, password)
return connection
@@ -304,7 +330,7 @@ class ir_mail_server(osv.osv):
msg['Cc'] = encode_rfc2822_address_header(COMMASPACE.join(email_cc))
if email_bcc:
msg['Bcc'] = encode_rfc2822_address_header(COMMASPACE.join(email_bcc))
msg['Date'] = formatdate(localtime=True)
msg['Date'] = formatdate()
# Custom headers may override normal headers or provide additional ones
for key, value in headers.iteritems():
msg[ustr(key).encode('utf-8')] = encode_header(value)
@@ -329,14 +355,16 @@ class ir_mail_server(osv.osv):
if attachments:
for (fname, fcontent) in attachments:
filename_utf8 = ustr(fname).encode('utf-8')
filename_rfc2047 = encode_header_param(fname)
part = MIMEBase('application', "octet-stream")
# The default RFC2231 encoding of Message.add_header() works in Thunderbird but not GMail
# so we fix it by using RFC2047 encoding for the filename instead.
part.set_param('name', filename_rfc2047)
part.add_header('Content-Disposition', 'attachment', filename=filename_rfc2047)
part.set_payload(fcontent)
Encoders.encode_base64(part)
# Force RFC2231 encoding for attachment filename
# See email.message.Message.add_header doc
part.add_header('Content-Disposition', 'attachment',
filename=('utf-8',None,filename_utf8))
msg.attach(part)
return msg
@@ -364,7 +392,6 @@ class ir_mail_server(osv.osv):
:param smtp_user: optional SMTP user, if mail_server_id is not passed
:param smtp_password: optional SMTP password to use, if mail_server_id is not passed
:param smtp_debug: optional SMTP debug flag, if mail_server_id is not passed
:param debug: whether to turn on the SMTP level debugging, output to DEBUG log level
:return: the Message-ID of the message that was just sent, if successfully sent, otherwise raises
MailDeliveryException and logs root cause.
"""
openerp/addons/base/ir/ir_model.py
+7 -5
View File
@@ -35,12 +35,14 @@ import pooler
_logger = logging.getLogger(__name__)
def _get_fields_type(self, cr, uid, context=None):
# Avoid too many nested `if`s below, as RedHat's Python 2.6
# break on it. See bug 939653.
return sorted([(k,k) for k,v in fields.__dict__.iteritems()
if type(v) == types.TypeType
if issubclass(v, fields._column)
if v != fields._column
if not v._deprecated
if not issubclass(v, fields.function)])
if type(v) == types.TypeType and \
issubclass(v, fields._column) and \
v != fields._column and \
not v._deprecated and \
not issubclass(v, fields.function)])
def _in_modules(self, cr, uid, ids, field_name, arg, context=None):
#pseudo-method used by fields.function in ir.model/ir.model.fields
openerp/addons/base/ir/ir_rule.py
+1 -1
View File
@@ -75,7 +75,7 @@ class ir_rule(osv.osv):
_columns = {
'name': fields.char('Name', size=128, select=1),
'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
'model_id': fields.many2one('ir.model', 'Object',select=1, required=True, ondelete="cascade"),
'global': fields.function(_get_value, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
'domain_force': fields.text('Domain'),
openerp/addons/base/ir/ir_values.py
+1 -1
View File
@@ -404,7 +404,7 @@ class ir_values(osv.osv):
results[action['name']] = (action['id'], action['name'], action_def)
except except_orm, e:
continue
return results.values()
return sorted(results.values())
def _map_legacy_model_list(self, model_list, map_fn, merge_results=False):
"""Apply map_fn to the various models passed, according to
openerp/addons/base/module/module.py
+1
View File
@@ -452,6 +452,7 @@ class module(osv.osv):
'sequence': terp.get('sequence', 100),
'application': terp.get('application', False),
'auto_install': terp.get('auto_install', False),
'icon': terp.get('icon', False),
}
# update the list of available packages
openerp/addons/base/module/wizard/base_module_upgrade.py
+3
View File
@@ -42,6 +42,9 @@ class base_module_upgrade(osv.osv_memory):
@return: New arch of view.
"""
res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
if view_type != 'form':
return res
record_id = context and context.get('active_id', False) or False
active_model = context.get('active_model')
if (not record_id) or (not active_model):
openerp/addons/base/res/res_country.py
+20 -32
View File
@@ -21,6 +21,23 @@
from osv import fields, osv
def location_name_search(self, cr, user, name='', args=None, operator='ilike',
context=None, limit=100):
if not args:
args = []
ids = []
if len(name) == 2:
ids = self.search(cr, user, [('code', 'ilike', name)] + args,
limit=limit, context=context)
search_domain = [('name', operator, name)]
if ids: search_domain.append(('id', 'not in', ids))
ids.extend(self.search(cr, user, search_domain + args,
limit=limit, context=context))
locations = self.name_get(cr, user, ids, context)
return sorted(locations, key=lambda (id, name): ids.index(id))
class Country(osv.osv):
_name = 'res.country'
@@ -48,23 +65,10 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
_defaults = {
'address_format': "%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
}
def name_search(self, cr, user, name='', args=None, operator='ilike',
context=None, limit=100):
if not args:
args=[]
if not context:
context={}
ids = False
if len(name) == 2:
ids = self.search(cr, user, [('code', 'ilike', name)] + args,
limit=limit, context=context)
if not ids:
ids = self.search(cr, user, [('name', operator, name)] + args,
limit=limit, context=context)
return self.name_get(cr, user, ids, context)
_order='name'
name_search = location_name_search
def create(self, cursor, user, vals, context=None):
if 'code' in vals:
vals['code'] = vals['code'].upper()
@@ -77,8 +81,6 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
return super(Country, self).write(cursor, user, ids, vals,
context=context)
Country()
class CountryState(osv.osv):
_description="Country state"
@@ -90,23 +92,9 @@ class CountryState(osv.osv):
'code': fields.char('State Code', size=3,
help='The state code in three chars.\n', required=True),
}
def name_search(self, cr, user, name='', args=None, operator='ilike',
context=None, limit=100):
if not args:
args = []
if not context:
context = {}
ids = self.search(cr, user, [('code', 'ilike', name)] + args, limit=limit,
context=context)
if not ids:
ids = self.search(cr, user, [('name', operator, name)] + args,
limit=limit, context=context)
return self.name_get(cr, user, ids, context)
_order = 'code'
CountryState()
name_search = location_name_search
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
openerp/addons/base/res/res_partner.py
+27 -13
View File
@@ -346,21 +346,35 @@ class res_partner_address(osv.osv):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
if not context:
context={}
if context.get('contact_display', 'contact')=='partner ' or context.get('contact_display', 'contact')=='partner_address ' :
ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context)
args = []
if context is None:
context = {}
if not name:
ids = self.search(cr, user, args, limit=limit, context=context)
elif context.get('contact_display', 'contact') == 'partner':
ids = self.search(cr, user, [('partner_id', operator, name)] + args, limit=limit, context=context)
else:
if not name:
ids = self.search(cr, user, args, limit=limit, context=context)
# first lookup zip code, as it is a common and efficient way to search on these data
ids = self.search(cr, user, [('zip', '=', name)] + args, limit=limit, context=context)
# then search on other fields:
if context.get('contact_display', 'contact') == 'partner_address':
fields = ['partner_id', 'name', 'country_id', 'city', 'street']
else:
ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit, context=context)
if not ids:
ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit, context=context)
if name:
ids += self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
ids += self.search(cr, user, [('partner_id',operator,name)] + args, limit=limit, context=context)
fields = ['name', 'country_id', 'city', 'street']
# Here we have to search the records that satisfy the domain:
# OR([[(f, operator, name)] for f in fields])) + args
# Searching on such a domain can be dramatically inefficient, due to the expansion made
# for field translations, and the handling of the disjunction by the DB engine itself.
# So instead, we search field by field until the search limit is reached.
while len(ids) < limit and fields:
f = fields.pop(0)
new_ids = self.search(cr, user, [(f, operator, name)] + args, limit=limit, context=context)
# extend ids with the ones in new_ids that are not in ids yet (and keep order)
old_ids = set(ids)
ids.extend([id for id in new_ids if id not in old_ids])
ids = ids[:limit]
return self.name_get(cr, user, ids, context=context)
def get_city(self, cr, uid, id):
openerp/addons/base/res/res_partner_view.xml
+8 -7
View File
@@ -6,7 +6,11 @@
web_icon_hover="data/sales-hover.png"
groups="base.group_sale_salesman"/>
<menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" sequence="1"
/>
<!-- <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/> -->
<menuitem id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="30"
groups="group_system"/>
@@ -175,7 +179,7 @@
</kanban>
</field>
</record>
<record id="action_partner_address_form" model="ir.actions.act_window">
<field name="name">Addresses</field>
<field name="type">ir.actions.act_window</field>
@@ -198,9 +202,6 @@
<field name="view_id" ref="view_partner_address_form1"/>
<field name="act_window_id" ref="action_partner_address_form"/>
</record>
<menuitem action="action_partner_address_form" id="menu_partner_address_form"
groups="base.group_extended" name="Contacts"
parent="base.menu_address_book" sequence="30"/>
<!--
=========================================
@@ -524,8 +525,8 @@
<menuitem
action="action_partner_form"
id="menu_partner_form"
parent="base.menu_address_book"
sequence="2"/>
parent="base.menu_sales"
sequence="8"/>
<record id="action_partner_customer_form" model="ir.actions.act_window">
<field name="name">Customers</field>
openerp/addons/base/res/res_security.xml
+2 -2
View File
@@ -35,8 +35,8 @@
<field name="name">user rule</field>
<field model="ir.model" name="model_id" ref="model_res_users"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
</record>
</data>
</data>
</openerp>
openerp/addons/base/res/res_users.py
+14 -13
View File
@@ -34,6 +34,9 @@ from service import security
from tools.translate import _
import openerp
import openerp.exceptions
from lxml import etree
from lxml.builder import E
import io, StringIO
from PIL import Image
@@ -780,29 +783,27 @@ class groups_view(osv.osv):
# and introduces the reified group fields
view = self.get_user_groups_view(cr, uid, context)
if view:
xml = u"""<?xml version="1.0" encoding="utf-8"?>
<!-- GENERATED AUTOMATICALLY BY GROUPS -->
<field name="groups_id" position="replace">
%s
%s
</field>
"""
xml1, xml2 = [], []
xml1.append('<separator string="%s" colspan="4"/>' % _('Applications'))
xml1.append(E.separator(string=_('Application'), colspan="4"))
for app, kind, gs in self.get_groups_by_application(cr, uid, context):
if kind == 'selection':
# application name with a selection field
field_name = name_selection_groups(map(int, gs))
xml1.append('<field name="%s"/>' % field_name)
xml1.append('<newline/>')
xml1.append(E.field(name=field_name))
xml1.append(E.newline())
else:
# application separator with boolean fields
app_name = app and app.name or _('Other')
xml2.append('<separator string="%s" colspan="4"/>' % app_name)
xml2.append(E.separator(string=app_name, colspan="4"))
for g in gs:
field_name = name_boolean_group(g.id)
xml2.append('<field name="%s"/>' % field_name)
view.write({'arch': xml % ('\n'.join(xml1), '\n'.join(xml2))})
xml2.append(E.field(name=field_name))
xml = E.field(*(xml1 + xml2), name="groups_id", position="replace")
xml.addprevious(etree.Comment("GENERATED AUTOMATICALLY BY GROUPS"))
xml_content = etree.tostring(xml, pretty_print=True, xml_declaration=True, encoding="utf-8")
view.write({'arch': xml_content})
return True
def get_user_groups_view(self, cr, uid, context=None):
openerp/loglevels.py
+16 -11
View File
@@ -121,17 +121,22 @@ def get_encodings(hint_encoding='utf-8'):
if prefenc:
yield prefenc
def ustr(value, hint_encoding='utf-8'):
"""This method is similar to the builtin `str` method, except
it will return unicode() string.
def ustr(value, hint_encoding='utf-8', errors='strict'):
"""This method is similar to the builtin `unicode`, except
that it may try multiple encodings to find one that works
for decoding `value`, and defaults to 'utf-8' first.
@param value: the value to convert
@param hint_encoding: an optional encoding that was detected
upstream and should be tried first to
decode ``value``.
@rtype: unicode
@return: unicode string
:param: value: the value to convert
:param: hint_encoding: an optional encoding that was detecte
upstream and should be tried first to decode ``value``.
:param str error: optional `errors` flag to pass to the unicode
built-in to indicate how illegal character values should be
treated when converting a string: 'strict', 'ignore' or 'replace'.
Passing anything other than 'strict' means that the first
encoding tried will be used, even if it's not the correct
one to use, so be careful! Ignore if value is not a string/unicode.
:rtype: unicode
:raise: UnicodeError if value cannot be coerced to unicode
"""
if isinstance(value, Exception):
return exception_to_unicode(value)
@@ -147,7 +152,7 @@ def ustr(value, hint_encoding='utf-8'):
for ln in get_encodings(hint_encoding):
try:
return unicode(value, ln)
return unicode(value, ln, errors=errors)
except Exception:
pass
raise UnicodeError('unable to convert %r' % (value,))
openerp/modules/loading.py
+1 -1
View File
@@ -151,7 +151,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
_logger.debug('loading %d packages...', len(graph))
# get db timestamp
cr.execute("select now()::timestamp")
cr.execute("select (now() at time zone 'UTC')::timestamp")
dt_before_load = cr.fetchone()[0]
# register, instantiate and initialize models for each modules
openerp/netsvc.py
+2
View File
@@ -357,6 +357,8 @@ def dispatch_rpc(service_name, method, params):
if rpc_request and rpc_response_flag:
log(rpc_request,logging.DEBUG,'%s.%s'%(service_name,method), replace_request_password(params))
threading.current_thread().uid = None
threading.current_thread().dbname = None
result = ExportService.getService(service_name).dispatch(method, params)
if rpc_request_flag or rpc_response_flag:
openerp/osv/fields.py
+9 -1
View File
@@ -364,7 +364,15 @@ class time(_column):
class binary(_column):
_type = 'binary'
_symbol_c = '%s'
_symbol_f = lambda symb: symb and Binary(symb) or None
# Binary values may be byte strings (python 2.6 byte array), but
# the legacy OpenERP convention is to transfer and store binaries
# as base64-encoded strings. The base64 string may be provided as a
# unicode in some circumstances, hence the str() cast in symbol_f.
# This str coercion will only work for pure ASCII unicode strings,
# on purpose - non base64 data must be passed as a 8bit byte strings.
_symbol_f = lambda symb: symb and Binary(str(symb)) or None
_symbol_set = (_symbol_c, _symbol_f)
_symbol_get = lambda self, x: x and str(x)
openerp/osv/orm.py
+67 -45
View File
@@ -750,7 +750,7 @@ class BaseModel(object):
name_id = 'model_'+self._name.replace('.', '_')
cr.execute('select * from ir_model_data where name=%s and module=%s', (name_id, context['module']))
if not cr.rowcount:
cr.execute("INSERT INTO ir_model_data (name,date_init,date_update,module,model,res_id) VALUES (%s, now(), now(), %s, %s, %s)", \
cr.execute("INSERT INTO ir_model_data (name,date_init,date_update,module,model,res_id) VALUES (%s, (now() at time zone 'UTC'), (now() at time zone 'UTC'), %s, %s, %s)", \
(name_id, context['module'], 'ir.model', model_id)
)
@@ -816,7 +816,7 @@ class BaseModel(object):
cr.execute("select name from ir_model_data where name=%s", (name1,))
if cr.fetchone():
name1 = name1 + "_" + str(id)
cr.execute("INSERT INTO ir_model_data (name,date_init,date_update,module,model,res_id) VALUES (%s, now(), now(), %s, %s, %s)", \
cr.execute("INSERT INTO ir_model_data (name,date_init,date_update,module,model,res_id) VALUES (%s, (now() at time zone 'UTC'), (now() at time zone 'UTC'), %s, %s, %s)", \
(name1, context['module'], 'ir.model.fields', id)
)
else:
@@ -872,11 +872,11 @@ class BaseModel(object):
for parent_name in ((type(parent_names)==list) and parent_names or [parent_names]):
parent_model = pool.get(parent_name)
if not getattr(cls, '_original_module', None) and name == parent_model._name:
cls._original_module = parent_model._original_module
if not parent_model:
raise TypeError('The model "%s" specifies an unexisting parent class "%s"\n'
'You may need to add a dependency on the parent class\' module.' % (name, parent_name))
if not getattr(cls, '_original_module', None) and name == parent_model._name:
cls._original_module = parent_model._original_module
parent_class = parent_model.__class__
nattr = {}
for s in attributes:
@@ -2690,7 +2690,7 @@ class BaseModel(object):
elif val in dict(self._columns[field].selection(self, cr, uid, context=context)):
return
raise except_orm(_('ValidateError'),
_('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
_('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
def _check_removed_columns(self, cr, log=False):
# iterate on the database columns to drop the NOT NULL constraints
@@ -2733,6 +2733,50 @@ class BaseModel(object):
_schema.debug("Table '%s': added foreign key '%s' with definition=REFERENCES \"%s\" ON DELETE %s",
source_table, source_field, dest_model._table, ondelete)
def _drop_constraint(self, cr, source_table, constraint_name):
cr.execute("ALTER TABLE %s DROP CONSTRAINT %s" % (source_table,constraint_name))
def _m2o_fix_foreign_key(self, cr, source_table, source_field, dest_model, ondelete):
# Find FK constraint(s) currently established for the m2o field,
# and see whether they are stale or not
cr.execute("""SELECT confdeltype as ondelete_rule, conname as constraint_name,
cl2.relname as foreign_table
FROM pg_constraint as con, pg_class as cl1, pg_class as cl2,
pg_attribute as att1, pg_attribute as att2
WHERE con.conrelid = cl1.oid
AND cl1.relname = %s
AND con.confrelid = cl2.oid
AND array_lower(con.conkey, 1) = 1
AND con.conkey[1] = att1.attnum
AND att1.attrelid = cl1.oid
AND att1.attname = %s
AND array_lower(con.confkey, 1) = 1
AND con.confkey[1] = att2.attnum
AND att2.attrelid = cl2.oid
AND att2.attname = %s
AND con.contype = 'f'""", (source_table, source_field, 'id'))
constraints = cr.dictfetchall()
if constraints:
if len(constraints) == 1:
# Is it the right constraint?
cons, = constraints
if cons['ondelete_rule'] != POSTGRES_CONFDELTYPES.get((ondelete or 'set null').upper(), 'a')\
or cons['foreign_table'] != dest_model._table:
_schema.debug("Table '%s': dropping obsolete FK constraint: '%s'",
source_table, cons['constraint_name'])
self._drop_constraint(cr, source_table, cons['constraint_name'])
self._m2o_add_foreign_key_checked(source_field, dest_model, ondelete)
# else it's all good, nothing to do!
else:
# Multiple FKs found for the same field, drop them all, and re-create
for cons in constraints:
_schema.debug("Table '%s': dropping duplicate FK constraints: '%s'",
source_table, cons['constraint_name'])
self._drop_constraint(cr, source_table, cons['constraint_name'])
self._m2o_add_foreign_key_checked(source_field, dest_model, ondelete)
def _auto_init(self, cr, context=None):
"""
@@ -2932,31 +2976,8 @@ class BaseModel(object):
if isinstance(f, fields.many2one):
dest_model = self.pool.get(f._obj)
ref = dest_model._table
if ref != 'ir_actions':
cr.execute('SELECT confdeltype, conname FROM pg_constraint as con, pg_class as cl1, pg_class as cl2, '
'pg_attribute as att1, pg_attribute as att2 '
'WHERE con.conrelid = cl1.oid '
'AND cl1.relname = %s '
'AND con.confrelid = cl2.oid '
'AND cl2.relname = %s '
'AND array_lower(con.conkey, 1) = 1 '
'AND con.conkey[1] = att1.attnum '
'AND att1.attrelid = cl1.oid '
'AND att1.attname = %s '
'AND array_lower(con.confkey, 1) = 1 '
'AND con.confkey[1] = att2.attnum '
'AND att2.attrelid = cl2.oid '
'AND att2.attname = %s '
"AND con.contype = 'f'", (self._table, ref, k, 'id'))
res2 = cr.dictfetchall()
if res2:
if res2[0]['confdeltype'] != POSTGRES_CONFDELTYPES.get((f.ondelete or 'set null').upper(), 'a'):
cr.execute('ALTER TABLE "' + self._table + '" DROP CONSTRAINT "' + res2[0]['conname'] + '"')
self._m2o_add_foreign_key_checked(k, dest_model, f.ondelete)
cr.commit()
_schema.debug("Table '%s': column '%s': XXX",
self._table, k)
if dest_model._table != 'ir_actions':
self._m2o_fix_foreign_key(cr, self._table, k, dest_model, f.ondelete)
# The field doesn't exist in database. Create it if necessary.
else:
@@ -3152,6 +3173,9 @@ class BaseModel(object):
_sql_constraints.
"""
def unify_cons_text(txt):
return txt.lower().replace(', ',',').replace(' (','(')
for (key, con, _) in self._sql_constraints:
conname = '%s_%s' % (self._table, key)
@@ -3181,7 +3205,7 @@ class BaseModel(object):
# constraint does not exists:
sql_actions['add']['execute'] = True
sql_actions['add']['msg_err'] = sql_actions['add']['msg_err'] % (sql_actions['add']['query'], )
elif con.lower() not in [item['condef'].lower() for item in existing_constraints]:
elif unify_cons_text(con) not in [unify_cons_text(item['condef']) for item in existing_constraints]:
# constraint exists but its definition has changed:
sql_actions['drop']['execute'] = True
sql_actions['drop']['msg_ok'] = sql_actions['drop']['msg_ok'] % (existing_constraints[0]['condef'].lower(), )
@@ -3416,8 +3440,8 @@ class BaseModel(object):
return "date_trunc('second', %s) as %s" % (f_qual, f)
if f == self.CONCURRENCY_CHECK_FIELD:
if self._log_access:
return "COALESCE(%s.write_date, %s.create_date, now())::timestamp AS %s" % (self._table, self._table, f,)
return "now()::timestamp AS %s" % (f,)
return "COALESCE(%s.write_date, %s.create_date, (now() at time zone 'UTC'))::timestamp AS %s" % (self._table, self._table, f,)
return "(now() at time zone 'UTC')::timestamp AS %s" % (f,)
if isinstance(self._columns[f], fields.binary) and context.get('bin_size', False):
return 'length(%s) as "%s"' % (f_qual, f)
return f_qual
@@ -3598,7 +3622,7 @@ class BaseModel(object):
return
if not (context.get(self.CONCURRENCY_CHECK_FIELD) and self._log_access):
return
check_clause = "(id = %s AND %s < COALESCE(write_date, create_date, now())::timestamp)"
check_clause = "(id = %s AND %s < COALESCE(write_date, create_date, (now() at time zone 'UTC'))::timestamp)"
for sub_ids in cr.split_for_in_conditions(ids):
ids_to_check = []
for id in sub_ids:
@@ -3882,7 +3906,7 @@ class BaseModel(object):
if self._log_access:
upd0.append('write_uid=%s')
upd0.append('write_date=now()')
upd0.append("write_date=(now() at time zone 'UTC')")
upd1.append(user)
if len(upd0):
@@ -4149,7 +4173,7 @@ class BaseModel(object):
self._check_selection_field_value(cr, user, field, vals[field], context=context)
if self._log_access:
upd0 += ',create_uid,create_date'
upd1 += ',%s,now()'
upd1 += ",%s,(now() at time zone 'UTC')"
upd2.append(user)
cr.execute('insert into "'+self._table+'" (id'+upd0+") values ("+str(id_new)+upd1+')', tuple(upd2))
self.check_access_rule(cr, user, [id_new], 'create', context=context)
@@ -4382,13 +4406,11 @@ class BaseModel(object):
domain = domain[:]
# if the object has a field named 'active', filter out all inactive
# records unless they were explicitely asked for
if 'active' in self._columns and (active_test and context.get('active_test', True)):
if 'active' in self._all_columns and (active_test and context.get('active_test', True)):
if domain:
active_in_args = False
for a in domain:
if a[0] == 'active':
active_in_args = True
if not active_in_args:
# the item[0] trick below works for domain items and '&'/'|'/'!'
# operators too
if not any(item[0] == 'active' for item in domain):
domain.insert(0, ('active', '=', 1))
else:
domain = [('active', '=', 1)]
@@ -4852,15 +4874,15 @@ class BaseModel(object):
def _transient_clean_rows_older_than(self, cr, seconds):
assert self._transient, "Model %s is not transient, it cannot be vacuumed!" % self._name
cr.execute("SELECT id FROM " + self._table + " WHERE"
" COALESCE(write_date, create_date, now())::timestamp <"
" (now() - interval %s)", ("%s seconds" % seconds,))
" COALESCE(write_date, create_date, (now() at time zone 'UTC'))::timestamp <"
" ((now() at time zone 'UTC') - interval %s)", ("%s seconds" % seconds,))
ids = [x[0] for x in cr.fetchall()]
self.unlink(cr, SUPERUSER_ID, ids)
def _transient_clean_old_rows(self, cr, count):
assert self._transient, "Model %s is not transient, it cannot be vacuumed!" % self._name
cr.execute(
"SELECT id, COALESCE(write_date, create_date, now())::timestamp"
"SELECT id, COALESCE(write_date, create_date, (now() at time zone 'UTC'))::timestamp"
" AS t FROM " + self._table +
" ORDER BY t LIMIT %s", (count,))
ids = [x[0] for x in cr.fetchall()]
openerp/release.py
+1 -1
View File
@@ -30,7 +30,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
# properly comparable using normal operarors, for example:
# (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
# (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
version_info = (6,1,0,FINAL,0)
version_info = (6,2,0,ALPHA,0)
version = '.'.join(map(str,version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
major_version = '.'.join(map(str,version_info[:2]))
openerp/service/web_services.py
+16
View File
@@ -173,6 +173,8 @@ class db(netsvc.ExportService):
raise Exception, e
def exp_drop(self, db_name):
if not self.exp_db_exist(db_name):
return False
openerp.modules.registry.RegistryManager.delete(db_name)
sql_db.close_db(db_name)
@@ -180,6 +182,17 @@ class db(netsvc.ExportService):
cr = db.cursor()
cr.autocommit(True) # avoid transaction block
try:
# Try to terminate all other connections that might prevent
# dropping the database
try:
cr.execute("""SELECT pg_terminate_backend(procpid)
FROM pg_stat_activity
WHERE datname = %s AND
procpid != pg_backend_pid()""",
(db_name,))
except Exception:
pass
try:
cr.execute('DROP DATABASE "%s"' % db_name)
except Exception, e:
@@ -561,6 +574,7 @@ class objects_proxy(netsvc.ExportService):
def dispatch(self, method, params):
(db, uid, passwd ) = params[0:3]
threading.current_thread().uid = uid
params = params[3:]
if method == 'obj_list':
raise NameError("obj_list has been discontinued via RPC as of 6.0, please query ir.model directly!")
@@ -594,6 +608,7 @@ class wizard(netsvc.ExportService):
def dispatch(self, method, params):
(db, uid, passwd ) = params[0:3]
threading.current_thread().uid = uid
params = params[3:]
if method not in ['execute','create']:
raise KeyError("Method not supported %s" % method)
@@ -645,6 +660,7 @@ class report_spool(netsvc.ExportService):
def dispatch(self, method, params):
(db, uid, passwd ) = params[0:3]
threading.current_thread().uid = uid
params = params[3:]
if method not in ['report', 'report_get', 'render_report']:
raise KeyError("Method not supported %s" % method)
openerp/tests/test_ir_sequence.py
+1
View File
@@ -96,6 +96,7 @@ class test_ir_sequence_no_gap(unittest2.TestCase):
"""
cr0 = cursor()
cr1 = cursor()
cr1._default_log_exceptions = False # Prevent logging a traceback
msg_re = '^could not obtain lock on row in relation "ir_sequence"$'
with self.assertRaisesRegexp(psycopg2.OperationalError, msg_re):
n0 = registry('ir.sequence').get(cr0, ADMIN_USER_ID, 'test_sequence_type_2', {})
openerp/tools/graph.py
+12 -16
View File
@@ -313,7 +313,8 @@ class graph(object):
self.order[level] = self.order[level]+1
for sec_end in self.transitions.get(node, []):
self.init_order(sec_end, self.result[sec_end]['x'])
if node!=sec_end:
self.init_order(sec_end, self.result[sec_end]['x'])
def order_heuristic(self):
@@ -438,33 +439,27 @@ class graph(object):
l.reverse()
no = len(l)
if no%2==0:
first_half = l[no/2:]
factor = 1
else:
first_half = l[no/2+1:]
factor = 0
rest = no%2
first_half = l[no/2+rest:]
last_half = l[:no/2]
i=1
for child in first_half:
self.result[child]['y'] = mid_pos - (i - (factor * 0.5))
i += 1
for i, child in enumerate(first_half):
self.result[child]['y'] = mid_pos - (i+1 - (0 if rest else 0.5))
if self.transitions.get(child, False):
if last:
self.result[child]['y'] = last + len(self.transitions[child])/2 + 1
last = self.tree_order(child, last)
if no%2:
if rest:
mid_node = l[no/2]
self.result[mid_node]['y'] = mid_pos
if self.transitions.get((mid_node), False):
if last:
self.result[mid_node]['y'] = last + len(self.transitions[mid_node])/2 + 1
last = self.tree_order(mid_node)
if node!=mid_node:
last = self.tree_order(mid_node)
else:
if last:
self.result[mid_node]['y'] = last + 1
@@ -474,13 +469,14 @@ class graph(object):
i=1
last_child = None
for child in last_half:
self.result[child]['y'] = mid_pos + (i - (factor * 0.5))
self.result[child]['y'] = mid_pos + (i - (0 if rest else 0.5))
last_child = child
i += 1
if self.transitions.get(child, False):
if last:
self.result[child]['y'] = last + len(self.transitions[child])/2 + 1
last = self.tree_order(child, last)
if node!=child:
last = self.tree_order(child, last)
if last_child:
last = self.result[last_child]['y']
openerp/tools/misc.py
+2 -2
View File
@@ -3,7 +3,7 @@
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
# Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -383,7 +383,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
res = mail_server_pool.send_email(cr, uid or 1, email_msg, mail_server_id=None,
smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password,
smtp_encryption=('ssl' if ssl else None), debug=debug)
smtp_encryption=('ssl' if ssl else None), smtp_debug=debug)
except Exception:
_logger.exception("tools.email_send failed to deliver email")
return False
openerp/tools/sql.py
+2 -4
View File
@@ -20,9 +20,7 @@
##############################################################################
def drop_view_if_exists(cr, viewname):
cr.execute("select count(1) from pg_class where relkind=%s and relname=%s", ('v', viewname,))
if cr.fetchone()[0]:
cr.execute("DROP view %s" % (viewname,))
cr.commit()
cr.execute("DROP view IF EXISTS %s CASCADE" % (viewname,))
cr.commit()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: