[MERGE]Merge with trunk upto revision no 902.

bzr revid: kch@tinyerp.com-20110902055632-63gdv4uw08wne3kj

diff --cc addons/base/controllers/main.py
Simple merge

diff --cc addons/base/static/src/js/chrome.js
Simple merge

diff --cc addons/base/static/src/js/form.js
index bf649e5,11ddc1a..5672e8b
--- 1/addons/base/static/src/js/form.js
--- 2/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@@ -1315,7 -1336,7 +1336,7 @@@ openerp.base.form.FieldMany2One = opene
          this.$input = this.$element.find("input");
          this.$drop_down = this.$element.find(".oe-m2o-drop-down-button");
          this.$menu_btn = this.$element.find(".oe-m2o-cm-button");
--        
++
          // context menu
          var init_context_menu_def = $.Deferred().then(function(e) {
              var rdataset = new openerp.base.DataSetStatic(self, "ir.values", self.build_context());
@@@ -1323,7 -1344,7 +1344,7 @@@
                  [[self.field.relation, false]], false, rdataset.get_context()], false, 0)
                  .then(function(result) {
                  self.related_entries = result;
--                
++
                  var $cmenu = $("#" + self.cm_id);
                  $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self}));
                  var bindings = {};

diff --cc addons/base/static/src/xml/base.xml
index 2bcef18,7e559a1..42c64a3
--- 1/addons/base/static/src/xml/base.xml
--- 2/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@@ -1362,150 -1363,28 +1363,175 @@@
          <td><button class="oe_export_button_export" id="delete_export_list">Delete</button></td>
      </tr>
  </t>
+ <t t-name="Change_Pwd">
+     <form name="change_password_form" class="oe_forms" method="POST">
+         <table align="center">
+             <tr>
+                 <td><label for="old_pwd">Old Password:</label></td>
+                 <td><input type="password" name="old_pwd"
+                            minlength="1" autofocus="autofocus"/></td>
+             </tr>
+             <tr>
+             <td><label for="new_password">New Password:</label></td>
+             <td><input type="password" name="new_password"
+                        minlength="1" autofocus="autofocus"/></td>
+             </tr>
+             <tr>
+                 <td><label for="confirm_pwd">Confirm Password:</label></td>
+                 <td><input type="password" name="confirm_pwd"
+                              minlength="1"/></td>
+             </tr>
+             <tr>
+                 <td colspan="2" align="right"><input type="submit" value="Change Password"/></td>
+             </tr>
+         </table>
+     </form>
+ </t>
 -</templates>
++
 +<t t-name="ImportView">
 +    <a id="importview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Import</a>
 +</t>
 +<t t-name="ImportDataView">
 +<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data">
 +    <input type="hidden" name="session_id" t-att-value="session.session_id"/>
 +    <input type="hidden" name="model" t-att-value="dataset.model"/>
 +     <table cellspacing="5" border="0" width="100%">
 +        <tr>
 +            <td>
 +                <table width="100%">
 +                    <tr>
 +                        <td width="100%" valign="middle" colspan="4">
 +                            <h2 class="separator horizontal">1. Import a .CSV file</h2>
 +                        </td>
 +                    </tr>
 +                    <tr>
 +                        <td>
 +                            Select a .CSV file to import. If you need a sample of file to import,
 +                            you should use the export tool with the "Import Compatible" option.
 +                        </td>
 +                    </tr>
 +                </table>
 +            </td>
 +        </tr>
 +        <tr>
 +            <td>
 +                <table align="center">
 +                    <tr>
 +                        <td><label>CSV File:</label></td>
 +                        <td>
 +                            <input type="file" id="csvfile" size="50" name="csvfile"/>
 +                        </td>
 +                    </tr>
 +                </table>
 +            </td>
 +        </tr>
 +        <tr>
 +            <td height="10px">
 +            </td>
 +        </tr>
 +        <tr>
 +            <td width="100%">
 +                <div id="record">
 +                    <table width="100%">
 +                        <tr>
 +                            <td width="100%" valign="middle">
 +                                <h2 class="separator horizontal">2. Check your file format</h2>
 +                            </td>
 +                        </tr>
 +                    </table>
 +                    <div id="result"></div>
 +                    <fieldset>
 +                        <legend style="cursor:pointer;">CSV Options</legend>
 +                        <table style="display:none">
 +                            <tr>
 +                               <td><label for="csv_separator">Separator:</label></td>
 +                                <td><input type="text" name="csvsep" id="csv_separator" value=","/></td>
 +                                <td><label for="csv_delimiter">Delimiter:</label></td>
 +                                <td><input type="text" name="csvdel" id="csv_delimiter" value='"'/></td>
 +                            </tr>
 +                            <tr>
 +                                <td><label for="csv_encoding">Encoding:</label></td>
 +                                <td>
 +                                    <select name="csvcode" id="csv_encoding">
 +                                        <option value="utf-8">UTF-8</option>
 +                                        <option value="latin1">Latin 1</option>
 +                                    </select>
 +                                </td>
 +                                <td><label>Lines to skip:</label></td>
 +                                <td><input type="text" name="csvskip" id="csv_skip" value="1"/></td>
 +                            </tr>
 +                        </table>
 +                    </fieldset>
 +                </div>
 +            </td>
 +        </tr>
 +        <tr>
 +            <td width="100%">
 +                <div id="success"></div>
 +            </td>
 +        </tr>
 +    </table>
 +</form>
 +</t>
 +<t t-name="ImportView-result">
 +    <t t-if="error">
 +        <table id="error_tbl">
 +            <tr style="white-space:pre-line;">The import failed due to:<t t-esc="error.message"/></tr>
 +            <t t-if="error.preview">
 +                <tr>Here is a preview of the file we could not import:</tr>
 +                <tr><pre><t t-esc="error.preview"/></pre></tr>
 +            </t>
 +        </table>
 +    </t>
 +    <t t-if="records">
 +        <table id="records_data" class="oe_import_grid" width="100%" style="margin: 5px 0;">
 +            <t t-foreach="records" t-as="record">
 +                <t t-if="record=='header'">
 +                    <tr class="oe_import_grid-header">
 +                        <t t-foreach="records.header" t-as="header">
 +                            <td class="oe_import_grid-cell" id="header"><t t-esc="header[0]"/></td>
 +                        </t>
 +                    </tr>
 +                </t>
 +                <t t-if="record=='sel'">
 +                    <tr>
 +                        <t t-foreach="records.header" t-as="header">
 +                            <td>
 +                                <select name="sel_field" id="sel_field">
 +                                    <option selected="selected" value=""></option>
 +                                    <t t-foreach="records.sel" t-as="selection">
 +                                        <option t-att="{'selected': header[0] === selection ? 'selected' : null}"
 +                                                t-att-value="selection"><t t-esc="selection"/>
 +                                        </option>
 +                                    </t>
 +                                </select>
 +                            </td>
 +                        </t>
 +                    </tr>
 +                </t>
 +                <t t-if="record=='row'">
 +                    <t t-foreach="records.row" t-as="row">
 +                        <tr class="oe_import_grid-row">
 +                            <t t-foreach="row" t-as="column">
 +                                <td class="oe_import_grid-cell"><t t-esc="column"/></td>
 +                            </t>
 +                        </tr>
 +                    </t>
 +                </t>
 +            </t>
 +        </table>
 +    </t>
 +    <t t-if="success">
 +        <table width="100%">
 +            <tr>
 +                <td width="100%" valign="middle" colspan="4">
 +                    <h2 class="separator horizontal">3. File imported</h2>
 +                </td>
 +            </tr>
 +            <tr>
 +                <t t-esc="success.message"/>
 +            </tr>
 +        </table>
 +    </t>
 +</t>
 +</templates>