From d8e772be5c3abadf9b66dc64a7723e3db1834e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Wed, 7 Dec 2011 12:00:57 +0100 Subject: [PATCH 1/7] crash dialog bzr revid: rlo@openerp.com-20111207110057-4w5dbtw9nv68gosy --- addons/web/static/src/css/base.css | 40 +++++++++++++ addons/web/static/src/js/chrome.js | 56 +++++++++++++++++-- addons/web/static/src/xml/base.xml | 41 ++++++++++++-- .../static/src/xml/web_process.xml | 2 +- 4 files changed, 129 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 067ea09cd38..46a80e293c0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1710,3 +1710,43 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { .openerp .oe_view_editor_tree_grid a { display: block; } + +/* Dialog traceback cases */ +.expandcase { + background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; + margin-top:10px; +} +.collapsecase { + background: transparent url(/web/static/src/img/collapse.gif) 0 50% no-repeat; + margin-top:10px; +} +.case-head{ + padding-left:18px; + margin-top:5px; +} +.error-detail{ + display:none; +} +.error-fix{ + border:1px solid #999999; + overflow:auto; +} +.fielddiv{ + display:inline-block; +} +.fielddiv label{ +/* width:20%; */ + float:left; + text-align:right; +} +.fielddiv div{ + width:79%; + float:right; +} +.fielddiv input[type=text],textarea{ + width:80%; +} +/* for Alignment center */ +.centeralign{ + text-align:center; +} diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index bac2c357c67..f9fc538d72a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -165,20 +165,62 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ }); }, on_traceback: function(error) { + this.servererror = new openerp.web.ServerError(error); + this.servererror.start(); + } +}); +openerp.web.ServerError = openerp.web.Dialog.extend({ + template: 'DialogTraceback', + init: function(error) { + this._super(); + this.error = error; + }, + start: function() { + var self = this; var dialog = new openerp.web.Dialog(this, { - title: "OpenERP " + _.str.capitalize(error.type), + title: "OpenERP " + _.str.capitalize(this.error.type), autoOpen: true, - width: '90%', - height: '90%', + width: '80%', + height: '50%', min_width: '800px', - min_height: '600px', + min_height: '500px', buttons: { Ok: function() { $(this).dialog("close"); } } }).start(); - dialog.$element.html(QWeb.render('DialogTraceback', {error: error})); + dialog.$element.html(QWeb.render('DialogTraceback', {error: this.error})); + dialog.$element.find('.expandcase').each(function() { + var $this = $(this); + $this.click( function() { + if ($this.attr('id') == "case2") { + /* call the status method from the server to verify status of contract + if status is full then contract is valid + if status is none then contract is invalid + */ + new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('status', []).then(function(res) { + var hasacontract = res.status == "full"; + if (!hasacontract) { + $this.find('a').attr({ href : 'http://www.openerp.com/support-or-publisher-warranty-contract',target: "_blank" }); + $this.find('a').css( 'text-decoration', 'none' ); + } else { + $this.next().find('[type=button]').click( function() { + var issuename = $('#issuename').val(); + var explanation = $('#explanation').val(); + var remark = $('#remark').val(); + + // Call the send method from server to send mail with details + new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [self.error.data,explanation,remark,issuename]); + }); + $this.next().toggle().prev().toggleClass("expandcase collapsecase"); + } + }); + } else { + $this.next().toggle().prev().toggleClass("expandcase collapsecase"); + } + }); + }); } }); @@ -529,6 +571,10 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ this.has_local_storage = typeof(localStorage) != 'undefined'; this.selected_db = null; this.selected_login = null; + // var self = this; + new openerp.web.DataSet(this, 'publisher_warranty.contract');//.call_and_eval('status', []);//.then(function(res) { +// this.contract = res.status; + //}); if (this.has_local_storage && this.remember_credentials) { this.selected_db = localStorage.getItem('last_db_login_success'); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a75101f9867..d491925b034 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -56,7 +56,11 @@ @@ -1346,9 +1350,38 @@ -
-
-
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
OpenERP Enterprise Contract.
+
Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.
+
+
+
+


+
+
+ +


+
+
+ +
+
+
+
+
diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml index 727bdad9d25..a781dfe936a 100644 --- a/addons/web_process/static/src/xml/web_process.xml +++ b/addons/web_process/static/src/xml/web_process.xml @@ -32,7 +32,7 @@ - Support / Publisher Warranty + Support / OpenERP Enterprise Get the OpenERP Warranty From b3f7278d12a9409a112b5a4f8ef7ef182ef6538d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Wed, 21 Dec 2011 18:11:37 +0100 Subject: [PATCH 2/7] [IMP] working crash dialog bzr revid: rlo@openerp.com-20111221171137-flojvtf10547ekfl --- addons/web/common/session.py | 6 ++++ addons/web/controllers/main.py | 6 ++-- addons/web/static/src/css/base.css | 47 ++++++++++++++-------------- addons/web/static/src/js/chrome.js | 49 +++++++++++++++--------------- addons/web/static/src/js/core.js | 6 ++-- addons/web/static/src/xml/base.xml | 33 +++++++++----------- 6 files changed, 78 insertions(+), 69 deletions(-) diff --git a/addons/web/common/session.py b/addons/web/common/session.py index be1a2b749da..db58fea0b59 100644 --- a/addons/web/common/session.py +++ b/addons/web/common/session.py @@ -45,6 +45,12 @@ class OpenERPSession(object): del state['config'] return state + def has_pwc(self): + if not self._uid: + return False + else: + return self.model('publisher_warranty.contract').status()['status'] == 'full' + def build_connection(self): conn = openerplib.Connection(self.config.connector, database=self._db, login=self._login, user_id=self._uid, password=self._password) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e3af96206dc..73fb7a0684b 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -370,7 +370,8 @@ class Session(openerpweb.Controller): "uid": req.session._uid, "context": ctx, "db": req.session._db, - "login": req.session._login + "login": req.session._login, + "has_pwc": req.session.has_pwc() } @openerpweb.jsonrequest @@ -379,7 +380,8 @@ class Session(openerpweb.Controller): "uid": req.session._uid, "context": req.session.get_context() if req.session._uid else False, "db": req.session._db, - "login": req.session._login + "login": req.session._login, + "has_pwc": req.session.has_pwc() } @openerpweb.jsonrequest diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 98f28fa579c..5624f6d0740 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1746,42 +1746,45 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { } /* Dialog traceback cases */ -.expandcase { - background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; +.openerp .expandcase { + background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; margin-top:10px; } -.collapsecase { - background: transparent url(/web/static/src/img/collapse.gif) 0 50% no-repeat; - margin-top:10px; +.openerp .collapsecase { + background: transparent url(/web/static/src/img/collapse.gif) 0 50% no-repeat; + margin-top:10px; } -.case-head{ - padding-left:18px; - margin-top:5px; +.openerp .case-head{ + padding-left:18px; + margin-top:5px; } -.error-detail{ +.openerp .error-detail{ display:none; } -.error-fix{ - border:1px solid #999999; - overflow:auto; +.openerp .error-send{ + display:block; } -.fielddiv{ +.openerp .error-fix{ + border:1px solid #999999; + overflow:auto; +} +.openerp .fielddiv{ display:inline-block; } -.fielddiv label{ -/* width:20%; */ - float:left; - text-align:right; +.openerp .fielddiv label{ + /* width:20%; */ + float:left; + text-align:right; } -.fielddiv div{ - width:79%; +.openerp .fielddiv div{ + width:79%; float:right; } -.fielddiv input[type=text],textarea{ - width:80%; +.openerp .fielddiv input[type=text],textarea{ + width:200px; } /* for Alignment center */ -.centeralign{ +.openerp .centeralign{ text-align:center; } /* Buttons */ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 41ecbb2bdca..468127f8810 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -188,34 +188,29 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ ] }).start(); dialog.$element.html(QWeb.render('DialogTraceback', {error: this.error})); + + $('#button_send_error').click(function() { + var issuename = $('#issuename').val(); + var explanation = $('#explanation').val(); + var remark = $('#remark').val(); + + // Call the send method from server to send mail with details + new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [self.error.data,explanation,remark,issuename]).then(function(result){ + if (result === false) ( + alert('There was a communication error.')) + console.log(arguments); + }); + }); + + if (!self.session.has_pwc) { + $('.error-send').html('Unsupported/Community Version'); + } + dialog.$element.find('.expandcase').each(function() { var $this = $(this); - $this.click( function() { - if ($this.attr('id') == "case2") { - /* call the status method from the server to verify status of contract - if status is full then contract is valid - if status is none then contract is invalid - */ - new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('status', []).then(function(res) { - var hasacontract = res.status == "full"; - if (!hasacontract) { - $this.find('a').attr({ href : 'http://www.openerp.com/support-or-publisher-warranty-contract',target: "_blank" }); - $this.find('a').css( 'text-decoration', 'none' ); - } else { - $this.next().find('[type=button]').click( function() { - var issuename = $('#issuename').val(); - var explanation = $('#explanation').val(); - var remark = $('#remark').val(); - // Call the send method from server to send mail with details - new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [self.error.data,explanation,remark,issuename]); - }); - $this.next().toggle().prev().toggleClass("expandcase collapsecase"); - } - }); - } else { - $this.next().toggle().prev().toggleClass("expandcase collapsecase"); - } + $this.click( function() { + $this.next().toggle().prev().toggleClass("expandcase collapsecase"); }); }); } @@ -1080,6 +1075,10 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie self.action_manager = new openerp.web.ActionManager(self); self.action_manager.appendTo($("#oe_app")); self.bind_hashchange(); + if (!self.session.has_pwc) { + self.$element.find('.oe_footer_powered').append(' - Unsupported/Community Version'); + $('title').html('OpenERP - Community Version'); + } }); }, do_reload: function() { diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 32cb5efdb73..018a474ddbc 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -544,7 +544,8 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. db: result.db, username: result.login, uid: result.uid, - user_context: result.context + user_context: result.context, + has_pwc: result.has_pwc }); var deferred = self.do_load_qweb(['/web/webclient/qweb']); if(self.uid) { @@ -569,7 +570,8 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. db: result.db, username: result.login, uid: result.uid, - user_context: result.context + user_context: result.context, + has_pwc: result.has_pwc }); // TODO: session store in cookie should be optional self.set_cookie('session_id', self.session_id); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 0a6e3ba0b56..eb32c109787 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -57,9 +57,6 @@ @@ -1381,7 +1378,7 @@ -
+
@@ -1390,29 +1387,29 @@
-
+ +
OpenERP Enterprise Contract.
-
Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.
-
+

Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.
+
-
+ +

+
+
+


-
- -


-
-
- +
+
-
+

-
+
From 2d45a0b80c7bf2c857402740d2a47209bdb1642a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Thu, 22 Dec 2011 13:28:26 +0100 Subject: [PATCH 3/7] modify according to review bzr revid: rlo@openerp.com-20111222122826-vepc0vz21wt5oq3f --- addons/web/static/src/css/base.css | 24 ++++++++++++------------ addons/web/static/src/js/chrome.js | 6 +++--- addons/web/static/src/xml/base.xml | 19 ++++++++----------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 59407fd40ee..abe91bedef4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1884,45 +1884,45 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { } /* Dialog traceback cases */ -.openerp .expandcase { +.openerp .oe_expandcase { background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; margin-top:10px; } -.openerp .collapsecase { +.openerp .oe_collapsecase { background: transparent url(/web/static/src/img/collapse.gif) 0 50% no-repeat; margin-top:10px; } -.openerp .case-head{ +.openerp .oe_case_head{ padding-left:18px; margin-top:5px; } -.openerp .error-detail{ +.openerp .oe_error_detail{ display:none; } -.openerp .error-send{ +.openerp .oe_error_send{ display:block; } -.openerp .error-fix{ +.openerp .oe_error_fix{ border:1px solid #999999; overflow:auto; } -.openerp .fielddiv{ +.openerp .oe_fielddiv{ display:inline-block; } -.openerp .fielddiv label{ +.openerp .oe_fielddiv label{ /* width:20%; */ float:left; text-align:right; } -.openerp .fielddiv div{ +.openerp .oe_fielddiv div{ width:79%; - float:right; + float:right; } -.openerp .fielddiv input[type=text],textarea{ +.openerp .oe_fielddiv input[type=text],textarea{ width:200px; } /* for Alignment center */ -.openerp .centeralign{ +.openerp .oe_centeralign{ text-align:center; } diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b898472a6b2..df56bff9a7b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -214,14 +214,14 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ }); if (!self.session.has_pwc) { - $('.error-send').html('Unsupported/Community Version'); + $('.oe_error_send').html('Unsupported/Community Version'); } - dialog.$element.find('.expandcase').each(function() { + dialog.$element.find('.oe_expandcase').each(function() { var $this = $(this); $this.click( function() { - $this.next().toggle().prev().toggleClass("expandcase collapsecase"); + $this.next().toggle().prev().toggleClass("oe_expandcase oe_collapsecase"); }); }); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5b471d9eb76..c5ffedd157b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1347,30 +1347,27 @@
-
- +
+
-
+
- -
+
-
OpenERP Enterprise Contract.
+
OpenERP Enterprise Contract.

Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.
- +


-
+



-
+

From df0457762d20d47728a40a56d200fa6ac324c5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Thu, 22 Dec 2011 15:04:58 +0100 Subject: [PATCH 4/7] modified according to review bzr revid: rlo@openerp.com-20111222140458-vrbsremb9lgj8r86 --- addons/web/static/src/css/base.css | 26 +++---------------- addons/web/static/src/js/chrome.js | 10 +------- addons/web/static/src/xml/base.xml | 41 ++++++++++++++---------------- 3 files changed, 23 insertions(+), 54 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index abe91bedef4..54ba44f2473 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1884,20 +1884,8 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { } /* Dialog traceback cases */ -.openerp .oe_expandcase { - background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat; - margin-top:10px; -} -.openerp .oe_collapsecase { - background: transparent url(/web/static/src/img/collapse.gif) 0 50% no-repeat; - margin-top:10px; -} -.openerp .oe_case_head{ - padding-left:18px; - margin-top:5px; -} .openerp .oe_error_detail{ - display:none; + display:block; } .openerp .oe_error_send{ display:block; @@ -1908,18 +1896,10 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { } .openerp .oe_fielddiv{ display:inline-block; -} -.openerp .oe_fielddiv label{ - /* width:20%; */ - float:left; - text-align:right; -} -.openerp .oe_fielddiv div{ - width:79%; - float:right; + width:100%; } .openerp .oe_fielddiv input[type=text],textarea{ - width:200px; + width:100%; } /* for Alignment center */ .openerp .oe_centeralign{ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index df56bff9a7b..87d996a65e0 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -214,16 +214,8 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ }); if (!self.session.has_pwc) { - $('.oe_error_send').html('Unsupported/Community Version'); + $('.oe_error_send').html('You have an unsupported version. Click here to get support & maintenance service.'); } - - dialog.$element.find('.oe_expandcase').each(function() { - var $this = $(this); - - $this.click( function() { - $this.next().toggle().prev().toggleClass("oe_expandcase oe_collapsecase"); - }); - }); } }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c5ffedd157b..7ab3a5a2d83 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1347,33 +1347,30 @@ -
- -
+
+
+
OpenERP Enterprise Contract.
+

Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.

+
+
+ +


+
+
+ +


+
+
+ +
+

+
+

-
-
-
OpenERP Enterprise Contract.
-

Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.
- -
- -

-
-
- -


-
-
- -
-

-
-
From ab3d6750c1441e50d0946eb8b549b198bf78f399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Fri, 23 Dec 2011 13:06:34 +0100 Subject: [PATCH 5/7] modify according to new review bzr revid: rlo@openerp.com-20111223120634-dy10nsi3k2j925fc --- addons/web/static/src/js/chrome.js | 56 +++++++++++++++++------------- addons/web/static/src/xml/base.xml | 38 +++++++++++--------- 2 files changed, 53 insertions(+), 41 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 87d996a65e0..dc1bf86e12d 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -175,18 +175,45 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ }); }, on_traceback: function(error) { - this.servererror = new openerp.web.ServerError(error); + this.servererror = new openerp.web.ServerError(this,error); this.servererror.start(); } }); openerp.web.ServerError = openerp.web.Dialog.extend({ template: 'DialogTraceback', - init: function(error) { - this._super(); + init: function(parent, error) { + this._super(parent); this.error = error; }, start: function() { var self = this; + if (self.session.has_pwc) { + var buttons = [ + { + text: _t("Send to OpenERP Enterprise Team"), + click: function() { + var issuename = $('#issuename').val(); + var explanation = $('#explanation').val(); + var remark = $('#remark').val(); + // Call the send method from server to send mail with details + new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [self.error.data,explanation,remark,issuename]).then(function(result){ + if (result === false) { + alert('There was a communication error.') + } else { + $(this).dialog('close'); + } + console.log(arguments); + }); + } + }, + { + text: _t("Dont send"), click: function() { $(this).dialog("close"); } + } + ] + } else { + var buttons = {text: _t("Ok"), click: function() { $(this).dialog("close"); }} + } + var dialog = new openerp.web.Dialog(this, { title: "OpenERP " + _.str.capitalize(this.error.type), autoOpen: true, @@ -194,28 +221,9 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ height: '50%', min_width: '800px', min_height: '600px', - buttons: [ - {text: _t("Ok"), click: function() { $(this).dialog("close"); }} - ] + buttons: buttons }).start(); - dialog.$element.html(QWeb.render('DialogTraceback', {error: this.error})); - - $('#button_send_error').click(function() { - var issuename = $('#issuename').val(); - var explanation = $('#explanation').val(); - var remark = $('#remark').val(); - - // Call the send method from server to send mail with details - new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [self.error.data,explanation,remark,issuename]).then(function(result){ - if (result === false) ( - alert('There was a communication error.')) - console.log(arguments); - }); - }); - - if (!self.session.has_pwc) { - $('.oe_error_send').html('You have an unsupported version. Click here to get support & maintenance service.'); - } + dialog.$element.html(QWeb.render('DialogTraceback', {session: this.session, error: this.error})); } }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7ab3a5a2d83..2760f1328d3 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1347,25 +1347,29 @@
-
-
-
OpenERP Enterprise Contract.
-

Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.

+ + You have an unsupported version. Click here to get support & maintenance services. + + +
-
- -


-
-
- -


-
-
- +
OpenERP Enterprise Contract.
+

Your request will be sent to OpenERP and OpenERP Enterprise team will reply you shortly.

+
+
+ +


+
+
+ +


+
+
+ +
-

-
-

+

+
From 9d50e87a25589e6f9f1408d464e0c3143593ffa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Fri, 23 Dec 2011 13:55:14 +0100 Subject: [PATCH 6/7] remove merge lines from CSS bzr revid: rlo@openerp.com-20111223125514-fxj6jgwme2az5e5x --- addons/web/static/src/css/base.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 54ba44f2473..96d56b6104f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2012,7 +2012,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { background-position: 0px -21px; } ->>>>>>> MERGE-SOURCE /* Buttons */ .openerp .oe_button:link, .openerp .oe_button:visited, @@ -2104,7 +2103,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { color: #aaaaaa !important; cursor: default; text-shadow: 0 1px 1px white !important; ->>>>>>> MERGE-SOURCE } /* Login page */ From ca87c95f3c2425e5c45f8ff483b0ce53da16f5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20L=C3=B3pez=20L=C3=B3pez=20=28OpenERP=29?= Date: Fri, 23 Dec 2011 14:19:11 +0100 Subject: [PATCH 7/7] [IMP] full working traceback dialog bzr revid: rlo@openerp.com-20111223131911-lg1xjek2afvhkf41 --- addons/web/static/src/js/chrome.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index dc1bf86e12d..a10dc4bc62b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -192,6 +192,7 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ { text: _t("Send to OpenERP Enterprise Team"), click: function() { + $this = $(this); var issuename = $('#issuename').val(); var explanation = $('#explanation').val(); var remark = $('#remark').val(); @@ -200,7 +201,7 @@ openerp.web.ServerError = openerp.web.Dialog.extend({ if (result === false) { alert('There was a communication error.') } else { - $(this).dialog('close'); + $this.dialog('close'); } console.log(arguments); });