[MERGE] trunk

bzr revid: fme@openerp.com-20121029100055-3h40w0egnzlwq7o4

addons/web/i18n/hu.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-08-24 09:16+0000\n"
+"PO-Revision-Date: 2012-10-26 12:17+0000\n"
 "Last-Translator: Herczeg Péter <herczegp@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
@@ -755,7 +755,7 @@ msgstr "Választani kell legalább egy rekordot!"
 #. openerp-web
 #: addons/web/static/src/js/views.js:875
 msgid "Uploading..."
-msgstr ""
+msgstr "Feltöltés"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:885

addons/web/static/src/css/base.css

@@ -25,6 +25,7 @@
     display: none !important;
   }
 }
+
 .openerp.openerp_webclient_container {
   height: 100%;
 }
@@ -44,7 +45,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */
+   */ */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -2518,6 +2519,9 @@
 .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page {
   display: none !important;
 }
+.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_view_list, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_view_list {
+  min-height: 132px;
+}
 .openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add {
   font-weight: bold;
 }
@@ -2927,3 +2931,41 @@ div.ui-widget-overlay {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+
+@media print {
+  .openerp {
+    text-shadow: none;
+  }
+  .openerp .oe_header_row, .openerp ul.oe_header, .openerp div.oe_mail_thread_action, .openerp .oe_mail_recthread_actions, .openerp .oe_button_box, .openerp .oe_form button, .openerp button.oe_invite, .openerp .oe_form header, .openerp .openerp .oe_notebook > li.ui-state-default {
+    display: none;
+  }
+  .openerp .oe_list_content button, .openerp .oe_list_content input[type=checkbox] {
+    visibility: hidden;
+  }
+  .openerp .tree_header button, .openerp .oe_mail .oe_mail_thread_msg .oe_mail_unread, .openerp .oe_mail_fetch_more, .openerp .oe_m2o_drop_down_button img, .openerp .oe_form_field_one2many_list_row_add {
+    visibility: hidden;
+  }
+  .openerp a.oe_m2o_cm_button, .openerp a.oe_e {
+    visibility: hidden;
+  }
+  .openerp .oe_form .oe_form_field_date img, .openerp .oe_form .oe_form_field_datetime img {
+    visibility: hidden;
+  }
+  .openerp .oe_notebook > li.ui-tabs-selected {
+    display: block;
+  }
+  .openerp .oe_application .oe_form_sheet, .openerp .oe_application .oe_form_sheetbg {
+    border: 0px !important;
+    box-shadow: 0px 0px 0px;
+  }
+  .openerp .oe_view_manager_current > .oe_view_manager_header {
+    border: 0px !important;
+    box-shadow: 0px 0px 0px;
+  }
+  .openerp .text-core .text-wrap .text-arrow {
+    background: none;
+  }
+  .openerp .openerp div.oe_mail_wall {
+    overflow: hidden !important;
+  }
+}

addons/web/static/src/css/base.sass

@@ -1983,6 +1983,9 @@ $sheet-max-width: 860px
         > .oe_view_manager
             .oe_list_pager_single_page
                 display: none !important
+            .oe_view_manager_view_list
+                min-height: 132px
+
         .oe_form_field_one2many_list_row_add
             font-weight: bold
         .oe_list_content
@@ -2314,5 +2317,34 @@ div.ui-widget-overlay
 .ui-corner-all
     @include radius(3px)
 
+@media print
+    .openerp
+        .oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default
+            display: none
+        .oe_list_content
+            button, input[type=checkbox]
+                visibility: hidden
+        .tree_header button, .oe_mail .oe_mail_thread_msg .oe_mail_unread, .oe_mail_fetch_more, .oe_m2o_drop_down_button img, .oe_form_field_one2many_list_row_add
+            visibility: hidden
+        a
+            &.oe_m2o_cm_button, &.oe_e
+                visibility: hidden
+        .oe_form
+            .oe_form_field_date img, .oe_form_field_datetime img
+                visibility: hidden
+        .oe_notebook > li.ui-tabs-selected
+            display: block
+        .oe_application
+            .oe_form_sheet, .oe_form_sheetbg
+                border: 0px !important
+                box-shadow: 0px 0px 0px
+        .oe_view_manager_current > .oe_view_manager_header
+            border: 0px !important
+            box-shadow: 0px 0px 0px
+        text-shadow: none
+        .text-core .text-wrap .text-arrow
+            background: none
+        .openerp div.oe_mail_wall
+            overflow: hidden !important
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

addons/web/static/src/js/coresetup.js

@@ -530,7 +530,8 @@ instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which o
 instance.web.qweb.debug = instance.session.debug;
 instance.web.qweb.default_dict = {
     '_' : _,
-    '_t' : instance.web._t
+    '_t' : instance.web._t,
+    'JSON': JSON,
 };
 instance.web.qweb.preprocess_node = function() {
     // Note that 'this' is the Qweb Node

addons/web/static/src/js/view_form.js

@@ -1590,37 +1590,6 @@ instance.web.form.DefaultFieldManager = instance.web.Widget.extend({
     },
 });
 
-instance.web.form.FormDialog = instance.web.Dialog.extend({
-    init: function(parent, options, view_id, dataset) {
-        this._super(parent, options);
-        this.dataset = dataset;
-        this.view_id = view_id;
-        return this;
-    },
-    start: function() {
-        var self = this;
-        this._super();
-        this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
-            pager: false
-        });
-        this.form.appendTo(this.$el);
-        this.form.on('record_created', self, this.on_form_dialog_saved);
-        this.form.on('record_saved', this, this.on_form_dialog_saved);
-        return this;
-    },
-    select_id: function(id) {
-        if (this.form.dataset.select_id(id)) {
-            return this.form.do_show();
-        } else {
-            this.do_warn("Could not find id in dataset");
-            return $.Deferred().reject();
-        }
-    },
-    on_form_dialog_saved: function(r) {
-        this.close();
-    }
-});
-
 instance.web.form.compute_domain = function(expr, fields) {
     if (! (expr instanceof Array))
         return !! expr;
@@ -2570,7 +2539,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
         if (! this.get("effective_readonly")) {
             self._updating_editor = false;
             this.$textarea = this.$el.find('textarea');
-            var width = ((this.node.attrs || {}).editor_width || 468);
+            var width = ((this.node.attrs || {}).editor_width || '100%');
             var height = ((this.node.attrs || {}).editor_height || 250);
             this.$textarea.cleditor({
                 width:      width, // width not including margins, borders or padding
@@ -3141,7 +3110,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                         type: 'ir.actions.act_window',
                         res_model: self.field.relation,
                         res_id: self.get("value"),
-                        context: self.build_context(),
                         views: [[false, 'form']],
                         target: 'current'
                     });
@@ -4569,6 +4537,10 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                     self.select_elements(self.selected_ids);
                     self.destroy();
                 });
+                var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-create");
+                $cbutton.click(function() {
+                    self.new_object();
+                });
             });
         });
         this.searchview.appendTo($(".oe_popup_search", self.$el));

addons/web/static/src/js/view_list.js

@@ -374,7 +374,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
 
         var total = dataset.size();
         var limit = this.limit() || total;
-        this.$pager.toggle(total !== 0);
+        if (total == 0)
+            this.$pager.hide();
+        else
+            this.$pager.css("display", "");
         this.$pager.toggleClass('oe_list_pager_single_page', (total <= limit));
         var spager = '-';
         if (total) {

addons/web/static/src/js/views.js

@@ -1281,11 +1281,9 @@ instance.web.View = instance.web.Widget.extend({
     },
     /**
      * Switches to a specific view type
-     *
-     * @param {String} view view type to switch to
      */
-    do_switch_view: function(view) { 
-        this.trigger('switch_mode',view);
+    do_switch_view: function() { 
+        this.trigger.apply(this, ['switch_mode'].concat(_.toArray(arguments)));
     },
     /**
      * Cancels the switch to the current view, switches to the previous one

addons/web/static/src/xml/base.xml

@@ -1236,9 +1236,9 @@
 <t t-name="SelectCreatePopup.search.buttons">
     <t t-if="! widget.options.disable_multiple_selection">
         <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
-        or
     </t>
-    <a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
+    <button type="button" class="oe_button oe_selectcreatepopup-search-create">Create</button>
+    or <a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
 </t>
 <t t-name="AbstractFormPopup.buttons">
     <t t-if="! readonly">

addons/web_calendar/static/src/css/web_calendar.css

@@ -33,3 +33,12 @@
 .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
   padding-right: 5px;
 }
+@media print {
+    div.dhx_cal_navline .dhx_cal_tab, div.dhx_cal_navline .dhx_cal_prev_button, div.dhx_cal_navline .dhx_cal_next_button, div.dhx_cal_navline .dhx_cal_today_button{
+        display: none;
+    }
+    .openerp .dhx_cal_data {
+        overflow-y: hidden !important;
+        position: relative;
+    }
+}

addons/web_diagram/i18n/ru.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-08 07:13+0000\n"
-"Last-Translator: Aleksei Motsik <Unknown>\n"
+"PO-Revision-Date: 2012-10-25 06:42+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-26 05:19+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
@@ -25,7 +25,7 @@ msgstr "Диаграмма"
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:165
 msgid "Are you sure?"
-msgstr ""
+msgstr "Вы уверены?"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:195
@@ -35,6 +35,10 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Удаление этого узла не может быть отменено.\n"
+"Будут удалены все связанные переходы.\n"
+"\n"
+"Вы уверены ?"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:213
@@ -43,6 +47,9 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Удаление этого перехода не может быть отменено.\n"
+"\n"
+"Вы уверены ?"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:224

addons/web_gantt/static/src/css/gantt.css

@@ -7,3 +7,11 @@
     position: absolute;
     top: 5px;
 }
+@media print {
+    .oe_gantt button {
+        display: none;
+    }
+    .oe_gantt > table > tbody > tr > td > div > div {
+        overflow: hidden !important;
+    }
+}

addons/web_graph/static/src/js/graph.js

@@ -287,7 +287,11 @@ instance.web_graph.GraphView = instance.web.View.extend({
 
             function _convert(field, data, tick) {
                 tick = tick === undefined ? true : false;
-                data = instance.web.format_value(data, fields[field]);
+                try {
+                    data = instance.web.format_value(data, fields[field]);
+                } catch(e) {
+                    data = "" + data;
+                }
                 if (tick) {
                     if (ticks[data] === undefined)
                         ticks[data] = _.size(ticks);

addons/web_kanban/i18n/ru.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-17 07:42+0000\n"
-"Last-Translator: Aleksei Motsik <Unknown>\n"
+"PO-Revision-Date: 2012-10-26 09:02+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
@@ -35,7 +35,7 @@ msgstr "Вы действительно хотите удалить эту за
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:839
 msgid "Create: "
-msgstr ""
+msgstr "Создать: "
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:41
@@ -50,17 +50,17 @@ msgstr "осталось)"
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:72
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #~ msgid "Create"
 #~ msgstr "Создать"

addons/web_kanban/static/src/css/kanban.css

@@ -609,3 +609,15 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
+
+@media print {
+  .openerp .oe_kanban_groups button {
+    visibility: hidden;
+  }
+  .openerp .oe_kanban_groups a[data-type=object], .openerp .oe_kanban_groups a[data-type=delete] {
+    visibility: hidden;
+  }
+  .openerp .oe_kanban_view .oe_kanban_group_title {
+    text-shadow: none !important;
+  }
+}

addons/web_kanban/static/src/css/kanban.sass

@@ -502,6 +502,15 @@
                 @include vertical-gradient(#f6f6f6, #e3e3e3)
                 @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-
+@media print
+    .openerp
+        .oe_kanban_groups
+            button
+                visibility: hidden
+            a
+                &[data-type=object], &[data-type=delete]
+                    visibility: hidden
+        .oe_kanban_view .oe_kanban_group_title
+            text-shadow: none !important
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

addons/web_kanban/static/src/js/kanban.js

@@ -826,7 +826,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);
             if ((type === 'edit' || type === 'delete') && ! self.view.is_action_enabled(type)) {
-                self.view.open_record(self.id);
+                self.view.open_record(self.id, true);
             } else if (_.str.startsWith(type, 'switch_')) {
                 self.view.do_switch_view(type.substr(7));
             } else if (typeof self[method] === 'function') {