diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f1d44b0c885..412ea9abda2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -194,7 +194,9 @@ class WebClient(openerpweb.Controller):
if mods is not None:
path += '?mods=' + mods
return [path]
- return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
+ # old code to force cache reloading
+ #return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
+ return [el[1] for el in self.manifest_glob(req, mods, extension)]
@openerpweb.jsonrequest
def csslist(self, req, mods=None):
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1425162d833..36d26d10741 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1733,6 +1733,9 @@
.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
display: none !important;
}
+.openerp .oe_form_readonly .oe_form .oe_form_field_date {
+ width: auto;
+}
.openerp .oe_form_nosheet {
margin-left: 10px;
margin-right: 10px;
@@ -1857,16 +1860,19 @@
min-width: 120px;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
- padding-left: 8px;
+ padding-left: 6px;
}
.openerp .oe_form .oe_form_group {
width: 100%;
margin: 4px 0 4px 0;
}
+.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child {
+ padding-left: 18px;
+}
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
font-weight: bold;
white-space: nowrap;
- padding-right: 8px;
+ padding-right: 6px;
}
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
font-size: 80%;
@@ -1962,7 +1968,7 @@
width: 180px;
}
.openerp .oe_form .oe_form_field_date {
- width: 7em;
+ width: 7.5em;
}
.openerp .oe_form .oe_form_field_datetime {
width: 11em;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 82ed305a275..2ba3b79c411 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1351,6 +1351,8 @@ $sheet-max-width: 860px
.oe_form_readonly
.oe_edit_only, .oe_form_field:empty
display: none !important
+ .oe_form .oe_form_field_date
+ width: auto
.oe_form_nosheet
margin-left: 10px
margin-right: 10px
@@ -1449,17 +1451,20 @@ $sheet-max-width: 860px
display: block
min-width: 120px
td.oe_form_group_cell + .oe_form_group_cell
- padding-left: 8px
+ padding-left: 6px
.oe_form_group
width: 100%
margin: 4px 0 4px 0
+ .oe_group_right
+ > tbody > tr > td:first-child
+ padding-left: 18px
// }}}
// FormView.label {{{
.oe_form
.oe_form_label_help[for], .oe_form_label[for]
font-weight: bold
white-space: nowrap
- padding-right: 8px
+ padding-right: 6px
span
font-size: 80%
color: darkGreen
@@ -1535,7 +1540,7 @@ $sheet-max-width: 860px
.oe_form_field_float
width: 180px
.oe_form_field_date
- width: 7em
+ width: 7.5em
.oe_form_field_datetime
width: 11em
input[type="text"], input[type="password"], input[type="file"], select
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2a32f7c47af..2d7d87c4092 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1182,6 +1182,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
if (!$tr || row_cols < colspan) {
$tr = $('
').addClass('oe_form_group_row').appendTo($table);
row_cols = cols;
+ } else if (tagName==='group') {
+ // When , we need a spacing between the two groups
+ $child.addClass('oe_group_right')
+
}
row_cols -= colspan;
@@ -2612,6 +2616,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.last_search = [];
this.floating = false;
this.inhibit_on_change = false;
+ this.current_display = null;
},
start: function() {
this._super();
@@ -2664,10 +2669,13 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
// some behavior for input
this.$input.keyup(function() {
- if (self.$input.val() === "") {
- self.set({value: false});
- } else {
- self.floating = true;
+ if (self.current_display !== self.$input.val()) {
+ self.current_display = self.$input.val();
+ if (self.$input.val() === "") {
+ self.set({value: false});
+ } else {
+ self.floating = true;
+ }
}
});
this.$drop_down.click(function() {
@@ -2705,7 +2713,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
}
self.floating = false;
}
- if (used) {
+ if (used && self.get("value") === false) {
tip_def.reject();
untip_def.reject();
tip_def = $.Deferred();
@@ -2760,7 +2768,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.$input.autocomplete("widget").addClass("openerp");
// used to correct a bug when selecting an element by pushing 'enter' in an editable list
this.$input.keyup(function(e) {
- if (e.which === 13) {
+ if (e.which === 13) { // ENTER
if (isSelecting)
e.stopPropagation();
}
@@ -2792,6 +2800,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
var self = this;
if (!this.get("effective_readonly")) {
this.$input.val(str.split("\n")[0]);
+ this.current_display = this.$input.val();
} else {
str = _.escape(str).split("\n").join("
");
this.$element.find('a')
diff --git a/addons/web_dashboard/i18n/bg.po b/addons/web_dashboard/i18n/bg.po
new file mode 100644
index 00000000000..6518b28a8b9
--- /dev/null
+++ b/addons/web_dashboard/i18n/bg.po
@@ -0,0 +1,95 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-09 13:18+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Bulgarian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:61
+msgid "Edit Layout"
+msgstr "Редакция План"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:107
+msgid "Are you sure you want to remove this item ?"
+msgstr "Сигурни ли сте, че искате да изтриете този елемент ?"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
+msgid "Reset Layout.."
+msgstr "Връщане в начално състояние Подредба.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr "Връщане в начално състояние"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
+msgid "Change Layout.."
+msgstr "Смяна Подредба.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr "Промяна Подредба"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid " "
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr "Създаване"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr "Избери подредба на табло"
+
+#, python-format
+#~ msgid "Execute task \"%s\""
+#~ msgstr "Изпълни задача \"%s\""
+
+#~ msgid "Uncategorized"
+#~ msgstr "Без категория"
+
+#~ msgid "Remember to bookmark"
+#~ msgstr "Запомни като отметка"
+
+#~ msgid "This url"
+#~ msgstr "Този url"
+
+#~ msgid ""
+#~ "Click on the functionalites listed below to launch them and configure your "
+#~ "system"
+#~ msgstr ""
+#~ "Кликнете върху фунциите изброени по-долу за да ги изпълните и конфигурирате "
+#~ "системата"
+
+#~ msgid "Welcome to OpenERP"
+#~ msgstr "Добре дошли в OpenERP"
+
+#~ msgid "Your login:"
+#~ msgstr "Вашето потребителско име:"
+
+#~ msgid "progress:"
+#~ msgstr "обработка:"
+
+#~ msgid "Mark this task as done"
+#~ msgstr "Маркирай задачата като приключена"
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
new file mode 100644
index 00000000000..fd0e3c82e83
--- /dev/null
+++ b/addons/web_graph/i18n/bg.po
@@ -0,0 +1,98 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-09 12:54+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Bulgarian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:22
+msgid "Graph"
+msgstr "Диаграма"
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
diff --git a/addons/web_process/i18n/bg.po b/addons/web_process/i18n/bg.po
new file mode 100644
index 00000000000..d86858ec17e
--- /dev/null
+++ b/addons/web_process/i18n/bg.po
@@ -0,0 +1,118 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-09 12:29+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Bulgarian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Отказ"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Запис"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Изглед на процеса"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Документация"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Прочети документацията онлайн"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Форум"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Обща дискусия"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Книги"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Вземи книгите"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Купи OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Процес"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Бележки"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Последно модифицирано от:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Междинен поток"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Свързани"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Избор Процес"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Избор"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Редакция Процес"