diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-09-20 18:22:57 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-09-20 18:22:57 +0200 |
| commit | 4dfc435b092fde85a4ee00d65bdae85d2cbc2374 (patch) | |
| tree | 70dbe3e5d5394ec6ab722124d5489d2e6b0d401c /addons/account/static/src | |
| parent | a79bc9be12fc488d7e8ec987ce45e3247dafaccf (diff) | |
Added mark as reconciled
bzr revid: nicolas.vanhoren@openerp.com-20120920162257-njbnth2t30jranvx
Diffstat (limited to 'addons/account/static/src')
3 files changed, 19 insertions, 3 deletions
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css index 85ae6cae740..10ad4f594a8 100644 --- a/addons/account/static/src/css/account_move_reconciliation.css +++ b/addons/account/static/src/css/account_move_reconciliation.css @@ -3,3 +3,8 @@ border-bottom: 1px solid #CACACA; padding: 5px; } + +.openerp .oe_account_reconciliation button { + margin-top: 3px; + margin-bottom: 3px; +}
\ No newline at end of file diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js index 6399cdbca5d..3c7a56971ec 100644 --- a/addons/account/static/src/js/account_move_reconciliation.js +++ b/addons/account/static/src/js/account_move_reconciliation.js @@ -27,6 +27,9 @@ openerp.account = function (instance) { this.$(".oe_account_recon_reconcile").click(function() { self.reconcile(); }); + this.$(".oe_account_recom_mark_as_reconciled").click(function() { + self.mark_as_reconciled(); + }); } return tmp; }, @@ -86,6 +89,13 @@ openerp.account = function (instance) { }); }); }, + mark_as_reconciled: function() { + var self = this; + var id = self.partners[self.current_partner][0]; + new instance.web.Model("res.partner").call("mark_as_reconciled", [[id]]).pipe(function() { + self.do_search(self.last_domain, self.last_context, self.last_group_by); + }); + }, }); }; diff --git a/addons/account/static/src/xml/account_move_reconciliation.xml b/addons/account/static/src/xml/account_move_reconciliation.xml index d975af69d37..5d03399aa7c 100644 --- a/addons/account/static/src/xml/account_move_reconciliation.xml +++ b/addons/account/static/src/xml/account_move_reconciliation.xml @@ -10,12 +10,13 @@ </t> <t t-if="widget.current_partner !== null"> <div> - <a class="oe_account_recon_previous" href="javascript:void(0)"><</a> + <button class="oe_account_recon_previous oe_button" href="javascript:void(0)"><</button> <t t-esc="'' + widget.partners[widget.current_partner][1] + ' (' + (widget.current_partner + 1) + '/' + widget.partners.length + ')'"/> - <a class="oe_account_recon_next" href="javascript:void(0)">></a> + <button class="oe_account_recon_next oe_button" href="javascript:void(0)">></button> </div> <div> - <a class="oe_account_recon_reconcile" href="javascript:void(0)">Reconcile</a> + <button class="oe_account_recon_reconcile oe_button oe_highlight" href="javascript:void(0)">Reconcile</button> + <button class="oe_account_recom_mark_as_reconciled oe_button oe_highlight" href="javascript:void(0)">Nothing to reconcile</button> </div> </t> </div> |