odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-3 up to 43235e2

This commit is contained in:
Christophe Simonis 2015-07-27 14:09:57 +02:00
parent 2d83656c0f 43235e2d1d
commit 5e6ec89659
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm_claim/report/crm_claim_report.py
View File

@ -44,7 +44,7 @@ class crm_claim_report(osv.osv):
'create_date': fields.datetime('Create Date', readonly=True, select=True),
'claim_date': fields.datetime('Claim Date', 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"),
'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',\
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.claim')]", readonly=True),

4
addons/web_view_editor/static/src/js/view_editor.js
View File

@ -530,6 +530,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 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);
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];
_.each([tr, parent_tr],function(element) {
var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
@ -994,7 +996,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
type_widget.set_value(node.value);
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() {
model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
model_data.read_slice([], {domain: [['model','=', self.model]]}).done(function(result) {