diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-04-12 11:12:57 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-04-12 11:12:57 +0200 |
| commit | eb443410ff0bd1bbec33a8d76dc9b279dbf34d70 (patch) | |
| tree | f4656e3f36b5843d31da8f4b4b3a62aa505340fd /addons/web | |
| parent | 282538cbfe4bec36434812d99ea190ea824bcf2b (diff) | |
| parent | afba8cec23bd5f803d26c196beeb73467c7743aa (diff) | |
[MERGE] forward port of branch 9.0 up to afba8ce
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/i18n/bs.po | 4 | ||||
| -rw-r--r-- | addons/web/i18n/da.po | 6 | ||||
| -rw-r--r-- | addons/web/i18n/nb.po | 4 | ||||
| -rw-r--r-- | addons/web/i18n/ru.po | 4 | ||||
| -rw-r--r-- | addons/web/i18n/sl.po | 4 | ||||
| -rw-r--r-- | addons/web/i18n/th.po | 166 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.css | 1 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_view.js | 29 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_view.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_widget.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 13 |
12 files changed, 124 insertions, 115 deletions
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po index 21af5c9c050..527a6926a5f 100644 --- a/addons/web/i18n/bs.po +++ b/addons/web/i18n/bs.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-01-21 10:35+0000\n" +"PO-Revision-Date: 2016-04-04 22:41+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Bosnian (http://www.transifex.com/odoo/odoo-9/language/bs/)\n" "MIME-Version: 1.0\n" @@ -1607,7 +1607,7 @@ msgstr "" #: code:addons/web/static/src/js/views/form_widgets.js:671 #, python-format msgid "Off" -msgstr "" +msgstr "Isključeno" #. module: web #. openerp-web diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po index e1ff107d499..dc6d35ff863 100644 --- a/addons/web/i18n/da.po +++ b/addons/web/i18n/da.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-01-21 10:35+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2016-04-08 09:07+0000\n" +"Last-Translator: Morten Schou <ms@msteknik.dk>\n" "Language-Team: Danish (http://www.transifex.com/odoo/odoo-9/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1574,7 +1574,7 @@ msgstr "" #: code:addons/web/static/src/js/views/form_widgets.js:1675 #, python-format msgid "Odoo Enterprise" -msgstr "" +msgstr "Odoo Enterprise" #. module: web #. openerp-web diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po index a076ecdadea..971dcc7f747 100644 --- a/addons/web/i18n/nb.po +++ b/addons/web/i18n/nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-01-21 10:35+0000\n" +"PO-Revision-Date: 2016-03-30 10:02+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/odoo/odoo-9/language/nb/)\n" "MIME-Version: 1.0\n" @@ -397,7 +397,7 @@ msgstr "Bruk" #: code:addons/web/static/src/js/views/list_view.js:308 #, python-format msgid "Archive" -msgstr "" +msgstr "Arkiver" #. module: web #. openerp-web diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po index f2df961cd6b..ccd7146540a 100644 --- a/addons/web/i18n/ru.po +++ b/addons/web/i18n/ru.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-02-22 19:18+0000\n" +"PO-Revision-Date: 2016-04-03 17:50+0000\n" "Last-Translator: Sergey Vilizhanin <sv@grimmette.ru>\n" "Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n" "MIME-Version: 1.0\n" @@ -261,7 +261,7 @@ msgstr "Доступ запрещён" #: code:addons/web/static/src/js/framework/crash_manager.js:21 #, python-format msgid "Access Error" -msgstr "Ошыбка доступа" +msgstr "Ошибка доступа" #. module: web #. openerp-web diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po index f8975ff73a1..c2d980a8722 100644 --- a/addons/web/i18n/sl.po +++ b/addons/web/i18n/sl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-01-21 10:35+0000\n" +"PO-Revision-Date: 2016-03-27 21:03+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Slovenian (http://www.transifex.com/odoo/odoo-9/language/sl/)\n" "MIME-Version: 1.0\n" @@ -367,7 +367,7 @@ msgstr "Napredno iskanje ..." #: code:addons/web/static/src/js/framework/dialog.js:162 #, python-format msgid "Alert" -msgstr "" +msgstr "Opozorilo" #. module: web #. openerp-web diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po index 065a07af692..11729d7b05e 100644 --- a/addons/web/i18n/th.po +++ b/addons/web/i18n/th.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-03-18 15:29+0000\n" +"PO-Revision-Date: 2016-04-04 09:47+0000\n" "Last-Translator: Khwunchai Jaengsawang <khwunchai.j@ku.th>\n" "Language-Team: Thai (http://www.transifex.com/odoo/odoo-9/language/th/)\n" "MIME-Version: 1.0\n" @@ -120,7 +120,7 @@ msgstr "%s (%d)" #. module: web #: model:ir.ui.view,arch_db:web.webclient_bootstrap msgid "<!--[if lte IE 9]>" -msgstr "" +msgstr "<!--[if lte IE 9]>" #. module: web #: model:ir.ui.view,arch_db:web.layout @@ -131,7 +131,7 @@ msgstr "<!DOCTYPE html>" #. module: web #: model:ir.ui.view,arch_db:web.webclient_bootstrap msgid "<![endif]-->" -msgstr "" +msgstr "<![endif]-->" #. module: web #. openerp-web @@ -194,7 +194,7 @@ msgstr "(%d บันทึก)" #: code:addons/web/static/src/xml/base.xml:106 #, python-format msgid "(Community Edition)" -msgstr "" +msgstr "(Community Edition)" #. module: web #. openerp-web @@ -215,7 +215,7 @@ msgstr "(ไม่มีป้าย)" #: code:addons/web/static/src/js/framework/utils.js:300 #, python-format msgid ",k,M" -msgstr "" +msgstr ",k,M" #. module: web #. openerp-web @@ -227,12 +227,12 @@ msgstr "...กำลัง อัพโหลด..." #. module: web #: model:ir.ui.view,arch_db:web.menu_secondary msgid "<span class=\"oe_logo_edit\">Edit Company data</span>" -msgstr "" +msgstr "<span class=\"oe_logo_edit\">แก้ไขข้อมูลบริษัท</span>" #. module: web #: model:ir.ui.view,arch_db:web.menu_secondary msgid "<span>Odoo</span>" -msgstr "" +msgstr "<span>Odoo</span>" #. module: web #. openerp-web @@ -254,14 +254,14 @@ msgstr "ไม่ได้รับอนุญาตให้เข้าใช #: code:addons/web/static/src/js/framework/crash_manager.js:21 #, python-format msgid "Access Error" -msgstr "" +msgstr "การเข้าถึงผิดพลาด" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1503 #, python-format msgid "Access to all Enterprise Apps" -msgstr "" +msgstr "เข้าถึงแอพทั้งหมดสำหรับองค์กร" #. module: web #. openerp-web @@ -289,14 +289,14 @@ msgstr "รหัสการกระทำ:" #: code:addons/web/static/src/js/views/form_widgets.js:660 #, python-format msgid "Activate" -msgstr "" +msgstr "เปิดใช้งาน" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:96 #, python-format msgid "Activate the developer mode" -msgstr "" +msgstr "เปิดใช้งานโหมดนักพัฒนา" #. module: web #. openerp-web @@ -368,7 +368,7 @@ msgstr "ค้นหาอย่างละเอียด..." #: code:addons/web/static/src/js/framework/dialog.js:162 #, python-format msgid "Alert" -msgstr "" +msgstr "เตือน" #. module: web #. openerp-web @@ -382,7 +382,7 @@ msgstr "ผู้ใช้ทั้งหมด" #: code:addons/web/static/src/xml/base.xml:1508 #, python-format msgid "And more" -msgstr "" +msgstr "และอีกมากมาย" #. module: web #. openerp-web @@ -398,21 +398,21 @@ msgstr "นำไปใช้" #: code:addons/web/static/src/js/views/list_view.js:308 #, python-format msgid "Archive" -msgstr "" +msgstr "เก็บ" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:671 #, python-format msgid "Archived" -msgstr "" +msgstr "เก็บแล้ว" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search_menus.js:243 #, python-format msgid "Are you sure that you want to remove this filter?" -msgstr "" +msgstr "คุณแน่ใจหรือว่าต้องการลบตัวกรองนี้?" #. module: web #. openerp-web @@ -433,21 +433,21 @@ msgstr "ฟิลด์ที่ใช้ได้" #: code:addons/web/static/src/xml/base.xml:616 #, python-format msgid "Bar Chart" -msgstr "" +msgstr "กราฟแท่ง" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/list_view.js:1955 #, python-format msgid "Binary file" -msgstr "" +msgstr "ไฟล์ไบนารี่" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1507 #, python-format msgid "Bugfixes guarantee" -msgstr "" +msgstr "รับประกันการแก้ไขข้อผิดพลาด" #. module: web #. openerp-web @@ -581,7 +581,7 @@ msgstr "บริบท" #: code:addons/web/static/src/xml/base.xml:116 #, python-format msgid "Copyright © 2004-2015 Odoo S.A." -msgstr "" +msgstr "ลิขสิทธิ์ © 2004-2015 Odoo S.A." #. module: web #. openerp-web @@ -704,7 +704,7 @@ msgstr "วัน" #: code:addons/web/static/src/js/views/form_widgets.js:658 #, python-format msgid "Deactivate" -msgstr "" +msgstr "ปิดการใช้งาน" #. module: web #. openerp-web @@ -800,14 +800,14 @@ msgstr "ดาวน์โหลด" #: code:addons/web/static/src/js/views/list_view.js:1962 #, python-format msgid "Download \"%s\"" -msgstr "ดาวโหลด \"%s\"" +msgstr "ดาวน์โหลด \"%s\"" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/pivot_view.js:123 #, python-format msgid "Download xls" -msgstr "" +msgstr "ดาวน์โหลด xls" #. module: web #. openerp-web @@ -864,7 +864,7 @@ msgstr "อีเมล" #: code:addons/web/static/src/xml/website.tour.xml:25 #, python-format msgid "End This Tutorial" -msgstr "" +msgstr "จบการสอน" #. module: web #. openerp-web @@ -892,7 +892,7 @@ msgstr "ข้อผิดพลาดในการทดสอบ" #: code:addons/web/static/src/xml/base.xml:599 #, python-format msgid "Expand all" -msgstr "" +msgstr "ขยายทั้งหมด" #. module: web #. openerp-web @@ -1006,7 +1006,7 @@ msgstr "ตัวกรอง" #: code:addons/web/static/src/js/views/search_menus.js:83 #, python-format msgid "Filter name is required." -msgstr "" +msgstr "ต้องมีชื่อตัวกรอง" #. module: web #. openerp-web @@ -1020,7 +1020,7 @@ msgstr "กรองด้วย: %s" #: code:addons/web/static/src/js/views/search_menus.js:90 #, python-format msgid "Filter with same name already exists." -msgstr "" +msgstr "ชื่อตัวกรองนี้มีอยู่แล้ว" #. module: web #. openerp-web @@ -1034,14 +1034,14 @@ msgstr "ตัวกรอง" #: code:addons/web/static/src/xml/base.xml:649 #, python-format msgid "Flip axis" -msgstr "" +msgstr "กลับแกน" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:119 #, python-format msgid "For more information visit" -msgstr "" +msgstr "เข้าดูข้อมูลเพิ่มเติมได้ที่" #. module: web #. openerp-web @@ -1056,14 +1056,14 @@ msgstr "รูปแบบ" #: code:addons/web/static/src/xml/base.xml:118 #, python-format msgid "GNU Lesser General Public License" -msgstr "" +msgstr "GNU Lesser General Public License" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1500 #, python-format msgid "Get this feature and much more with Odoo Enterprise!" -msgstr "" +msgstr "รับคุณสมบัตินี้และคุณสมบัติอื่นอีกมากมายด้วย Odoo สำหรับองค์กร" #. module: web #. openerp-web @@ -1134,7 +1134,7 @@ msgstr "ส่งออก แบบนำเข้าที่เข้ากภ#: code:addons/web/static/src/js/views/form_widgets.js:665 #, python-format msgid "Inactive" -msgstr "" +msgstr "ไม่เปิดใช้งาน" #. module: web #. openerp-web @@ -1142,7 +1142,7 @@ msgstr "" #: code:addons/web/static/src/js/views/graph_widget.js:197 #, python-format msgid "Invalid data" -msgstr "" +msgstr "ข้อมูลไม่ถูกต้อง" #. module: web #. openerp-web @@ -1177,21 +1177,21 @@ msgstr "แก้ไขล่าสุดโดย:" #: code:addons/web/static/src/xml/base.xml:223 #, python-format msgid "Leave Debug Mode" -msgstr "" +msgstr "ออกจากโหมดนักพัฒนา" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:118 #, python-format msgid "Licenced under the terms of" -msgstr "" +msgstr "ได้รับใบอนุญาตภายใต้เงื่อนไขของ" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:617 #, python-format msgid "Line Chart" -msgstr "" +msgstr "กราฟเส้น" #. module: web #. openerp-web @@ -1285,14 +1285,14 @@ msgstr "บางทีคุณอาจจะลองโหลดโปรแ #: code:addons/web/static/src/xml/base.xml:570 #, python-format msgid "Measure" -msgstr "" +msgstr "วัด" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:602 #, python-format msgid "Measures" -msgstr "" +msgstr "ตัวชี้วัด" #. module: web #. openerp-web @@ -1313,14 +1313,14 @@ msgstr "วิธี:" #: code:addons/web/static/src/js/framework/crash_manager.js:22 #, python-format msgid "Missing Record" -msgstr "" +msgstr "รายการศูนย์หาย" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1505 #, python-format msgid "Mobile support" -msgstr "" +msgstr "รองรับโทรศัพท์มือถือ" #. module: web #. openerp-web @@ -1360,7 +1360,7 @@ msgstr "เพิ่มเติม" #. module: web #: model:ir.ui.view,arch_db:web.menu msgid "More <b class=\"caret\"/>" -msgstr "" +msgstr "เพิ่มเติม <b class=\"caret\"/>" #. module: web #. openerp-web @@ -1381,7 +1381,7 @@ msgstr "เลื่อนขึ้น" #: code:addons/web/static/src/js/tour.js:180 #, python-format msgid "Move your mouse" -msgstr "" +msgstr "เลื่อนเมาส์ของคุณ" #. module: web #. openerp-web @@ -1430,7 +1430,7 @@ msgstr "รหัสผ่านใหม่:" #: code:addons/web/static/src/xml/base.xml:1504 #, python-format msgid "New design" -msgstr "" +msgstr "ดีไซน์ใหม่" #. module: web #. openerp-web @@ -1444,7 +1444,7 @@ msgstr "ไม่" #: code:addons/web/static/src/xml/base.xml:192 #, python-format msgid "No Update:" -msgstr "" +msgstr "ไม่มีอัพเดท:" #. module: web #. openerp-web @@ -1476,14 +1476,14 @@ msgstr "ไม่มีข้อมูลให้" #: code:addons/web/static/src/js/views/graph_widget.js:88 #, python-format msgid "No data to display" -msgstr "" +msgstr "ไม่มีข้อมูลให้แสดง" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:641 #, python-format msgid "No data to display." -msgstr "" +msgstr "ไม่มีข้อมูลให้แสดง" #. module: web #. openerp-web @@ -1497,7 +1497,7 @@ msgstr "ไม่มีผลลัพธ์ให้แสดง" #: code:addons/web/static/src/js/views/form_widgets.js:456 #, python-format msgid "No selected record" -msgstr "" +msgstr "ไม่มีข้อมูลถูกเลือก" #. module: web #. openerp-web @@ -1525,21 +1525,21 @@ msgstr "ปกติ" #: code:addons/web/static/src/js/views/form_widgets.js:669 #, python-format msgid "Not Archived" -msgstr "" +msgstr "ยังไม่ได้เก็บ" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/graph_widget.js:226 #, python-format msgid "Not enough data points" -msgstr "" +msgstr "ข้อมูลไม่เพียงพอ" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:838 #, python-format msgid "Not shown in kanban" -msgstr "" +msgstr "ไม่แสดงใน kanban" #. module: web #. openerp-web @@ -1561,7 +1561,7 @@ msgstr "Odoo" #: code:addons/web/static/src/xml/base.xml:101 #, python-format msgid "Odoo (Formerly OpenERP)" -msgstr "" +msgstr "Odoo (ชื่อเดิม OpenERP)" #. module: web #. openerp-web @@ -1575,14 +1575,14 @@ msgstr "" #: code:addons/web/static/src/js/views/form_widgets.js:1675 #, python-format msgid "Odoo Enterprise" -msgstr "" +msgstr "Odoo สำหรับองค์กร" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:117 #, python-format msgid "Odoo S.A." -msgstr "" +msgstr "Odoo S.A." #. module: web #: model:ir.ui.view,arch_db:web.qunit_suite @@ -1594,21 +1594,21 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:117 #, python-format msgid "Odoo is a trademark of" -msgstr "" +msgstr "Odoo เป็นเครื่องหมายการค้าของ" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:119 #, python-format msgid "Odoo.com" -msgstr "" +msgstr "Odoo.com" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:671 #, python-format msgid "Off" -msgstr "" +msgstr "ปิด" #. module: web #. openerp-web @@ -1632,7 +1632,7 @@ msgstr "รหัสผ่านเดิม:" #: code:addons/web/static/src/js/views/form_widgets.js:675 #, python-format msgid "On" -msgstr "" +msgstr "เปิด" #. module: web #. openerp-web @@ -1646,7 +1646,7 @@ msgstr "เมื่อเปลี่ยนแปลง" #: code:addons/web/static/src/js/widgets/progress_bar.js:79 #, python-format msgid "Only Integer Value should be valid." -msgstr "" +msgstr "ค่าควรจำนวนเต็มเท่านั้นที่ถูกต้อง" #. module: web #. openerp-web @@ -1660,7 +1660,7 @@ msgstr "คุณเท่านั้น" #: code:addons/web/static/src/xml/base.xml:198 #, python-format msgid "Open Debug Menu" -msgstr "" +msgstr "เปิดเมนูดีบั๊ก" #. module: web #. openerp-web @@ -1682,7 +1682,7 @@ msgstr "รหัสผ่าน" #: code:addons/web/static/src/xml/base.xml:567 #, python-format msgid "Pie Chart" -msgstr "" +msgstr "กราฟวงกลม" #. module: web #. openerp-web @@ -1951,28 +1951,28 @@ msgstr "เลือก" #. module: web #: model:ir.ui.view,arch_db:web.login msgid "Select <i class=\"fa fa-database\"/>" -msgstr "" +msgstr "เลือก <i class=\"fa fa-database\"/>" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:468 #, python-format msgid "Select records..." -msgstr "" +msgstr "เลือกรายการ..." #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:1078 #, python-format msgid "Selected domain" -msgstr "" +msgstr "เลือกโดเมน" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:468 #, python-format msgid "Selected records" -msgstr "" +msgstr "รายการที่เลือก" #. module: web #. openerp-web @@ -2014,7 +2014,7 @@ msgstr "แบ่งปันกับผู้ใช้ทั้งหมด" #: code:addons/web/static/src/js/apps.js:189 #, python-format msgid "Showing locally available modules" -msgstr "" +msgstr "แสดงโมดูลภายใน" #. module: web #. openerp-web @@ -2027,14 +2027,14 @@ msgstr "ขนาด:" #: code:addons/web/controllers/main.py:1067 #, python-format msgid "Something horrible happened" -msgstr "" +msgstr "มีบางอย่างหน้ากลัวเกิดขึ้น" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base_common.xml:107 #, python-format msgid "Special:" -msgstr "" +msgstr "พิเศษ:" #. module: web #. openerp-web @@ -2055,21 +2055,21 @@ msgstr "กำลังโหลดอยู่ ... <br />กรุณาอดà #: code:addons/web/static/src/xml/base.xml:83 #, python-format msgid "Support" -msgstr "" +msgstr "สนับสนุน" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:670 #, python-format msgid "Switch Off" -msgstr "" +msgstr "ปิด" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:672 #, python-format msgid "Switch On" -msgstr "" +msgstr "เปิด" #. module: web #. openerp-web @@ -2106,7 +2106,7 @@ msgstr "ฟิลด์ต่อไปนี้ไม่ถูกต้อง" msgid "" "The line has been modified, your changes will be discarded. Are you sure you" " want to discard the changes ?" -msgstr "" +msgstr "รายการที่ถูกแก้ไขจะไม่ถูกบันทึก คุณแน่ใจหรือไม่ว่าจะละเลยการเปลี่ยนแปลงนี้?" #. module: web #: code:addons/web/controllers/main.py:831 @@ -2126,7 +2126,7 @@ msgstr "บันทึก One to Many ต้องบันทึกก่อภ#, python-format msgid "" "The old password you provided is incorrect, your password was not changed." -msgstr "รหัสผ่านเดิมผิด รหัสผ่านของคุณจะไม่ถูกเปลี่ยน" +msgstr "รหัสผ่านเดิมผิด รหัสผ่านของคุณยังไม่ถูกเปลี่ยนแปลง" #. module: web #. openerp-web @@ -2233,7 +2233,7 @@ msgstr "มุมมองต้นไม้" #: code:addons/web/static/src/js/framework/crash_manager.js:48 #, python-format msgid "Trying to reconnect... " -msgstr "" +msgstr "กำลังพยายามเชื่อมต่อใหม่..." #. module: web #. openerp-web @@ -2248,7 +2248,7 @@ msgstr "ชนิด:" #: code:addons/web/static/src/js/views/list_view.js:309 #, python-format msgid "Unarchive" -msgstr "" +msgstr "ยกเลิกการเก็บ" #. module: web #. openerp-web @@ -2328,14 +2328,14 @@ msgstr "ไม่สนับสนุนการทำงาน %s ในโภ#: code:addons/web/static/src/js/views/form_widgets.js:1658 #, python-format msgid "Upgrade now" -msgstr "" +msgstr "อัพเกรดตอนนี้" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1506 #, python-format msgid "Upgrade to future versions" -msgstr "" +msgstr "อัพเกรดเป็นเวอร์ชันหน้า" #. module: web #. openerp-web @@ -2351,7 +2351,7 @@ msgstr "กำลังอัพโหลด ..." #: code:addons/web/static/src/js/widgets/sidebar.js:168 #, python-format msgid "Uploading Error" -msgstr "อับโหลดมีปัญหา" +msgstr "อัพโหลดมีปัญหา" #. module: web #. openerp-web @@ -2365,7 +2365,7 @@ msgstr "กำลังอัพโหลด..." #: code:addons/web/static/src/xml/base.xml:1204 #, python-format msgid "Use by default" -msgstr "ใช้ตามค่าเริ่มต้น" +msgstr "ใช้เป็นค่าเริ่มต้น" #. module: web #. openerp-web @@ -2379,14 +2379,14 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:105 #, python-format msgid "Version" -msgstr "" +msgstr "เวอร์ชั่น" #. module: web #. openerp-web #: code:addons/web/static/src/js/widgets/priority.js:51 #, python-format msgid "Very High" -msgstr "" +msgstr "สูงมาก" #. module: web #. openerp-web @@ -2455,7 +2455,7 @@ msgstr "วิดเจ็ต:" #: code:addons/web/static/src/js/widgets/progress_bar.js:76 #, python-format msgid "Wrong value entered!" -msgstr "" +msgstr "ใส่ค่าผิด!" #. module: web #. openerp-web @@ -2484,7 +2484,7 @@ msgstr "ใช่" #: code:addons/web/static/src/js/framework/crash_manager.js:53 #, python-format msgid "You are back online" -msgstr "" +msgstr "คุณกลับมาออนไลน์อีกครั้ง" #. module: web #. openerp-web @@ -2526,7 +2526,7 @@ msgstr "คุณต้องเลือกอย่างน้อยหนึ #: code:addons/web/static/src/js/framework/crash_manager.js:69 #, python-format msgid "Your Odoo session expired. Please refresh the current web page." -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 1b8851f7b69..4c82e830d4d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2280,6 +2280,7 @@ } .openerp .oe_list_content td.oe_number { text-align: right !important; + white-space: nowrap !important; max-width: 100px; } .openerp .oe_list_content td.oe_list_field_date, .openerp .oe_list_content th.oe_list_header_date { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 814f0a5865a..dfcaae29f91 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1960,6 +1960,7 @@ $sheet-padding: 16px border-width: 0 td.oe_number text-align: right !important + white-space: nowrap !important max-width: 100px td.oe_list_field_date, th.oe_list_header_date min-width: 6em diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index 3f03c288841..f5fcdea09a8 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -376,20 +376,21 @@ var FormView = View.extend(common.FieldManagerMixin, { self.do_onchange(null); } self.on_form_changed(); - self.rendering_engine.init_fields(); - self.is_initialized.resolve(); - self.record_loaded.resolve(); - self.do_update_pager(record.id === null || record.id === undefined); - if (self.sidebar) { - self.sidebar.do_attachement_update(self.dataset, self.datarecord.id); - } - if (record.id) { - self.do_push_state({id:record.id}); - } else { - self.do_push_state({}); - } - self.$el.removeClass('oe_form_dirty'); - self.autofocus(); + self.rendering_engine.init_fields().then(function() { + self.is_initialized.resolve(); + self.record_loaded.resolve(); + self.do_update_pager(record.id === null || record.id === undefined); + if (self.sidebar) { + self.sidebar.do_attachement_update(self.dataset, self.datarecord.id); + } + if (record.id) { + self.do_push_state({id:record.id}); + } else { + self.do_push_state({}); + } + self.$el.removeClass('oe_form_dirty'); + self.autofocus(); + }); }); }, /** diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js index 8a604640fc9..7beaa5b48ec 100644 --- a/addons/web/static/src/js/views/graph_view.js +++ b/addons/web/static/src/js/views/graph_view.js @@ -99,6 +99,7 @@ var GraphView = View.extend({ groupbys: this.initial_groupbys, context: context, fields: this.fields, + stacked: this.fields_view.arch.attrs.stacked !== "False" }); // append widget this.widget.appendTo(this.$el); diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index 340050eb0dc..a86ea35e449 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -4,6 +4,7 @@ odoo.define('web.GraphWidget', function (require) { var config = require('web.config'); var core = require('web.core'); var Model = require('web.DataModel'); +var formats = require('web.formats'); var Widget = require('web.Widget'); var _t = core._t; @@ -24,6 +25,7 @@ return Widget.extend({ this.groupbys = options.groupbys || []; this.mode = options.mode || "bar"; this.measure = options.measure || "__count__"; + this.stacked = options.stacked; }, start: function () { return this.load_data().then(this.proxy('display_graph')); @@ -167,12 +169,12 @@ return Widget.extend({ showXAxis: true, showYAxis: true, rightAlignYAxis: false, - stacked: true, + stacked: this.stacked, reduceXTicks: false, // rotateLabels: 40, showControls: (this.groupbys.length > 1) }); - chart.yAxis.tickFormat(function(d) { return openerp.web.format_value(d, { type : 'float' });}); + chart.yAxis.tickFormat(function(d) { return formats.format_value(d, { type : 'float' });}); chart(svg); this.to_remove = chart.update; diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index 27b51222638..00da5704784 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -82,17 +82,20 @@ var Editor = Widget.extend({ is_creating: function () { return (this.is_editing() && !this.record.id); }, - edit: function (record, configureField, options) { + edit: function (record, configureField) { + var self = this; // TODO: specify sequence of edit calls var loaded; if(record) { - loaded = this.form.trigger('load_record', _.extend({}, record)) + this.form.trigger('load_record', _.extend({}, record)); + loaded = this.form.record_loaded; } else { - loaded = this.form.load_defaults(); + loaded = this.form.load_defaults().then(function() { + return self.form.record_loaded; + }); } - var self = this; - return $.when(loaded).then(function () { + return loaded.then(function () { return self.do_show({reload: false}); }).then(function () { self.record = self.form.datarecord; |
