From 512f5a1bc5aa945877772352675f33a56b8e6ce4 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Tue, 7 Aug 2012 19:04:27 +0530
Subject: [PATCH] [REM] remove button widget

bzr revid: rgaopenerp-20120807133427-kskuv8gtf72fdlwe
---
 .../account/account_move_reconciliation.xml   |  4 +-
 .../src/js/account_move_reconciliation.js     | 78 ++++++-------------
 .../account/wizard/account_reconcile_view.xml |  6 +-
 3 files changed, 30 insertions(+), 58 deletions(-)

diff --git a/addons/account/account_move_reconciliation.xml b/addons/account/account_move_reconciliation.xml
index 96054d0548d..d98f929d05b 100644
--- a/addons/account/account_move_reconciliation.xml
+++ b/addons/account/account_move_reconciliation.xml
@@ -22,8 +22,8 @@
                             <field name="latest_date"/>
                         </div>
                         <div>
-                            <button string="Reconcile" name="%(action_view_account_move_line_reconcile)d" widget="list_button" type="action"/>
-                            <button string="Nothing to Reconcile" name="skip_partner" widget="btn_extend" type="object"/> 
+                            <a type="button" class="oe_reconcile" name="%(action_view_account_move_line_reconcile)d">Reconcile</a>
+                            <button string="Nothing to Reconcile" name="skip_partner"   type="object"/> 
                             <field name="reconciliation_progress" widget="progressbar"/>
                         </div>         
                         <div name="div4">
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 53d1b27f820..8e21bb6e84d 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -2,8 +2,6 @@ openerp.account = function(instance) {
 var _t = instance.web._t,
    _lt = instance.web._lt;
 instance.web.views.add('form_clone', 'instance.account.extend_form_view');
-instance.web.form.tags.add('list_button','instance.account.list_button')
-instance.web.form.tags.add('btn_extend','instance.account.btn_extend')
  
 instance.account.extend_viewmanager = instance.web.ViewManagerAction.include({
     start : function(){
@@ -11,13 +9,6 @@ instance.account.extend_viewmanager = instance.web.ViewManagerAction.include({
         if(this.action.context && this.action.context.extended_form_view_id)
             this.setup_exended_form_view(this)
     }, 
-    on_mode_switch: function (view_type, no_store, options) {
-        self = this
-        self.list_loaded = $.when(this._super.apply(this, arguments)).then(function () {
-            if(self.action.context && self.action.context.extended_form_view_id)
-                self.list_view = self.views['list']
-        })
-    },
     setup_exended_form_view: function(parent){
         var self = this,
             from_view,
@@ -45,51 +36,15 @@ instance.account.extend_form_view = instance.web.FormView.extend({
     on_loaded: function(data) {
          this._super.apply(this,arguments);
          var self = this
+         this.$element.find(".oe_reconcile").on('click', this.do_reconcilation)
          this.$element.on('click','a[data-pager-action]',function() {
             var action = $(this).data('pager-action');
             self.on_pager_action(action);
         });
     },
-    do_update_pager: function(hide_index) {
-        var index = hide_index ? '-' : this.dataset.index + 1;
-        this.$element.find('span.oe_pager_index_extend').html(index).end()
-                   .find('span.oe_pager_count_extend').html(this.dataset.ids.length);
-    },
-    on_pager_action: function(action) {
+    do_reconcilation:function(event){
         var self = this
-        var viewmanager = self.getParent();
-        viewmanager.action.domain = this.original_domain
-        $.when(this._super(action)).then(function() {
-            var id = self.get_fields_values().partner_id;
-            // apply domain on list
-            viewmanager.action.domain = (viewmanager.action.domain || []).concat([["partner_id", "=", id]])
-            viewmanager.searchview.do_search()
-        })
-    },
-  })
-
-instance.account.btn_extend = instance.web.form.WidgetButton.extend({
-    on_click: function() {
-        var self = this;
-        this.force_disabled = true;
-        this.check_disable();
-        this.execute_action().always(function() {
-            self.force_disabled = false;
-            self.check_disable();
-            self.reload_view();
-        });
-        
-    },
-    reload_view :function(){
-       viewmanager = this.view.getParent().getParent()
-       viewmanager.inner_widget.list_view.controller.reload_content();
-    },
-})
-
-instance.account.list_button = instance.web.form.WidgetButton.extend({
-    on_click: function() {
-        var self = this
-        var list_view = this.view.getParent().list_view.controller
+        var list_view = this.getParent().views['list'].controller
         ids = list_view.get_selected_ids()
         if (ids.length == 0) {
             instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
@@ -101,7 +56,7 @@ instance.account.list_button = instance.web.form.WidgetButton.extend({
             active_model: list_view.dataset.model
         });
         self.rpc("/web/action/load", {
-            action_id: py.eval(this.node.attrs.name),
+            action_id: py.eval(event.target.name),
             context: additional_context
             }, function(result) {
                 result.result.context = _.extend(result.result.context || {},
@@ -111,10 +66,27 @@ instance.account.list_button = instance.web.form.WidgetButton.extend({
                 self.do_action(result.result, function () {
                     // reload view
                     list_view.reload();
-                    self.getParent().reload()
             });
         });
-   }
-})
- 
+
+    },
+    do_update_pager: function(hide_index) {
+        var index = hide_index ? '-' : this.dataset.index + 1;
+        this.$element.find('span.oe_pager_index_extend').html(index).end()
+                   .find('span.oe_pager_count_extend').html(this.dataset.ids.length);
+    },
+    
+    on_pager_action: function(action) {
+        var self = this
+        var viewmanager = self.getParent();
+        viewmanager.action.domain = this.original_domain
+        $.when(this._super(action)).then(function() {
+            var id = self.get_fields_values().partner_id;
+            // apply domain on list
+            viewmanager.action.domain = (viewmanager.action.domain || []).concat([["partner_id", "=", id]])
+            viewmanager.searchview.do_search();
+        })
+    },
+  })
+
 }
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 426eeeb4514..1b36394a7e0 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -14,9 +14,9 @@
                         <field name="writeoff"/>
                     </group>
                     <footer>
-                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" widget="btn_extend" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
-                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff"  widget="btn_extend" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile"  widget="btn_extend" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object"   default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff"    type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile"    type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>