From 8e20af033151e31aa33d2b751d8aaf9a59080855 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 21 Jun 2011 14:10:02 +0200
Subject: [IMP] Improved CrashManager

bzr revid: fme@openerp.com-20110621121002-bqcsuzdfncyb1v24
---
 addons/base/static/src/xml/base.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 949b38e0115..2592abb5fdc 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -870,12 +870,15 @@
     </div>
 </t>
 <t t-name="DialogWarning">
-    <div id="dialog-message" t-att-title="title">
-        <p>
-            <span class="ui-icon ui-icon-circle-check" style="float:left; margin:0 7px 50px 0;"></span>
-            <t t-esc="message"/>
-        </p>
-    </div>
+    <p class="oe-dialog-warning">
+        <img src="/base/static/src/img/warning.png" class="oe-dialog-icon"/>
+        <t t-esc="error.data.fault_code.substr(18)"/>
+    </p>
+</t>
+<t t-name="DialogTraceback">
+    <pre><t t-esc="error.message"/></pre>
+    <hr/>
+    <pre><t t-esc="error.data.debug"/></pre>
 </t>
 <t t-name="SelectCreatePopup">
     <div t-att-id="element_id">
-- 
cgit v1.2.3


From 76db3f38700cd4e4d8d03ab80cc0163b374dba83 Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Tue, 21 Jun 2011 17:49:26 +0530
Subject: [FIX] Just corrected spelling.

bzr revid: noz@tinyerp.com-20110621121926-4b6fhety4r2p1u2l
---
 addons/base/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 2592abb5fdc..9645ce7cee2 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -90,7 +90,7 @@
                             t-att-value="selected_password || ''"/></td>
                     </tr>
                     <tr t-if="has_local_storage">
-                        <td><label for="remember">Rember password:</label></td>
+                        <td><label for="remember">Remember password:</label></td>
                         <td class="oe_remember">
                             <t t-if="remember">
                             <input type="checkbox" name="remember" checked="yes"/>
-- 
cgit v1.2.3


From 04121f8b03478b860d3749cedbba785283f4a86e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Jun 2011 16:04:23 +0200
Subject: [imp] small improvement to advanced filters

bzr revid: nicolas.vanhoren@openerp.com-20110621140423-efbxmrjuwlu8piy1
---
 addons/base/static/src/xml/base.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/base/static/src/xml/base.xml')

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9645ce7cee2..b03bb044ba4 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -804,6 +804,7 @@
         </div>
         <a class="searchview_extended_add_proposition" href="javascript:void(0)">
             <span>Add condition</span></a>
+        <div class="oe_adv_filters_and"><span>and</span></div>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition">
-- 
cgit v1.2.3