From ae8b2f65ed50e33340453ffc624bacc4a9c72179 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 20 Jul 2012 14:12:46 +0200 Subject: [PATCH 1/5] [FIX] merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13 --- addons/base_calendar/__openerp__.py | 5 +++-- addons/base_calendar/base_calendar_data.xml | 2 +- addons/{crm => base_calendar}/crm_meeting_data.xml | 0 addons/{crm => base_calendar}/crm_meeting_demo.xml | 12 ++++++------ .../wizard/base_calendar_invite_attendee.py | 3 +++ addons/crm/__openerp__.py | 2 -- addons/crm/test/process/lead2opportunity2win.yml | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%) rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%) diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 3f6ca129f6f..c7df187dd87 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -39,9 +39,10 @@ If you need to manage your meetings, you should install the CRM module. 'category': 'Hidden/Dependency', 'website': 'http://www.openerp.com', "init_xml": [ - 'base_calendar_data.xml' + 'base_calendar_data.xml', + 'crm_meeting_data.xml', ], - "demo_xml": [], + "demo_xml": ['crm_meeting_demo.xml'], "update_xml": [ 'security/calendar_security.xml', 'security/ir.model.access.csv', diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml index 3c20bf5fad5..727a0703db2 100644 --- a/addons/base_calendar/base_calendar_data.xml +++ b/addons/base_calendar/base_calendar_data.xml @@ -2,7 +2,7 @@ - + Event calendar.event diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml similarity index 100% rename from addons/crm/crm_meeting_data.xml rename to addons/base_calendar/crm_meeting_data.xml diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml similarity index 89% rename from addons/crm/crm_meeting_demo.xml rename to addons/base_calendar/crm_meeting_demo.xml index dda6d5a03a8..ad88c11bb1b 100644 --- a/addons/crm/crm_meeting_demo.xml +++ b/addons/base_calendar/crm_meeting_demo.xml @@ -12,7 +12,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py index 676f9b3fdd2..0e62555f6ba 100644 --- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py +++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py @@ -78,6 +78,9 @@ send an Email to Invited Person') att_obj = self.pool.get('calendar.attendee') user_obj = self.pool.get('res.users') current_user = user_obj.browse(cr, uid, uid, context=context) + + import pdb + pdb.set_trace() for datas in self.read(cr, uid, ids, context=context): type = datas.get('type') vals = [] diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 0c9b75b4d41..9fb1a4db28d 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -68,7 +68,6 @@ Creates a dashboard for CRM that includes: 'init_xml': [ 'crm_data.xml', 'crm_lead_data.xml', - 'crm_meeting_data.xml', 'crm_phonecall_data.xml', ], 'update_xml': [ @@ -115,7 +114,6 @@ Creates a dashboard for CRM that includes: 'demo_xml': [ 'crm_demo.xml', 'crm_lead_demo.xml', - 'crm_meeting_demo.xml', 'crm_phonecall_demo.xml', ], 'test': [ diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml index c1caf394c2e..1c2cfdeb605 100644 --- a/addons/crm/test/process/lead2opportunity2win.yml +++ b/addons/crm/test/process/lead2opportunity2win.yml @@ -113,7 +113,7 @@ - !python {model: crm.meeting}: | context.update({'active_model': 'crm.meeting'}) - self.case_open(cr, uid, [ref('crm.crm_case_reviewneeds0')]) + self.case_open(cr, uid, [ref('base_calendar.crm_case_reviewneeds0')]) - I invite a user for meeting. - From 5759d97daa97ac07c76af1255b6b722f83c7ec49 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Jul 2012 14:35:28 +0200 Subject: [PATCH 2/5] [IMP] changed place of buttons in relation popups bzr revid: nicolas.vanhoren@openerp.com-20120720123528-fpskc2r42d06z28r --- addons/web/static/src/js/view_form.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c430b013c40..13f70a421de 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3877,14 +3877,16 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ display_popup: function() { var self = this; this.renderElement(); - new instance.web.Dialog(this, { + var dialog = new instance.web.Dialog(this, { min_width: '800px', - dialogClass: 'oe_act_window', + dialogClass: 'oe_act_window', close: function() { self.check_exit(true); }, title: this.options.title || "", + buttons: [{text:"tmp"}], }, this.$element).open(); + this.$buttonpane = dialog.$element.dialog("widget").find(".ui-dialog-buttonpane").html(""); this.start(); }, on_write_completed: function() {}, @@ -3900,16 +3902,18 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ if (this.row_id !== null) { options.initial_mode = this.options.readonly ? "view" : "edit"; } + _.extend(options, { + $buttons: this.$buttonpane, + }); this.view_form = new instance.web.FormView(this, this.dataset, false, options); if (this.options.alternative_form_view) { this.view_form.set_embedded_view(this.options.alternative_form_view); } this.view_form.appendTo(this.$element.find(".oe_popup_form")); this.view_form.on_loaded.add_last(function() { - var $buttons = self.view_form.$element.find(".oe_form_buttons"); var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; - $buttons.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select})); - var $snbutton = $buttons.find(".oe_abstractformpopup-form-save-new"); + self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select})); + var $snbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save-new"); $snbutton.click(function() { $.when(self.view_form.do_save()).then(function() { self.view_form.reload_mutex.exec(function() { @@ -3917,7 +3921,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ }); }); }); - var $sbutton = $buttons.find(".oe_abstractformpopup-form-save"); + var $sbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save"); $sbutton.click(function() { $.when(self.view_form.do_save()).then(function() { self.view_form.reload_mutex.exec(function() { @@ -3925,7 +3929,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ }); }); }); - var $cbutton = $buttons.find(".oe_abstractformpopup-form-close"); + var $cbutton = self.$buttonpane.find(".oe_abstractformpopup-form-close"); $cbutton.click(function() { self.check_exit(); }); @@ -4034,6 +4038,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend 'selectable': !self.options.disable_multiple_selection, 'read_only': true, 'import_enabled': false, + '$buttons': self.$buttonpane, }, self.options.list_view_options || {})); self.view_list.popup = self; self.view_list.appendTo($(".oe_popup_list", self.$element)).pipe(function() { @@ -4042,13 +4047,12 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.searchview.do_search(); }); self.view_list.on_loaded.add_last(function() { - var $buttons = self.view_list.$element.find(".oe-actions"); - $buttons.prepend(QWeb.render("SelectCreatePopup.search.buttons")); - var $cbutton = $buttons.find(".oe_selectcreatepopup-search-close"); + self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons")); + var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close"); $cbutton.click(function() { self.destroy(); }); - var $sbutton = $buttons.find(".oe_selectcreatepopup-search-select"); + var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); if(self.options.disable_multiple_selection) { $sbutton.hide(); } From 52f6f0bd0437a0735cd3020a8786047c0fb00652 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Jul 2012 14:44:30 +0200 Subject: [PATCH 3/5] [IMP] Changed some "Cancel" buttons to links bzr revid: nicolas.vanhoren@openerp.com-20120720124430-gbhow8qcipsrieb4 --- addons/web/static/src/js/view_form.js | 5 +---- addons/web/static/src/xml/base.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 13f70a421de..06ca0ce13c4 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4047,15 +4047,12 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.searchview.do_search(); }); self.view_list.on_loaded.add_last(function() { - self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons")); + self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons", {widget:self})); var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close"); $cbutton.click(function() { self.destroy(); }); var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); - if(self.options.disable_multiple_selection) { - $sbutton.hide(); - } $sbutton.click(function() { self.on_select_elements(self.selected_ids); self.destroy(); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5377c394ace..f334b649671 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1468,8 +1468,11 @@ - - + + + or + + Cancel @@ -1479,7 +1482,7 @@ - + or Cancel