summaryrefslogtreecommitdiff
path: root/addons/analytic
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-12-10 13:05:58 +0100
committerChristophe Simonis <chs@odoo.com>2015-12-10 13:05:58 +0100
commit82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (patch)
tree6c5e8cc0247d5fe08d24e9abae38fe353fbebc56 /addons/analytic
parent0bc2ddae784bf80c4c809d8b7f6d642d576f92a1 (diff)
parent4022493c0b85f966e499b6c03ac7cce5556f15e6 (diff)
[MERGE] forward port of branch saas-7 up to 4022493
Diffstat (limited to 'addons/analytic')
-rw-r--r--addons/analytic/i18n/el.po22
-rw-r--r--addons/analytic/i18n/es_CO.po52
-rw-r--r--addons/analytic/i18n/fi.po6
-rw-r--r--addons/analytic/i18n/ja.po7
-rw-r--r--addons/analytic/i18n/lt.po8
-rw-r--r--addons/analytic/i18n/uk.po9
-rw-r--r--addons/analytic/i18n/zh_TW.po4
-rw-r--r--addons/analytic/models/analytic.py6
8 files changed, 60 insertions, 54 deletions
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index e1e19b1d0f2..374481ffdee 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-11-21 23:27+0000\n"
+"PO-Revision-Date: 2015-12-05 23:23+0000\n"
"Last-Translator: Goutoudis Kostas <goutoudis@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "(Διατηρήστε κενό για να ανοίξετε την τρÎ
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_chart
msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Πίνακας Αναλυτικών Λογαριασμών"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_currency_id
@@ -106,7 +106,7 @@ msgstr ""
#. module: analytic
#: selection:account.analytic.account,account_type:0
msgid "Analytic View"
-msgstr ""
+msgstr "Αναλυτική Προβολή"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_search
@@ -127,7 +127,7 @@ msgstr "Ακύρωση"
#: model:ir.actions.act_window,name:analytic.action_account_analytic_chart
#: model:ir.actions.act_window,name:analytic.action_analytic_account_form
msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Πίνακας Αναλυτικών Λογαριασμών"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.action_analytic_account_form
@@ -148,12 +148,12 @@ msgstr "Εταιρεία"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_form
msgid "Cost/Revenue"
-msgstr ""
+msgstr "Κόστος/Έσοδα"
#. module: analytic
#: model:ir.actions.act_window,name:analytic.account_analytic_line_action
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Κόστος και Έσοδα"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
@@ -197,7 +197,7 @@ msgstr "Πελάτης"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_date
msgid "Date"
-msgstr "Ημερ/νία"
+msgstr "Ημερομηνία"
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_last_post
@@ -378,7 +378,7 @@ msgstr ""
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Αναζήτηση Αναλυτικών Γραμμών"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
@@ -394,12 +394,12 @@ msgstr "Ετικέτες"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
msgid "Tasks Month"
-msgstr ""
+msgstr "Μηνιαία Καθήκοντα"
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_line_currency_id
msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Το σχετικό νόμισμα του λογαριασμού εάν δεν είναι ίδιο με το νόμισμα της εταιρίας."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_to_date
@@ -414,7 +414,7 @@ msgstr "Σύνολο"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_account_type
msgid "Type of Account"
-msgstr ""
+msgstr "Είδος Λογαριασμού"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_unread
diff --git a/addons/analytic/i18n/es_CO.po b/addons/analytic/i18n/es_CO.po
index eaa4f431006..18668c6c415 100644
--- a/addons/analytic/i18n/es_CO.po
+++ b/addons/analytic/i18n/es_CO.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-10-24 06:18+0000\n"
+"PO-Revision-Date: 2015-11-28 06:58+0000\n"
"Last-Translator: Mateo Tibaquirá <nestormateo@gmail.com>\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/odoo/odoo-9/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -26,12 +26,12 @@ msgstr "(Conservarlo vacío para abrir la situación actual)"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_chart
msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Plan de Cuentas Analítico"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_currency_id
msgid "Account Currency"
-msgstr ""
+msgstr "Moneda de la Cuenta"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction
@@ -57,7 +57,7 @@ msgstr "Cuenta Analítica"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Planes de Cuentas Analíticas"
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
@@ -68,7 +68,7 @@ msgstr "Contabilidad Analítica"
#: model:ir.actions.act_window,name:analytic.action_account_analytic_account_form
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_list
msgid "Analytic Accounts"
-msgstr ""
+msgstr "Cuentas Analíticas"
#. module: analytic
#: model:ir.actions.act_window,name:analytic.account_analytic_line_action_entries
@@ -96,17 +96,17 @@ msgstr "Líneas Analíticas"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_name
msgid "Analytic Tag"
-msgstr ""
+msgstr "Etiqueta Analítica"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_tag
msgid "Analytic Tags"
-msgstr ""
+msgstr "Etiquetas Analíticas"
#. module: analytic
#: selection:account.analytic.account,account_type:0
msgid "Analytic View"
-msgstr ""
+msgstr "Vista Analítica"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_search
@@ -116,7 +116,7 @@ msgstr "Asociado Relacionado"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_balance
msgid "Balance"
-msgstr "Balance"
+msgstr "Saldo"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
@@ -127,12 +127,12 @@ msgstr "Cancelar"
#: model:ir.actions.act_window,name:analytic.action_account_analytic_chart
#: model:ir.actions.act_window,name:analytic.action_analytic_account_form
msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Plan de Cuentas Analíticas"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.action_analytic_account_form
msgid "Click to add an analytic account."
-msgstr ""
+msgstr "Clic para añadir una cuenta analítica."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_color
@@ -148,12 +148,12 @@ msgstr "Compañía"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_form
msgid "Cost/Revenue"
-msgstr ""
+msgstr "Costo/Beneficio"
#. module: analytic
#: model:ir.actions.act_window,name:analytic.account_analytic_line_action
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Costos e Ingresos"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
@@ -161,7 +161,7 @@ msgstr ""
msgid ""
"Costs will be created automatically when you register supplier\n"
" invoices, expenses or timesheets."
-msgstr ""
+msgstr "Los costos se crearán automáticamente cuando registre las facturas\nde proveedor, gastos o partes de horas."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_create_uid
@@ -207,7 +207,7 @@ msgstr "Fecha del último mensaje publicado en el registro."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_debit
msgid "Debit"
-msgstr ""
+msgstr "Débito"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_name
@@ -273,7 +273,7 @@ msgid ""
"In Odoo, sale orders and projects are implemented using\n"
" analytic accounts. You can track costs and revenues to analyse\n"
" your margins easily."
-msgstr ""
+msgstr "En Odoo, las órdenes de venta y los proyectos se implementan\nusando cuentas analíticas. Usted puede realizar seguimiento de\nlos costos e ingresos para analizar sus márgenes fácilmente."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_is_follower
@@ -317,17 +317,17 @@ msgstr "Mensajes"
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_ids
msgid "Messages and communication history"
-msgstr "Mensajes e historial de comunicación"
+msgstr "Historial de mensajes y de comunicación"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
msgid "No activity yet on this account."
-msgstr ""
+msgstr "No hay actividad en esta cuenta todavía."
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action_entries
msgid "No activity yet."
-msgstr ""
+msgstr "Sin actividad aún."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction_counter
@@ -347,7 +347,7 @@ msgstr "Número de mensajes no leidos"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
msgid "Open Charts"
-msgstr ""
+msgstr "Abrir Planes"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_partner_id
@@ -373,17 +373,17 @@ msgid ""
" invoices. Customer invoices can be created based on sale orders\n"
" (fixed price invoices), on timesheets (based on the work done) or\n"
" on expenses (e.g. reinvoicing of travel costs)."
-msgstr ""
+msgstr "Los ingresos se crearán automáticamente cuando cree facturas de cliente.\nLas facturas de cliente se pueden crear basadas en órdenes de venta\n(facturas de precio fijo), en los partes de horas (basados en el trabajo realizado)\no en los gastos (ej. refacturación de gastos de viaje)."
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Buscar Líneas Analíticas"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Seleccione el Periodo de Análisis"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_tag_ids
@@ -399,12 +399,12 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_line_currency_id
msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "La moneda de la cuenta relacionada no es igual al de la compañía."
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_to_date
msgid "To"
-msgstr ""
+msgstr "A"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_tree
@@ -434,4 +434,4 @@ msgstr "Usuario"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_form
msgid "e.g. Project XYZ"
-msgstr ""
+msgstr "ej. Proyecto XYZ"
diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po
index 195ec3e88c2..ca9c264a947 100644
--- a/addons/analytic/i18n/fi.po
+++ b/addons/analytic/i18n/fi.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-10-02 12:26+0000\n"
+"PO-Revision-Date: 2015-12-04 20:23+0000\n"
"Last-Translator: Kari Lindgren <kari.lindgren@emsystems.fi>\n"
"Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n"
"MIME-Version: 1.0\n"
@@ -147,12 +147,12 @@ msgstr "Yritys"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_form
msgid "Cost/Revenue"
-msgstr ""
+msgstr "Kustannus/Tulot"
#. module: analytic
#: model:ir.actions.act_window,name:analytic.account_analytic_line_action
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Kustannukset ja tulot"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
diff --git a/addons/analytic/i18n/ja.po b/addons/analytic/i18n/ja.po
index 069e227fc92..3a67fa7c623 100644
--- a/addons/analytic/i18n/ja.po
+++ b/addons/analytic/i18n/ja.po
@@ -3,13 +3,14 @@
# * analytic
#
# Translators:
+# Yoshi Tashiro <tashiro@roomsfor.hk>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-11-09 12:37+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2015-12-05 03:28+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
"Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -341,7 +342,7 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_unread_counter
msgid "Number of unread messages"
-msgstr "未読メッセージの件数"
+msgstr "未読メッセージ数"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
diff --git a/addons/analytic/i18n/lt.po b/addons/analytic/i18n/lt.po
index 8263513a240..7db558f78a9 100644
--- a/addons/analytic/i18n/lt.po
+++ b/addons/analytic/i18n/lt.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-11-11 12:14+0000\n"
+"PO-Revision-Date: 2015-11-22 16:11+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Lithuanian (http://www.transifex.com/odoo/odoo-9/language/lt/)\n"
"MIME-Version: 1.0\n"
@@ -331,17 +331,17 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction_counter
msgid "Number of Actions"
-msgstr ""
+msgstr "Veiksmų skaičius"
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction_counter
msgid "Number of messages which requires an action"
-msgstr ""
+msgstr "Žinučių, kurių prireiks veiksmui skaičius"
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_unread_counter
msgid "Number of unread messages"
-msgstr ""
+msgstr "Neperskaitytų žinučių skaičius"
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
diff --git a/addons/analytic/i18n/uk.po b/addons/analytic/i18n/uk.po
index 601ba48c77d..9c2c1bd0cad 100644
--- a/addons/analytic/i18n/uk.po
+++ b/addons/analytic/i18n/uk.po
@@ -3,13 +3,14 @@
# * analytic
#
# Translators:
+# Zoriana Zaiats, 2015
msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-10-14 10:39+0000\n"
-"Last-Translator: Bogdan\n"
+"PO-Revision-Date: 2015-11-26 11:04+0000\n"
+"Last-Translator: Zoriana Zaiats\n"
"Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_color
msgid "Color Index"
-msgstr ""
+msgstr "Індекс кольору"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_company_id
@@ -152,7 +153,7 @@ msgstr ""
#. module: analytic
#: model:ir.actions.act_window,name:analytic.account_analytic_line_action
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Витрати та прибутки"
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
diff --git a/addons/analytic/i18n/zh_TW.po b/addons/analytic/i18n/zh_TW.po
index 93a3539bb8c..f1a8ecc7c8d 100644
--- a/addons/analytic/i18n/zh_TW.po
+++ b/addons/analytic/i18n/zh_TW.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-09-30 09:24+0000\n"
+"PO-Revision-Date: 2015-12-04 06:06+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/odoo/odoo-9/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr "日期"
#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_last_post
msgid "Date of the last message posted on the record."
-msgstr ""
+msgstr "釋出到記錄上的最後資訊的日期"
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_debit
diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py
index b1759ac7406..45de1c26198 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@ -77,7 +77,11 @@ class account_analytic_account(models.Model):
@api.model
def name_search(self, name='', args=None, operator='ilike', limit=100):
args = args or []
- recs = self.search(['|', '|', ('code', operator, name), ('partner_id.name', operator, name), ('name', operator, name)] + args, limit=limit)
+ domain = ['|', ('code', operator, name), ('name', operator, name)]
+ partners = self.env['res.partner'].search([('name', operator, name)], limit=limit)
+ if partners:
+ domain = ['|'] + domain + [('partner_id', 'in', partners.ids)]
+ recs = self.search(domain + args, limit=limit)
return recs.name_get()