From 912c7b1c47b606e7074676f45d16b1c4f2327d5b Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Apr 2012 11:20:07 +0200 Subject: [PATCH 01/13] [fix] some problems with the reference field bzr revid: nicolas.vanhoren@openerp.com-20120420092007-mu3fk95ft21ztm78 --- addons/web/static/src/js/view_form.js | 44 ++++++++++++++------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c457554e44b..0e1777894f0 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3471,23 +3471,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte template: 'FieldReference', init: function(field_manager, node) { this._super(field_manager, node); - this.fields_view = { - fields: { - selection: { - selection: this.view.fields_view.fields[this.name].selection - }, - m2o: { - relation: null - } - } - }; - this.get_fields_values = this.view.get_fields_values; - this.get_selected_ids = this.view.get_selected_ids; - this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop; - this.dataset = this.view.dataset; - this.view_id = 'reference_' + _.uniqueId(); - this.fields = {}; - this.fields_order = []; this.reference_ready = true; }, on_nop: function() { @@ -3512,9 +3495,9 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte }, initialize_content: function() { this.selection = new instance.web.form.FieldSelection(this, { attrs: { - name: 'selection', - widget: 'selection' + name: 'selection' }}); + this.selection.view = this.view; this.selection.set({readonly: this.get('effective_readonly')}); this.selection.on("change:value", this, this.on_selection_changed); this.selection.$element = $(".oe_form_view_reference_selection", this.$element); @@ -3522,9 +3505,9 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this.selection.start(); this.m2o = new instance.web.form.FieldMany2One(this, { attrs: { - name: 'm2o', - widget: 'many2one' + name: 'm2o' }}); + this.m2o.view = this.view; this.m2o.set({"readonly": this.get("effective_readonly")}); this.m2o.on("change:value", this, this.data_changed); this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element); @@ -3538,6 +3521,11 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this._super(value_); this.render_value(); }, + get_value: function() { + var tmp = this._super(); + debugger; + return tmp; + }, render_value: function() { this.reference_ready = false; var vals = [], sel_val, m2o_val; @@ -3563,6 +3551,20 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this.set({'value': false}); } }, + get_field: function(name) { + if (name === "selection") { + return { + selection: this.view.fields_view.fields[this.name].selection, + type: "selection", + }; + } else if (name === "m2o") { + return { + relation: null, + type: "many2one", + }; + } + throw Exception("Should not happen"); + }, })); instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, { From b8deee7a566d63d760d58b91fd73ceb7d96fc9d7 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Apr 2012 11:40:34 +0200 Subject: [PATCH 02/13] [fix] some other bug in references in read only mode bzr revid: nicolas.vanhoren@openerp.com-20120420094034-izgqix5kxh54sm45 --- addons/web/static/src/js/view_form.js | 12 +++--------- addons/web/static/src/xml/base.xml | 21 ++++++++------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0e1777894f0..fbbd5149470 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3498,7 +3498,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte name: 'selection' }}); this.selection.view = this.view; - this.selection.set({readonly: this.get('effective_readonly')}); + this.selection.set({force_readonly: this.get('effective_readonly')}); this.selection.on("change:value", this, this.on_selection_changed); this.selection.$element = $(".oe_form_view_reference_selection", this.$element); this.selection.renderElement(); @@ -3508,7 +3508,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte name: 'm2o' }}); this.m2o.view = this.view; - this.m2o.set({"readonly": this.get("effective_readonly")}); + this.m2o.set({force_readonly: this.get("effective_readonly")}); this.m2o.on("change:value", this, this.data_changed); this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element); this.m2o.renderElement(); @@ -3521,11 +3521,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte this._super(value_); this.render_value(); }, - get_value: function() { - var tmp = this._super(); - debugger; - return tmp; - }, render_value: function() { this.reference_ready = false; var vals = [], sel_val, m2o_val; @@ -3533,13 +3528,12 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte vals = this.get('value').split(','); } sel_val = vals[0] || false; - m2o_val = vals[1] ? parseInt(vals[1], 10) : false; + m2o_val = vals[1] ? parseInt(vals[1], 10) : vals[1]; if (!this.get("effective_readonly")) { this.selection.set_value(sel_val); } this.m2o.field.relation = sel_val; this.m2o.set_value(m2o_val); - this.m2o.$element.toggle(sel_val !== false); this.reference_ready = true; }, data_changed: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 322d06fd6ae..57970c1486e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1040,19 +1040,14 @@ - - - - - - -
- -
- - - - + + + + + +
+ +
From 6463e5d9af213f6823a9db204197abb602865d59 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 20 Apr 2012 15:31:36 +0200 Subject: [PATCH 03/13] [FIX] sale: put back the Advance payment button that was removed by mistake in a previous revision bzr revid: qdp-launchpad@openerp.com-20120420133136-tgurqmazncm1iwfv --- addons/sale/sale_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 6bdbc9ac135..3d597b80dea 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -112,6 +112,7 @@