diff --git a/product_return_pos/__manifest__.py b/product_return_pos/__manifest__.py index fce54b63b..cc4dece7f 100644 --- a/product_return_pos/__manifest__.py +++ b/product_return_pos/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'Product Return In POS', - 'version': '13.0.1.0.1', + 'version': '13.0.1.0.2', 'category': 'Point of Sale', 'summary': 'POS Order Return', 'author': 'Cybrosys Techno Solutions', diff --git a/product_return_pos/doc/RELEASE_NOTES.md b/product_return_pos/doc/RELEASE_NOTES.md index 2f672f4fa..49c8f3ea3 100644 --- a/product_return_pos/doc/RELEASE_NOTES.md +++ b/product_return_pos/doc/RELEASE_NOTES.md @@ -9,3 +9,8 @@ #### Version 13.0.1.0.1 ##### UPDT - Auto refresh added. + +#### 19.03.2020 +#### Version 13.0.1.0.2 +##### UPDT +- Refresh Button added. diff --git a/product_return_pos/static/src/css/pos_return.css b/product_return_pos/static/src/css/pos_return.css index d363ba7ed..47973f91d 100644 --- a/product_return_pos/static/src/css/pos_return.css +++ b/product_return_pos/static/src/css/pos_return.css @@ -39,6 +39,12 @@ margin-top:8px; left: 50%; } +.return-screen .refreshbutton{ + right: auto; + margin-left: 90px; + margin-top:8px; + left: 85%; +} .reprint_order_screen .searchbox input{ width: 120px; } diff --git a/product_return_pos/static/src/js/pos_return.js b/product_return_pos/static/src/js/pos_return.js index 15483e47b..821d7d12c 100644 --- a/product_return_pos/static/src/js/pos_return.js +++ b/product_return_pos/static/src/js/pos_return.js @@ -4,7 +4,6 @@ odoo.define('product_return_pos.return',function(require) { var models = require('point_of_sale.models'); var screens = require('point_of_sale.screens'); var ScreenWidget = screens.ScreenWidget; -var ReceiptScreenWidget = screens.ReceiptScreenWidget; var gui = require('point_of_sale.gui'); var core = require('web.core'); var QWeb = core.qweb; @@ -31,16 +30,6 @@ models.load_models({ } }); -ReceiptScreenWidget.include({ - - renderElement: function() { - this._super(); - this.$('.next').click(function(){ - location.reload(); - }); - }, -}); - var ReturnWidget = PopupWidget.extend({ template:'ReturnWidget', @@ -177,10 +166,14 @@ var OrderListScreenWidget = ScreenWidget.extend({ var self = this; this._super(); this.renderElement(); + var orders = this.pos.orders; this.$('.back').click(function(){ self.gui.back(); }); - var orders = this.pos.orders; + this.$('.refresh').click(function(){ + location.reload(); + }); + this.render_list(orders); var search_timeout = null; this.$('.searchbox input').on('keypress',function(event){ diff --git a/product_return_pos/static/src/xml/pos_return.xml b/product_return_pos/static/src/xml/pos_return.xml index 94013285d..4ff5eeb30 100644 --- a/product_return_pos/static/src/xml/pos_return.xml +++ b/product_return_pos/static/src/xml/pos_return.xml @@ -3,7 +3,8 @@
- Return + + Return
@@ -11,7 +12,7 @@ - + @@ -27,12 +28,18 @@ Cancel + - + + + + Refresh + +
@@ -64,7 +71,7 @@