summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/controllers/main.py1
-rw-r--r--addons/web/i18n/ar.po24
-rw-r--r--addons/web/i18n/bs.po100
-rw-r--r--addons/web/i18n/fr.po11
-rw-r--r--addons/web/i18n/nl.po8
-rw-r--r--addons/web/i18n/ro.po88
-rw-r--r--addons/web/i18n/zh_CN.po24
-rw-r--r--addons/web/static/src/css/base.css2
-rw-r--r--addons/web/static/src/css/base.sass2
-rw-r--r--addons/web/static/src/js/chrome.js3
-rw-r--r--addons/web/static/src/js/search.js18
-rw-r--r--addons/web/static/src/js/view_form.js96
-rw-r--r--addons/web/static/src/js/view_list.js7
-rw-r--r--addons/web/views/webclient_templates.xml2
14 files changed, 212 insertions, 174 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 6f4a58da38c..75d40bcf8e0 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -796,6 +796,7 @@ class Session(http.Controller):
"user_context": request.session.get_context() if request.session.uid else {},
"db": request.session.db,
"username": request.session.login,
+ "company_id": request.env.user.company_id.id if request.session.uid else None,
}
@http.route('/web/session/get_session_info', type='json', auth="none")
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 62356459297..af10df480b8 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-14 16:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-10-20 18:32+0000\n"
+"Last-Translator: kifcaliph <Unknown>\n"
"Language-Team: Arabic <ar@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: 2014-09-24 10:03+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 07:54+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
#. module: web
#. openerp-web
@@ -498,7 +498,7 @@ msgstr "إلغاء"
#: code:addons/web/static/src/xml/base.xml:272
#, python-format
msgid "Change Master Password"
-msgstr "تغيير كلمة السر الرئيسية"
+msgstr "تغيير كلمة المرور الرئيسة"
#. module: web
#. openerp-web
@@ -652,7 +652,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:410
#, python-format
msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
-msgstr "كافة حقوق النشر محفوظة لكيوبكس لحلول الأعمال © 2010 - اليوم."
+msgstr "كافة الحقوق محفوظة © 2004 - اليوم لشركة OpenERP SA."
#. module: web
#. openerp-web
@@ -957,7 +957,7 @@ msgstr "تحميل \"%s\""
#: code:addons/web/static/src/xml/base.xml:306
#, python-format
msgid "Drop"
-msgstr "إزالة"
+msgstr "حذف"
#. module: web
#. openerp-web
@@ -1820,7 +1820,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:411
#, python-format
msgid "OpenERP SA Company"
-msgstr "كيوبكس لحلول الأعمال"
+msgstr "شركة OpenERP SA"
#. module: web
#. openerp-web
@@ -1999,7 +1999,7 @@ msgstr "استعادة قاعدة بيانات"
#: code:addons/web/static/src/js/chrome.js:595
#, python-format
msgid "Restored"
-msgstr "مستعادة"
+msgstr "تم استعادته"
#. module: web
#. openerp-web
@@ -2156,8 +2156,8 @@ msgid ""
"Select a .CSV file to import. If you need a sample of file to import,\n"
" you should use the export tool with the \"Import Compatible\" option."
msgstr ""
-"اختر ملف .CSV للإستيراد. إذا كنت بحاجة إلى عينة ملف للاستيراد،\n"
-" يجب عليك إستخدام أداة تصدير مع الخيار \" Compatible\" option."
+"اختر ملف CSV لاستيراده. إذا كنت تحتاج لملف عينة\n"
+" عليك استخدام أداة التصدير وتحديد اختيار \"ملائمة الاستيراد\"."
#. module: web
#. openerp-web
@@ -2628,7 +2628,7 @@ msgstr "عرض"
#: code:addons/web/static/src/xml/base.xml:535
#, python-format
msgid "View Fields"
-msgstr "عرض الحقول"
+msgstr "حقول الواجهة"
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index 63274601f26..181211c31df 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-14 16:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-11-06 01:23+0000\n"
+"Last-Translator: IRNPS <koljenovic@gmail.com>\n"
"Language-Team: Bosnian <bs@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: 2014-09-24 10:03+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-07 07:36+0000\n"
+"X-Generator: Launchpad (build 17231)\n"
#. module: web
#. openerp-web
@@ -23,7 +23,7 @@ msgstr ""
#: code:addons/web/static/src/js/search.js:2289
#, python-format
msgid "%(field)s %(operator)s"
-msgstr "%(field)s %(operator)s"
+msgstr ""
#. module: web
#. openerp-web
@@ -58,14 +58,14 @@ msgstr "%d / %d"
#: code:addons/web/static/src/js/core.js:679
#, python-format
msgid "%d days ago"
-msgstr "%d dan(a) prije"
+msgstr "prije %d dana"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/core.js:677
#, python-format
msgid "%d hours ago"
-msgstr "%d sati prije"
+msgstr "prije %d sati"
#. module: web
#. openerp-web
@@ -79,14 +79,14 @@ msgstr "prije %d minuta"
#: code:addons/web/static/src/js/core.js:681
#, python-format
msgid "%d months ago"
-msgstr "%d mjeseci prije"
+msgstr "prije %d mjeseci"
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/core.js:683
#, python-format
msgid "%d years ago"
-msgstr "%d godina prije"
+msgstr "prije %d godina"
#. module: web
#. openerp-web
@@ -170,7 +170,7 @@ msgstr "(Svaki postojeći filter sa istim imenom će biti zamjenjen)"
#: code:addons/web/static/src/xml/base.xml:381
#, python-format
msgid "(Formerly OpenERP)"
-msgstr ""
+msgstr "(Prvobitno OpenERP)"
#. module: web
#. openerp-web
@@ -226,7 +226,7 @@ msgstr "Uvezi .CSV fajl"
#: code:addons/web/static/src/xml/base.xml:418
#, python-format
msgid "1367 Grand-Rosière"
-msgstr ""
+msgstr "1367 Grand-Rosière"
#. module: web
#. openerp-web
@@ -254,7 +254,7 @@ msgstr "O programu"
#: code:addons/web/static/src/xml/base.xml:360
#, python-format
msgid "About Odoo"
-msgstr ""
+msgstr "O Odoo-u"
#. module: web
#. openerp-web
@@ -414,14 +414,14 @@ msgstr "Rezervna kopija Baze"
#: code:addons/web/static/src/xml/base.xml:261
#, python-format
msgid "Backup Restore"
-msgstr ""
+msgstr "Vrati rezervnu kopiju"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:419
#, python-format
msgid "Belgium"
-msgstr ""
+msgstr "Belgija"
#. module: web
#. openerp-web
@@ -535,14 +535,14 @@ msgstr "Šifra je promijenjena"
#: code:addons/web/static/src/xml/base.xml:417
#, python-format
msgid "Chaussée de Namur 40"
-msgstr ""
+msgstr "Chaussée de Namur 40"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:114
#, python-format
msgid "Check this box to evaluate Odoo."
-msgstr ""
+msgstr "Označite ovaj okvir da ocijenite Odoo."
#. module: web
#. openerp-web
@@ -646,7 +646,7 @@ msgstr "Kontekst:"
#: code:addons/web/static/src/xml/base.xml:262
#, python-format
msgid "Copy of an existing database"
-msgstr ""
+msgstr "Kopija postojeće baze podataka"
#. module: web
#. openerp-web
@@ -720,7 +720,7 @@ msgstr "Kreiraj bazu podataka"
#: code:addons/web/static/src/js/view_form.js:3451
#, python-format
msgid "Create a %s"
-msgstr ""
+msgstr "Kreiraj %s"
#. module: web
#. openerp-web
@@ -741,7 +741,7 @@ msgstr "Kreiraj i Uredi..."
#: code:addons/web/static/src/xml/base.xml:1995
#, python-format
msgid "Create and edit"
-msgstr ""
+msgstr "Kreiraj i uredi"
#. module: web
#. openerp-web
@@ -782,7 +782,7 @@ msgstr "Prilagođeni filter"
#. module: web
#: view:website:web.database_select
msgid "Database"
-msgstr ""
+msgstr "Baza podataka"
#. module: web
#. openerp-web
@@ -878,7 +878,7 @@ msgstr "Odbaci"
#: code:addons/web/static/src/xml/base.xml:426
#, python-format
msgid "Discover Events of Odoo around the world..."
-msgstr ""
+msgstr "Otkrijte Odoo događaje širom svijeta..."
#. module: web
#. openerp-web
@@ -1043,7 +1043,7 @@ msgstr "Uredi radni tok"
#. module: web
#: view:website:web.login
msgid "Email"
-msgstr ""
+msgstr "Elektronska pošta"
#. module: web
#. openerp-web
@@ -1057,7 +1057,7 @@ msgstr "Šifriranje:"
#: code:addons/web/static/src/xml/website.tour.xml:25
#, python-format
msgid "End This Tutorial"
-msgstr ""
+msgstr "Završite ovaj vodič"
#. module: web
#. openerp-web
@@ -1071,7 +1071,7 @@ msgstr "Obriši trenutni datum"
#: code:addons/web/static/src/js/search.js:1870
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Greška"
#. module: web
#: code:addons/web/controllers/main.py:760
@@ -1135,14 +1135,14 @@ msgstr "Izvezi sve podatke"
#: code:addons/web/static/src/js/views.js:853
#, python-format
msgid "Failed to evaluate search criterions"
-msgstr ""
+msgstr "Kriteriji pretraživanja nisu prepoznati"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:1722
#, python-format
msgid "Favorites"
-msgstr ""
+msgstr "Favoriti"
#. module: web
#. openerp-web
@@ -1206,6 +1206,12 @@ msgid ""
"created,\n"
" you will be able to install your first application."
msgstr ""
+"Ispunite ovu formu za kreiranje Odoo baze podataka.\n"
+" Možete kreirati baze podataka za različite kompanije "
+"ili\n"
+" za različite svrhe (testna, produkcijska). Nakon "
+"kreiranja\n"
+" baze moći ćete instalirati vašu prvu aplikaciju."
#. module: web
#. openerp-web
@@ -1233,7 +1239,7 @@ msgstr "Ime filtera"
#: code:addons/web/static/src/js/search.js:1870
#, python-format
msgid "Filter name is required."
-msgstr ""
+msgstr "Unos naziva filtera je obavezan."
#. module: web
#. openerp-web
@@ -1255,7 +1261,7 @@ msgstr "Filteri"
#: code:addons/web/static/src/xml/base.xml:430
#, python-format
msgid "Follow Us..."
-msgstr ""
+msgstr "Pratite nas..."
#. module: web
#. openerp-web
@@ -1570,7 +1576,7 @@ msgstr ""
#: code:addons/web/static/src/js/views.js:991
#, python-format
msgid "Metadata (%s)"
-msgstr ""
+msgstr "Metapodaci (%s)"
#. module: web
#. openerp-web
@@ -1591,7 +1597,7 @@ msgstr "Minuta"
#: code:addons/web/static/src/xml/base.xml:259
#, python-format
msgid "Mode:"
-msgstr ""
+msgstr "Mod:"
#. module: web
#. openerp-web
@@ -1628,7 +1634,7 @@ msgstr "Više"
#: code:addons/web/static/src/xml/base.xml:359
#, python-format
msgid "My Odoo.com account"
-msgstr ""
+msgstr "Moj Odoo.com nalog"
#. module: web
#. openerp-web
@@ -1705,14 +1711,14 @@ msgstr "Nisu dati podatci."
#: code:addons/web/static/src/js/view_form.js:3383
#, python-format
msgid "No results to show..."
-msgstr ""
+msgstr "Nema rezultata za prikaz..."
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/view_form.js:3752
#, python-format
msgid "No value found for the field for value "
-msgstr ""
+msgstr "Unos nije pronađen za polje i vrijednost "
#. module: web
#. openerp-web
@@ -1740,26 +1746,26 @@ msgstr "Objekt:"
#: view:website:web.login_layout
#: view:website:web.menu_secondary
msgid "Odoo"
-msgstr ""
+msgstr "Odoo"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:377
#, python-format
msgid "Odoo (Formerly OpenERP)"
-msgstr ""
+msgstr "Odoo (prvobitno OpenERP)"
#. module: web
#: view:website:web.qunit_suite
msgid "Odoo Web Tests"
-msgstr ""
+msgstr "Odoo Web Testovi"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:411
#, python-format
msgid "Odoo is a trademark of the"
-msgstr ""
+msgstr "Odoo je trgovački znak"
#. module: web
#. openerp-web
@@ -1840,14 +1846,14 @@ msgstr "Originalno ime baze"
#: code:addons/web/static/src/xml/base.xml:427
#, python-format
msgid "Our next Events"
-msgstr ""
+msgstr "Naši naredni događaji"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:423
#, python-format
msgid "Our website"
-msgstr ""
+msgstr "Naša web stranica"
#. module: web
#. openerp-web
@@ -1897,7 +1903,7 @@ msgstr "Molimo Vas da unesete prijašnju šifru"
#: code:addons/web/static/src/xml/base.xml:1847
#, python-format
msgid "Please note that only the selected ids will be exported."
-msgstr ""
+msgstr "Obratite pažnju da će biti izvezeni samo označeni zapisi."
#. module: web
#. openerp-web
@@ -1907,6 +1913,8 @@ msgid ""
"Please pay attention that all records matching your search filter will be "
"exported. Not only the selected ids."
msgstr ""
+"Obratite pažnju da će svi zapisi koji odgovaraju filteru vašeg pretraživanja "
+"biti izvezeni, bez obzira na označene zapise."
#. module: web
#. openerp-web
@@ -1975,7 +1983,7 @@ msgstr "Ukloni sve"
#: code:addons/web/static/src/js/view_form.js:3752
#, python-format
msgid "Render"
-msgstr ""
+msgstr "Iscrtaj"
#. module: web
#. openerp-web
@@ -2484,7 +2492,7 @@ msgstr "Danas"
#: code:addons/web/static/src/xml/base.xml:1029
#, python-format
msgid "Toggle Dropdown"
-msgstr ""
+msgstr "Aktiviraj/deaktiviraj padajući meni"
#. module: web
#. openerp-web
@@ -2535,7 +2543,7 @@ msgstr "Ne upravljan widget"
#: code:addons/web/static/src/js/view_form.js:3157
#, python-format
msgid "Unknown"
-msgstr ""
+msgstr "Nepoznato"
#. module: web
#. openerp-web
@@ -2643,7 +2651,7 @@ msgstr "Pogledaj polja"
#: code:addons/web/static/src/xml/base.xml:530
#, python-format
msgid "View Metadata"
-msgstr ""
+msgstr "Pogledaj Metapodatke"
#. module: web
#. openerp-web
@@ -2721,7 +2729,7 @@ msgstr "Da"
#: code:addons/web/static/src/js/view_form.js:3457
#, python-format
msgid "You are creating a new %s, are you sure it does not exist yet?"
-msgstr ""
+msgstr "Kreirate novu instancu %s, da li ste sigurni da ona već ne postoji?"
#. module: web
#: code:addons/web/controllers/main.py:791
@@ -2757,6 +2765,8 @@ msgstr "Morate izabrati makar jedan zapis."
#, python-format
msgid "Your Odoo session expired. Please refresh the current web page."
msgstr ""
+"Vaša Odoo sesija je istekla. Molimo vas da osvježite trenutnu web stranicu "
+"(F5 ili Ctrl+R)."
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index 0aaa87e2b01..7fdaad0879a 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -8,14 +8,15 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-19 16:02+0000\n"
-"Last-Translator: m3asmi <Unknown>\n"
+"PO-Revision-Date: 2014-11-06 21:18+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: French <fr@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: 2014-09-24 10:04+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-07 07:36+0000\n"
+"X-Generator: Launchpad (build 17231)\n"
#. module: web
#. openerp-web
@@ -1128,7 +1129,7 @@ msgstr "Type d'export :"
#: code:addons/web/static/src/xml/base.xml:1807
#, python-format
msgid "Export all Data"
-msgstr "Tout type de données"
+msgstr "Exporter toutes les données"
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 5b0cc44bc00..7bdc921a3f7 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-24 09:37+0000\n"
+"PO-Revision-Date: 2014-11-05 16:01+0000\n"
"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
"Language-Team: Dutch <nl@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: 2014-09-25 07:02+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-06 07:00+0000\n"
+"X-Generator: Launchpad (build 17223)\n"
#. module: web
#. openerp-web
@@ -483,7 +483,7 @@ msgstr "Niet mogelijk om de waarde %s te converteren."
#: code:addons/web/static/src/js/view_form.js:2467
#, python-format
msgid "Can't send email to invalid e-mail address"
-msgstr "Kan geen email versturen naar ongeldig emailadres"
+msgstr "Kan geen e-mail versturen naar ongeldig emailadres"
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index e1d902c8c14..b254e71ce53 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-17 10:48+0000\n"
-"Last-Translator: Simonel Criste <simi@erpsystems.ro>\n"
+"PO-Revision-Date: 2014-10-23 17:17+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\n"
"Language-Team: Romanian <ro@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: 2014-09-24 10:05+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-24 07:08+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
#. module: web
#. openerp-web
@@ -170,7 +170,7 @@ msgstr "(Toate filtrele existente cu același nume vor fi înlocuite)"
#: code:addons/web/static/src/xml/base.xml:381
#, python-format
msgid "(Formerly OpenERP)"
-msgstr ""
+msgstr "(Fost OpenERP)"
#. module: web
#. openerp-web
@@ -226,7 +226,7 @@ msgstr "1. Importă un fișier .CSV"
#: code:addons/web/static/src/xml/base.xml:418
#, python-format
msgid "1367 Grand-Rosière"
-msgstr ""
+msgstr "1367 Grand-Rosière"
#. module: web
#. openerp-web
@@ -421,7 +421,7 @@ msgstr "Restaurare din Backup"
#: code:addons/web/static/src/xml/base.xml:419
#, python-format
msgid "Belgium"
-msgstr ""
+msgstr "Belgia"
#. module: web
#. openerp-web
@@ -452,6 +452,9 @@ msgid ""
"By default, the master password is 'admin'. This password\n"
" is required to created, delete dump or restore databases."
msgstr ""
+"În mod implicit, parola master este \"admin\". Această parolă \n"
+"                     este necesară pentru a crea, șterge sau pentru a "
+"restabili bazele de date."
#. module: web
#. openerp-web
@@ -532,7 +535,7 @@ msgstr "Parolă modificată"
#: code:addons/web/static/src/xml/base.xml:417
#, python-format
msgid "Chaussée de Namur 40"
-msgstr ""
+msgstr "Chaussée de Namur 40"
#. module: web
#. openerp-web
@@ -739,7 +742,7 @@ msgstr "Creează și Editează..."
#: code:addons/web/static/src/xml/base.xml:1995
#, python-format
msgid "Create and edit"
-msgstr "Creaţi şi editaţi"
+msgstr "Creează și editează"
#. module: web
#. openerp-web
@@ -869,14 +872,14 @@ msgstr "Demarcare:"
#: code:addons/web/static/src/xml/base.xml:1517
#, python-format
msgid "Discard"
-msgstr "Renunță"
+msgstr "Abandoneză"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:426
#, python-format
msgid "Discover Events of Odoo around the world..."
-msgstr ""
+msgstr "Descoperă Evenimente de Odoo din întreaga lume ...."
#. module: web
#. openerp-web
@@ -1001,7 +1004,7 @@ msgstr "Copiere baza de date"
#: code:addons/web/static/src/js/view_form.js:2467
#, python-format
msgid "E-mail Error"
-msgstr ""
+msgstr "Eroare E-mail"
#. module: web
#. openerp-web
@@ -1022,7 +1025,7 @@ msgstr "Editează acțiunea"
#. module: web
#: view:website:web.menu_secondary
msgid "Edit Company data"
-msgstr "Editează Datele companiei"
+msgstr "Editează datele companiei"
#. module: web
#. openerp-web
@@ -1041,7 +1044,7 @@ msgstr "Editează Fluxul de lucru"
#. module: web
#: view:website:web.login
msgid "Email"
-msgstr ""
+msgstr "Email"
#. module: web
#. openerp-web
@@ -1055,7 +1058,7 @@ msgstr "Codificare:"
#: code:addons/web/static/src/xml/website.tour.xml:25
#, python-format
msgid "End This Tutorial"
-msgstr ""
+msgstr "Termină acest tutorial"
#. module: web
#. openerp-web
@@ -1069,7 +1072,7 @@ msgstr "Stergeti data curenta"
#: code:addons/web/static/src/js/search.js:1870
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Eroare"
#. module: web
#: code:addons/web/controllers/main.py:760
@@ -1133,14 +1136,14 @@ msgstr "Exportă toate datele"
#: code:addons/web/static/src/js/views.js:853
#, python-format
msgid "Failed to evaluate search criterions"
-msgstr ""
+msgstr "Nu a reușit să evalueze criteriile de căutare"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:1722
#, python-format
msgid "Favorites"
-msgstr ""
+msgstr "Favorite"
#. module: web
#. openerp-web
@@ -1204,6 +1207,12 @@ msgid ""
"created,\n"
" you will be able to install your first application."
msgstr ""
+"Completați acest formular pentru a crea o bază de date Odoo. Puteți \n"
+"                     crea baze de date pentru diferite firme sau pentru "
+"diferite \n"
+"                     obiective (de testare, de producție). Odată ce baza de "
+"date este creată, \n"
+"                     veți fi capabili de a instala prima aplicație."
#. module: web
#. openerp-web
@@ -1231,7 +1240,7 @@ msgstr "Numele filtrului"
#: code:addons/web/static/src/js/search.js:1870
#, python-format
msgid "Filter name is required."
-msgstr ""
+msgstr "Este necesar nume filtru."
#. module: web
#. openerp-web
@@ -1253,7 +1262,7 @@ msgstr "Filtre"
#: code:addons/web/static/src/xml/base.xml:430
#, python-format
msgid "Follow Us..."
-msgstr ""
+msgstr "Urmați-ne ..."
#. module: web
#. openerp-web
@@ -1455,7 +1464,7 @@ msgstr "Lista"
#: code:addons/web/static/src/xml/base.xml:111
#, python-format
msgid "Load demonstration data:"
-msgstr ""
+msgstr "Încarcă date demonstrative:"
#. module: web
#. openerp-web
@@ -1567,7 +1576,7 @@ msgstr ""
#: code:addons/web/static/src/js/views.js:991
#, python-format
msgid "Metadata (%s)"
-msgstr ""
+msgstr "Metadate (%s)"
#. module: web
#. openerp-web
@@ -1588,7 +1597,7 @@ msgstr "Minut"
#: code:addons/web/static/src/xml/base.xml:259
#, python-format
msgid "Mode:"
-msgstr ""
+msgstr "Mod:"
#. module: web
#. openerp-web
@@ -1625,7 +1634,7 @@ msgstr "Mai mult(e)"
#: code:addons/web/static/src/xml/base.xml:359
#, python-format
msgid "My Odoo.com account"
-msgstr ""
+msgstr "Contul meu Odoo.com"
#. module: web
#. openerp-web
@@ -1702,7 +1711,7 @@ msgstr "Nu au fost furnizate date."
#: code:addons/web/static/src/js/view_form.js:3383
#, python-format
msgid "No results to show..."
-msgstr ""
+msgstr "Niciun rezultat pentru a fi arătat..."
#. module: web
#. openerp-web
@@ -1737,33 +1746,33 @@ msgstr "Obiect:"
#: view:website:web.login_layout
#: view:website:web.menu_secondary
msgid "Odoo"
-msgstr ""
+msgstr "Odoo"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:377
#, python-format
msgid "Odoo (Formerly OpenERP)"
-msgstr ""
+msgstr "Odoo (Fost OpenERP)"
#. module: web
#: view:website:web.qunit_suite
msgid "Odoo Web Tests"
-msgstr ""
+msgstr "Odoo Teste Web"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:411
#, python-format
msgid "Odoo is a trademark of the"
-msgstr ""
+msgstr "Odoo este o marcă înregistrată a"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:413
#, python-format
msgid "Odoo.com"
-msgstr ""
+msgstr "Odoo.com"
#. module: web
#. openerp-web
@@ -1816,7 +1825,7 @@ msgstr "Deschide: "
#: code:addons/web/static/src/xml/base.xml:416
#, python-format
msgid "OpenERP S.A."
-msgstr ""
+msgstr "OpenERP S.A."
#. module: web
#. openerp-web
@@ -1844,7 +1853,7 @@ msgstr ""
#: code:addons/web/static/src/xml/base.xml:423
#, python-format
msgid "Our website"
-msgstr ""
+msgstr "Websitul nostru"
#. module: web
#. openerp-web
@@ -1979,7 +1988,7 @@ msgstr ""
#: code:addons/web/static/src/js/view_form.js:2497
#, python-format
msgid "Resource Error"
-msgstr ""
+msgstr "Eroare resursă"
#. module: web
#. openerp-web
@@ -2358,7 +2367,7 @@ msgstr "Următoarele câmpuri sunt nevalide:"
#: code:addons/web/static/src/js/view_list_editable.js:780
#, python-format
msgid "The form's data can not be discarded"
-msgstr "Datele formularului nu pot fi înlăturate"
+msgstr "Datele formularului nu pot fi aboandonate"
#. module: web
#. openerp-web
@@ -2465,7 +2474,7 @@ msgstr "Data"
#: code:addons/web/static/src/js/chrome.js:1333
#, python-format
msgid "Timezone Mismatch"
-msgstr ""
+msgstr "Nepotrivire zonă timp"
#. module: web
#. openerp-web
@@ -2537,7 +2546,7 @@ msgstr "Widget netratat"
#: code:addons/web/static/src/js/view_form.js:3157
#, python-format
msgid "Unknown"
-msgstr ""
+msgstr "Necunoscut(ă)"
#. module: web
#. openerp-web
@@ -2595,7 +2604,7 @@ msgstr "Se încarcă..."
#: code:addons/web/static/src/js/views.js:1311
#, python-format
msgid "Uploading Error"
-msgstr ""
+msgstr "Eroare încărcare"
#. module: web
#. openerp-web
@@ -2631,7 +2640,7 @@ msgstr "Versiune"
#: code:addons/web/static/src/xml/base.xml:541
#, python-format
msgid "View"
-msgstr "Vizualizează"
+msgstr "Vizualizare"
#. module: web
#. openerp-web
@@ -2672,7 +2681,7 @@ msgid ""
"Are you sure you want to leave this page ?"
msgstr ""
"Avertizare, înregistrarea a fost modificată, schimbările dumneavoastră vor "
-"fi ignorate.\n"
+"fi abandonate.\n"
"\n"
"Sunteți sigur(ă) ca doriți să închideți aceasta pagina?"
@@ -2760,6 +2769,7 @@ msgstr "Trebuie să selectați cel putin o înregistrare."
#, python-format
msgid "Your Odoo session expired. Please refresh the current web page."
msgstr ""
+"Sesiunea de Odoo a expirat. Vă rog să dați refresh la pagina curentă."
#. module: web
#. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 4f12ac98eda..7d5855beab2 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-20 02:49+0000\n"
+"PO-Revision-Date: 2014-10-19 11:50+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@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: 2014-09-24 10:06+0000\n"
+"X-Launchpad-Export-Date: 2014-10-20 07:20+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: web
@@ -170,7 +170,7 @@ msgstr "（任何已存在的同名过滤器都会被替换）"
#: code:addons/web/static/src/xml/base.xml:381
#, python-format
msgid "(Formerly OpenERP)"
-msgstr ""
+msgstr "（原 OpenERP）"
#. module: web
#. openerp-web
@@ -226,7 +226,7 @@ msgstr "1. 导入 .CSV 文件"
#: code:addons/web/static/src/xml/base.xml:418
#, python-format
msgid "1367 Grand-Rosière"
-msgstr ""
+msgstr "1367 Grand-Rosière"
#. module: web
#. openerp-web
@@ -421,7 +421,7 @@ msgstr "备份还原"
#: code:addons/web/static/src/xml/base.xml:419
#, python-format
msgid "Belgium"
-msgstr ""
+msgstr "比利时"
#. module: web
#. openerp-web
@@ -532,7 +532,7 @@ msgstr "已更改密码"
#: code:addons/web/static/src/xml/base.xml:417
#, python-format
msgid "Chaussée de Namur 40"
-msgstr ""
+msgstr "Chaussée de Namur 40"
#. module: web
#. openerp-web
@@ -875,7 +875,7 @@ msgstr "放弃"
#: code:addons/web/static/src/xml/base.xml:426
#, python-format
msgid "Discover Events of Odoo around the world..."
-msgstr ""
+msgstr "发现世界范围里的 Odoo 活动..."
#. module: web
#. openerp-web
@@ -1254,7 +1254,7 @@ msgstr "过滤器"
#: code:addons/web/static/src/xml/base.xml:430
#, python-format
msgid "Follow Us..."
-msgstr ""
+msgstr "关注我们..."
#. module: web
#. openerp-web
@@ -1739,7 +1739,7 @@ msgstr "Odoo"
#: code:addons/web/static/src/xml/base.xml:377
#, python-format
msgid "Odoo (Formerly OpenERP)"
-msgstr ""
+msgstr "Odoo（原 OpenERP）"
#. module: web
#: view:website:web.qunit_suite
@@ -1811,7 +1811,7 @@ msgstr "打开： "
#: code:addons/web/static/src/xml/base.xml:416
#, python-format
msgid "OpenERP S.A."
-msgstr ""
+msgstr "OpenERP S.A."
#. module: web
#. openerp-web
@@ -1832,14 +1832,14 @@ msgstr "原来的数据库名:"
#: code:addons/web/static/src/xml/base.xml:427
#, python-format
msgid "Our next Events"
-msgstr ""
+msgstr "我们近期的活动"
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base.xml:423
#, python-format
msgid "Our website"
-msgstr ""
+msgstr "我们的网站"
#. module: web
#. openerp-web
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ae2bd2882da..67c2b4026b6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1699,7 +1699,7 @@
border-right: none;
}
.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
- width: 108px;
+ min-width: 108px;
border-top: 1px solid #cacaca;
margin-top: 4px;
padding-top: 4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2e6e28b6dbf..2ada1c8d883 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1424,7 +1424,7 @@ $sheet-padding: 16px
td.oe_form_group_cell_label
border-right: none
.oe_subtotal_footer_separator
- width: 108px
+ min-width: 108px
border-top: 1px solid #cacaca
margin-top: 4px
padding-top: 4px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 88da348ee17..c39e5bd4bc5 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1304,7 +1304,8 @@ instance.web.WebClient = instance.web.Client.extend({
}
},
update_logo: function() {
- var img = this.session.url('/web/binary/company_logo');
+ var company = this.session.company_id;
+ var img = this.session.url('/web/binary/company_logo' + (company ? '?company=' + company : ''));
this.$('.oe_logo img').attr('src', '').attr('src', img);
this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', this.session.uid === 1);
},
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 148f46677f5..3ae52df31bc 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -684,6 +684,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
},
childFocused: function () {
this.$el.addClass('active');
+ this.view_id = this.view_id || data.view_id;
},
childBlurred: function () {
this.$el.val('').removeClass('active').trigger('blur');
@@ -1390,7 +1391,10 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
var values = facet.values;
if (_.isEmpty(this.attrs.context) && values.length === 1) {
var c = {};
- c['default_' + this.attrs.name] = values.at(0).get('value');
+ var v = values.at(0);
+ if (v.get('operator') !== 'ilike') {
+ c['default_' + this.attrs.name] = v.get('value');
+ }
return c;
}
return this._super(facet);
@@ -2126,6 +2130,14 @@ instance.web.search.AutoComplete = instance.web.Widget.extend({
ev.preventDefault();
return;
}
+ // ENTER is caugth at KeyUp rather than KeyDown to avoid firing
+ // before all regular keystrokes have been processed
+ if (ev.which === $.ui.keyCode.ENTER) {
+ if (self.current_result && self.get_search_string().length) {
+ self.select_item(ev);
+ }
+ return;
+ }
if (!self.searching) {
self.searching = true;
return;
@@ -2140,8 +2152,10 @@ instance.web.search.AutoComplete = instance.web.Widget.extend({
});
this.$input.on('keydown', function (ev) {
switch (ev.which) {
+ // TAB and direction keys are handled at KeyDown because KeyUp
+ // is not guaranteed to fire.
+ // See e.g. https://github.com/aef-/jquery.masterblaster/issues/13
case $.ui.keyCode.TAB:
- case $.ui.keyCode.ENTER:
if (self.current_result && self.get_search_string().length) {
self.select_item(ev);
}
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a5ab2027939..9cf7d0a847f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -101,7 +101,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.fields_order = [];
this.datarecord = {};
this._onchange_specs = {};
- this.onchanges_defs = [];
+ this.onchanges_mutex = new $.Mutex();
this.default_focus_field = null;
this.default_focus_button = null;
this.fields_registry = instance.web.form.widgets;
@@ -508,44 +508,45 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
def = self.alive(new instance.web.Model(self.dataset.model).call(
"onchange", [ids, values, trigger_field_name, onchange_specs, context]));
}
- var onchange_def = def.then(function(response) {
- if (widget && widget.field['change_default']) {
- var fieldname = widget.name;
- var value_;
- if (response.value && (fieldname in response.value)) {
- // Use value from onchange if onchange executed
- value_ = response.value[fieldname];
- } else {
- // otherwise get form value for field
- value_ = self.fields[fieldname].get_value();
- }
- var condition = fieldname + '=' + value_;
-
- if (value_) {
- return self.alive(new instance.web.Model('ir.values').call(
- 'get_defaults', [self.model, condition]
- )).then(function (results) {
- if (!results.length) {
+ this.onchanges_mutex.exec(function(){
+ return def.then(function(response) {
+ if (widget && widget.field['change_default']) {
+ var fieldname = widget.name;
+ var value_;
+ if (response.value && (fieldname in response.value)) {
+ // Use value from onchange if onchange executed
+ value_ = response.value[fieldname];
+ } else {
+ // otherwise get form value for field
+ value_ = self.fields[fieldname].get_value();
+ }
+ var condition = fieldname + '=' + value_;
+
+ if (value_) {
+ return self.alive(new instance.web.Model('ir.values').call(
+ 'get_defaults', [self.model, condition]
+ )).then(function (results) {
+ if (!results.length) {
+ return response;
+ }
+ if (!response.value) {
+ response.value = {};
+ }
+ for(var i=0; i<results.length; ++i) {
+ // [whatever, key, value]
+ var triplet = results[i];
+ response.value[triplet[1]] = triplet[2];
+ }
return response;
- }
- if (!response.value) {
- response.value = {};
- }
- for(var i=0; i<results.length; ++i) {
- // [whatever, key, value]
- var triplet = results[i];
- response.value[triplet[1]] = triplet[2];
- }
- return response;
- });
+ });
+ }
}
- }
- return response;
- }).then(function(response) {
- return self.on_processed_onchange(response);
+ return response;
+ }).then(function(response) {
+ return self.on_processed_onchange(response);
+ });
});
- this.onchanges_defs.push(onchange_def);
- return onchange_def;
+ return this.onchanges_mutex.def;
} catch(e) {
console.error(e);
instance.webclient.crashmanager.show_message(e);
@@ -586,21 +587,18 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
var self = this;
return this.mutating_mutex.exec(function() {
function iterate() {
- var start = $.Deferred();
- start.resolve();
- start = _.reduce(self.onchanges_defs, function(memo, d){
- return memo.then(function(){
- return d;
- }, function(){
- return d;
- });
- }, start);
- var defs = [start];
+
+ var mutex = new $.Mutex();
_.each(self.fields, function(field) {
- defs.push(field.commit_value());
+ self.onchanges_mutex.def.then(function(){
+ mutex.exec(function(){
+ return field.commit_value();
+ });
+ });
});
+
var args = _.toArray(arguments);
- return $.when.apply($, defs).then(function() {
+ return $.when.apply(null, [mutex.def, self.onchanges_mutex.def]).then(function() {
var save_obj = self.save_list.pop();
if (save_obj) {
return self._process_save(save_obj).then(function() {
@@ -654,7 +652,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
* if the current record is not yet saved. It will then stay in create mode.
*/
to_edit_mode: function() {
- this.onchanges_defs = [];
+ this.onchanges_mutex = new $.Mutex();
this._actualize_mode("edit");
},
/**
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index c520d4d2012..31dee2927d2 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -535,6 +535,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
},
reload_record: function (record) {
var self = this;
+ var fields = this.fields_view.fields;
return this.dataset.read_ids(
[record.get('id')],
_.pluck(_(this.columns).filter(function (r) {
@@ -547,8 +548,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
self.records.remove(record);
return;
}
- _(_.keys(values)).each(function(key){
- record.set(key, values[key], {silent: true});
+ _.each(values, function (value, key) {
+ if (fields[key] && fields[key].type === 'many2many')
+ record.set(key + '__display', false, {silent: true});
+ record.set(key, value, {silent: true});
});
record.trigger('change', record);
});
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index ca97997f598..08b0f73118f 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -236,7 +236,7 @@
<t t-set="body_classname" t-value="'oe_single_form'"/>
<div class="oe_single_form_container modal-content">
<div class="oe_single_form_logo">
- <img src="/web/binary/company_logo"/>
+ <img t-attf-src="/web/binary/company_logo{{ '?dbname='+db if db else '' }}"/>
</div>
<hr/>
<t t-raw="0"/>
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-23 19:35:26 +0000