[MERGE] trunk.

bzr revid: bth@tinyerp.com-20110704051825-fj1izlavbf6297by

1 files changed, 42 insertions, 20 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 508592e745f..a761318f084 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"/>
@@ -232,14 +232,14 @@
             <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
             <div class="oe_vm_switch">
                 <t t-if="views.length != 1" t-foreach="views" t-as="view">
-                    <button type="button" t-att-data-view-type="view[1]">
-                        <t t-esc="view[1]"/>
+                    <button type="button" t-att-data-view-type="view.view_type">
+                        <t t-esc="view.view_type"/>
                     </button>
                 </t>
             </div>
             <div t-attf-id="#{prefix}_search" t-opentag="true"/>
             <t t-foreach="views" t-as="view">
-                <div t-attf-id="#{prefix}_view_#{view[1]}"/>
+                <div t-attf-id="#{prefix}_view_#{view.view_type}"/>
             </t>
         </td>
         <td class="view-manager-main-sidebar" height="100%">
@@ -365,7 +365,7 @@
                     <t t-set="value" t-value="row['data'][column.id].value"/>
                     <t t-esc="value instanceof Array ? value[1] : value"/>
                 </t>
-                <button type="button" t-att-title="column.help"
+                <button type="button" t-att-title="column.string"
                         t-if="is_button">
                     <img t-att-src="'/base/static/src/img/icons/' + column.icon + '.png'"
                          t-att-alt="column.string"/>
@@ -384,8 +384,14 @@
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header" t-att-id="view.element_id + '_header'">
         <div class="oe_form_buttons" t-if="view.flags.action_buttons !== false">
-            <!--<button type="button" class="oe_form_button_save">Save</button>-->
-            <button type="button" class="oe_form_button_save_edit">Save &amp; Edit</button>
+            <!--<button type="button" class="oe_form_button_save">
+                <span class="oe_form_on_update">Save</span>
+                <span class="oe_form_on_create">Create</span>
+            </button>-->
+            <button type="button" class="oe_form_button_save_edit">
+                <span class="oe_form_on_update">Save &amp; Edit</span>
+                <span class="oe_form_on_create">Create &amp; Edit</span>
+            </button>
             <!--<button type="button" class="oe_form_button_cancel">Cancel</button>-->
             <button type="button" class="oe_form_button_new">New</button>
         </div>
@@ -486,6 +492,9 @@
         <t t-if="widget.string and widget.node.tag != 'label'">:</t>
     </label>
 </t>
+<t t-name="WidgetParagraph">
+    <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
+</t>
 <t t-name="FieldChar">
     <input type="text"
         t-att-name="widget.name"
@@ -828,6 +837,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">
@@ -894,27 +904,39 @@
     </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>
+    <table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
+    <tr>
+        <td><img src="/base/static/src/img/warning.png" class="oe-dialog-icon"/></td>
+        <td>
+            <p>
+                <t t-js="d">
+                    d.html_error = context.engine.tools.html_escape(d.error.data.fault_code).replace(/\n/g, '<br/>');
+                </t>
+                <t t-raw="html_error"/>
+            </p>
+        </td>
+    </tr>
+    </table>
+</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="Many2XSelectPopup">
+<t t-name="SelectCreatePopup">
     <div t-att-id="element_id">
         <div t-att-id="element_id + '_search'"></div>
         <div t-att-id="element_id + '_view_list'"></div>
         <div t-att-id="element_id + '_view_form'"></div>
     </div>
 </t>
-<t t-name="Many2XSelectPopup.search.buttons">
-    <button type="button" class="oe_many2xselectpopup-search-new">New</button>
-    <button type="button" class="oe_many2xselectpopup-search-close">Close</button>
+<t t-name="SelectCreatePopup.search.buttons">
+    <button type="button" class="oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
+    <button type="button" class="oe_selectcreatepopup-search-close">Close</button>
 </t>
-<t t-name="Many2XSelectPopup.form.buttons">
-    <button type="button" class="oe_many2xselectpopup-form-save">Save</button>
-    <button type="button" class="oe_many2xselectpopup-form-close">Close</button>
+<t t-name="SelectCreatePopup.form.buttons">
+    <button type="button" class="oe_selectcreatepopup-form-save">Save</button>
+    <button type="button" class="oe_selectcreatepopup-form-close">Close</button>
 </t>
 <t t-name="ListView.row.frame" t-extend="WidgetFrame">
     <t t-jquery="tr">