wip

bzr revid: nicolas.vanhoren@openerp.com-20120914130630-h7384augk0135qa8

diff --git a/addons/account/account_move_reconciliation.xml b/addons/account/account_move_reconciliation.xml
index 714aacc..1bf2bc7 100644 (file)
--- a/addons/account/account_move_reconciliation.xml
+++ b/addons/account/account_move_reconciliation.xml
@@ -41,7 +41,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">account_reconciliation_list,form</field>
             <field eval="False" name="auto_search"/>
-            <field name="context" eval="{'account_type':'receivable','view_mode':True, 'search_default_unreconciled': 1}"></field>
+            <field name="context" eval="{'account_type':'receivable', 'search_default_unreconciled': 1}"></field>
         </record>
         
         <record id="action_account_payable_manual_reconcile" model="ir.actions.act_window">
@@ -50,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">account_reconciliation_list,form</field>
             <field eval="False" name="auto_search"/>
-            <field name="context" eval="{'account_type':'payable','view_mode':True, 'search_default_unreconciled': 1}"></field>
+            <field name="context" eval="{'account_type':'payable', 'search_default_unreconciled': 1}"></field>
         </record>
         
         <record id="view_move_line_tree_reconciliation" model="ir.ui.view">

diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 7df1f75..cde4e88 100644 (file)
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -1,6 +1,7 @@
 openerp.account = function (instance) {
     var _t = instance.web._t,
         _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
     
     instance.web.account = {};
     
@@ -8,8 +9,12 @@ openerp.account = function (instance) {
     instance.web.account.ReconciliationListView = instance.web.ListView.extend({
         init: function() {
             this._super.apply(this, arguments);
-            console.log("coucou");
-        }
+        },
+        on_loaded: function() {
+            var tmp = this._super.apply(this, arguments);
+            this.$el.prepend(QWeb.render("AccountReconciliation"));
+            return tmp;
+        },
     });
     
     /*instance.web.views.add('form_clone', 'instance.account.extend_form_view');

diff --git a/addons/account/static/src/xml/account_move_reconciliation.xml b/addons/account/static/src/xml/account_move_reconciliation.xml
index 9fe822a..b40e00f 100644 (file)
--- a/addons/account/static/src/xml/account_move_reconciliation.xml
+++ b/addons/account/static/src/xml/account_move_reconciliation.xml
@@ -2,6 +2,70 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
+    
+    <t t-name="AccountReconciliation">
+        <div class="oe_extended_form_view">
+            <div class="oe_formview oe_form_readonly">
+                <div class="oe_form_container">
+                    <div class="oe_form">
+                        <div class="oe_form_nosheet">
+                            <table border="0" cellpadding="0" cellspacing="0" class="oe_form_group ">
+                                <tbody>
+                                    <tr class="oe_form_group_row">
+                                        <td class="oe_form_group_cell" colspan="1" width="50%">
+                                            <h3>
+                                                <a class="oe_pager_button" data-pager-action="previous" type="button">Previous</a>
+                                                <a class="oe_pager_button" data-pager-action="next" type="button">Next</a>
+                                                <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
+                                                    <a class="oe_form_uri" href="#" />
+                                                    <span class="oe_form_m2o_follow" />
+                                                </span>
+                                                (
+                                                <span class="oe_pager_index_extend">0</span>
+                                                <span class="oe_pager_separator">/</span>
+                                                <span class="oe_pager_count_extend">0</span>
+                                                )
+                                            </h3>
+                                        </td>
+                                        <td class="oe_form_group_cell" colspan="1" width="50%">
+                                            <!--<div>
+                                                <label class=" oe_form_label oe_align_right" for="oe-field-input-100" title="">Last Reconciliation</label>
+                                                <span class="oe_form_field oe_datepicker_root oe_form_field_date" />
+                                                <label class=" oe_form_label oe_align_right" for="oe-field-input-101" title="">Latest Entry</label>
+                                                <span class="oe_form_field oe_datepicker_root oe_form_field_date" />
+                                            </div>-->
+                                        </td>
+                                    </tr>
+                                    <tr class="oe_form_group_row">
+                                        <td class="oe_form_group_cell" colspan="1" width="50%">
+                                            <div class="oe_reconcile_row">
+                                                <a class="oe_reconcile oe_reconcile_button" name="339" type="button">Reconcile</a>
+                                                <!--<a class="oe_nothing_to_reconcile oe_reconcile_button" name="skip_partner" type="button">Nothing to Reconcile</a>-->
+                                                <!--<span aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" class="oe_form_field oe_form_field_progressbar ui-progressbar ui-widget ui-widget-content ui-corner-all" role="progressbar">
+                                                    <span>0.00%</span>
+                                                    <div class="ui-progressbar-value ui-widget-header ui-corner-left" style="display: none; width: 0%; " />
+                                                </span>-->
+                                            </div>
+                                        </td>
+                                        <td class="oe_form_group_cell" colspan="1" width="50%">
+                                            <!--<div class="oe_reconcile_row" name="grp_followup">
+                                                <label class=" oe_form_label oe_align_right" for="oe-field-input-102" title="">Latest Follow-up</label>
+                                                <span class="oe_form_field oe_datepicker_root oe_form_field_date" />
+                                                <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
+                                                    <a class="oe_form_uri" href="#" />
+                                                    <span class="oe_form_m2o_follow" />
+                                                </span>
+                                            </div>-->
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
 
     <t t-extend="ViewManagerAction">
           <t t-jquery=".oe_view_manager_header" t-operation="after">