[MERGE] forward port of branch 7.0 up to 0e151f7
This commit is contained in:
commit
43235e2d1d
|
@ -53,7 +53,7 @@ class crm_claim_report(osv.osv):
|
||||||
'create_date': fields.datetime('Create Date', readonly=True, select=True),
|
'create_date': fields.datetime('Create Date', readonly=True, select=True),
|
||||||
'day': fields.char('Day', size=128, readonly=True),
|
'day': fields.char('Day', size=128, readonly=True),
|
||||||
'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
|
'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
|
||||||
'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"),
|
'stage_id': fields.many2one ('crm.claim.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"),
|
||||||
'categ_id': fields.many2one('crm.case.categ', 'Category',\
|
'categ_id': fields.many2one('crm.case.categ', 'Category',\
|
||||||
domain="[('section_id','=',section_id),\
|
domain="[('section_id','=',section_id),\
|
||||||
('object_id.model', '=', 'crm.claim')]", readonly=True),
|
('object_id.model', '=', 'crm.claim')]", readonly=True),
|
||||||
|
|
|
@ -532,6 +532,8 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
|
||||||
var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0];
|
var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0];
|
||||||
var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0];
|
var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0];
|
||||||
var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
|
var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
|
||||||
|
if(_.isUndefined(parent_tr))
|
||||||
|
return;
|
||||||
parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0];
|
parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0];
|
||||||
_.each([tr, parent_tr],function(element) {
|
_.each([tr, parent_tr],function(element) {
|
||||||
var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
|
var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
|
||||||
|
@ -996,7 +998,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
|
||||||
type_widget.set_value(node.value);
|
type_widget.set_value(node.value);
|
||||||
self.add_widget.push(type_widget);
|
self.add_widget.push(type_widget);
|
||||||
});
|
});
|
||||||
table_selector.find("td[id^=]").attr("width","100px");
|
table_selector.find("td[id^='']").attr("width","100px");
|
||||||
self.add_node_dialog.$el.find('#new_field').click(function() {
|
self.add_node_dialog.$el.find('#new_field').click(function() {
|
||||||
model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
|
model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
|
||||||
model_data.read_slice([], {domain: [['model','=', self.model]]}).done(function(result) {
|
model_data.read_slice([], {domain: [['model','=', self.model]]}).done(function(result) {
|
||||||
|
|
Loading…
Reference in New Issue