diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js index bff05aa4636..287989d0efa 100644 --- a/addons/barcodes/static/src/js/barcode_events.js +++ b/addons/barcodes/static/src/js/barcode_events.js @@ -115,7 +115,9 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, { e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "Escape" || e.key === "Tab" || e.key === "Backspace" || e.key === "Delete" || - /F\d\d?/.test(e.key)) { + e.key === "Home" || e.key === "End" || + e.key === "PageUp" || e.key === "PageDown" || + e.key === "Unidentified" || /F\d\d?/.test(e.key)) { return true; } else { return false; diff --git a/addons/hr_gamification/security/ir.model.access.csv b/addons/hr_gamification/security/ir.model.access.csv index 9ace96f7139..78979d89de5 100644 --- a/addons/hr_gamification/security/ir.model.access.csv +++ b/addons/hr_gamification/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink challenge_officer,"Challenge Officer",gamification.model_gamification_challenge,hr.group_hr_user,1,1,1,1 challenge_line_officer,"Challenge Line Officer",gamification.model_gamification_challenge_line,hr.group_hr_user,1,1,1,1 badge_officer,"Badge Officer",gamification.model_gamification_badge,hr.group_hr_user,1,1,1,1 -badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,hr.group_hr_user,1,1,1,1 +badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,hr.group_hr_user,1,1,1,1 diff --git a/addons/payment_stripe/static/src/js/stripe.js b/addons/payment_stripe/static/src/js/stripe.js index c1ddb41351b..2701edf015e 100644 --- a/addons/payment_stripe/static/src/js/stripe.js +++ b/addons/payment_stripe/static/src/js/stripe.js @@ -92,7 +92,10 @@ odoo.define('payment_stripe.stripe', function(require) { so_id: so_id, so_token: so_token }, {'async': false}).then(function (data) { + var $pay_stripe = $('#pay_stripe').detach(); $form.html(data); + // Restore 'Pay Now' button HTML since data might have changed it. + $form.find('#pay_stripe').replaceWith($pay_stripe); handler.open({ name: $("input[name='merchant']").val(), email: $("input[name='email']").val(), diff --git a/addons/sale_stock/models/stock.py b/addons/sale_stock/models/stock.py index 910424ed460..164aa3ea7b4 100644 --- a/addons/sale_stock/models/stock.py +++ b/addons/sale_stock/models/stock.py @@ -40,6 +40,11 @@ class StockMove(models.Model): subtype_id=self.env.ref('mail.mt_note').id) return result + def _prepare_move_split_vals(self, defaults): + defaults = super(StockMove, self)._prepare_move_split_vals(defaults) + defaults['to_refund_so'] = self.to_refund_so + return defaults + class StockPicking(models.Model): _inherit = 'stock.picking' diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index a83833f76dd..d2a7bc996c4 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -935,6 +935,10 @@ class StockMove(models.Model): new_move_prop = self.move_dest_id.split(qty) new_move.write({'move_dest_id': new_move_prop}) + def _prepare_move_split_vals(self, defaults): + # hook to add values in default vals in other modules + return defaults + @api.multi def split(self, qty, restrict_lot_id=False, restrict_partner_id=False): """ Splits qty from move move into a new move @@ -964,6 +968,9 @@ class StockMove(models.Model): 'move_dest_id': self.move_dest_id.id, 'origin_returned_move_id': self.origin_returned_move_id.id, } + + defaults = self._prepare_move_split_vals(defaults) + if restrict_partner_id: defaults['restrict_partner_id'] = restrict_partner_id