diff options
| author | Pierre Masereel <pim@odoo.com> | 2017-09-25 16:06:14 +0200 |
|---|---|---|
| committer | Pierre Masereel <pim@odoo.com> | 2017-09-27 09:21:17 +0200 |
| commit | c49356986699e39d2ee7ddccd4f3485fe6f47b1a (patch) | |
| tree | 28d613ecb770e5e6c409496d2099a970e099c094 | |
| parent | 55c0221e38379b9dc299c588c6ceca947ba5bd4f (diff) | |
[FIX] stock, barcodes: allow force detailed view of picking and rename barcode 'CANCEL' to 'DISCARD'
| -rw-r--r-- | addons/barcodes/static/src/js/barcode_form_view.js | 2 | ||||
| -rw-r--r-- | addons/barcodes/static/tests/barcode_tests.js | 2 | ||||
| -rw-r--r-- | addons/stock/models/stock_picking.py | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js index da90b198352..bdef3a4ecaf 100644 --- a/addons/barcodes/static/src/js/barcode_form_view.js +++ b/addons/barcodes/static/src/js/barcode_form_view.js @@ -27,7 +27,7 @@ FormController.include({ form_view: { commands: { 'O-CMD.EDIT': this._barcodeEdit.bind(this), - 'O-CMD.CANCEL': this._barcodeDiscard.bind(this), + 'O-CMD.DISCARD': this._barcodeDiscard.bind(this), 'O-CMD.SAVE': this._barcodeSave.bind(this), 'O-CMD.PAGER-PREV': this._barcodePagerPrevious.bind(this), 'O-CMD.PAGER-NEXT': this._barcodePagerNext.bind(this), diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js index 7487972ea62..63728733829 100644 --- a/addons/barcodes/static/tests/barcode_tests.js +++ b/addons/barcodes/static/tests/barcode_tests.js @@ -119,7 +119,7 @@ QUnit.test('edit, save and cancel buttons', function (assert) { // dummy change to check that it correctly discards form.$('.o_field_widget').val('test').trigger('input'); // O-CMD.CANCEL - _.each(["O","-","C","M","D",".","C","A","N","C","E","L","Enter"], triggerKeypressEvent); + _.each(["O","-","C","M","D",".","D","I","S","C","A","R","D","Enter"], triggerKeypressEvent); assert.strictEqual(form.$(".o_form_readonly").length, 1, "should have switched to 'readonly' mode"); assert.verifySteps(['save'], 'should not have saved'); diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index 1d24653db4f..1bb3a682b03 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -297,6 +297,9 @@ class Picking(models.Model): @api.depends('picking_type_id.show_operations') def _compute_show_operations(self): for picking in self: + if self.env.context.get('force_detailed_view'): + picking.show_operations = True + break if picking.picking_type_id.show_operations: if (picking.state == 'draft' and not self.env.context.get('planned_picking')) or picking.state != 'draft': picking.show_operations = True |