From 3a695c1687cfef1cc7f0f56e9ba49cbb4e4647c3 Mon Sep 17 00:00:00 2001 From: Pascal GOUHIER Date: Mon, 31 Aug 2020 16:22:55 +0200 Subject: [PATCH 1/4] Update account_asset.js Correction for #89 --- smile_account_asset/static/src/js/account_asset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smile_account_asset/static/src/js/account_asset.js b/smile_account_asset/static/src/js/account_asset.js index 8273ca3d3..b4f56ebf7 100644 --- a/smile_account_asset/static/src/js/account_asset.js +++ b/smile_account_asset/static/src/js/account_asset.js @@ -32,7 +32,7 @@ odoo.define('smile_account_asset.create_asset', function (require) { if (el.modelName === 'account.invoice.line' && action.xml_id === "smile_account_asset.action_account_invoice_line") { el.$buttons.on('click', '.o_list_button_create_asset', create_asset.bind(el)); - } else if (el.$buttons != undefined) { + } else if (el.$buttons) { el.$buttons.find('.btn.btn-primary.btn-sm.o_list_button_create_asset').hide(); } }) From 9be31292b5344d6fadf1b37d408ff5db093d7b1f Mon Sep 17 00:00:00 2001 From: Pascal GOUHIER Date: Tue, 8 Sep 2020 18:02:12 +0200 Subject: [PATCH 2/4] Update account_asset_asset.py Update uom reference to uom object --- smile_account_asset/models/account_asset_asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smile_account_asset/models/account_asset_asset.py b/smile_account_asset/models/account_asset_asset.py index af2b52dbf..5b6a5fa0a 100644 --- a/smile_account_asset/models/account_asset_asset.py +++ b/smile_account_asset/models/account_asset_asset.py @@ -189,7 +189,7 @@ def _get_default_uom(self): 'Quantity', required=True, default=1.0, readonly=True, states={'draft': [('readonly', False)]}) uom_id = fields.Many2one( - 'product.uom', 'Unit of Measure', required=True, ondelete='restrict', + 'uom.uom', 'Unit of Measure', required=True, ondelete='restrict', default=_get_default_uom, readonly=True, states={'draft': [('readonly', False)]}) purchase_tax_ids = fields.Many2many( From a9d164866882813410f4d030b861266cd3277e8c Mon Sep 17 00:00:00 2001 From: Pascal GOUHIER Date: Thu, 10 Sep 2020 17:38:55 +0200 Subject: [PATCH 3/4] Update account_asset.js Line #29 : add '|| {}' at the end to correct an error when "actions" are undefined. --- smile_account_asset/static/src/js/account_asset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smile_account_asset/static/src/js/account_asset.js b/smile_account_asset/static/src/js/account_asset.js index 8273ca3d3..b596bfeec 100644 --- a/smile_account_asset/static/src/js/account_asset.js +++ b/smile_account_asset/static/src/js/account_asset.js @@ -26,7 +26,7 @@ odoo.define('smile_account_asset.create_asset', function (require) { renderButtons: function ($node) { this._super.apply(this, arguments); var el = this; - var actions = this.getParent().actions; + var actions = this.getParent().actions || {}; Object.keys(actions).forEach(function(key) { var action = actions[key]; if (el.modelName === 'account.invoice.line' && From aa1dd254bf5f81bc7cd84ac3eeed03365392e83e Mon Sep 17 00:00:00 2001 From: Pascal GOUHIER Date: Fri, 11 Sep 2020 14:28:53 +0200 Subject: [PATCH 4/4] Update account_asset.js Correct } else if (el.$buttons !== undefined) { in place of } else if (el.$buttons) { --- smile_account_asset/static/src/js/account_asset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smile_account_asset/static/src/js/account_asset.js b/smile_account_asset/static/src/js/account_asset.js index 9c98a9186..aec69df48 100644 --- a/smile_account_asset/static/src/js/account_asset.js +++ b/smile_account_asset/static/src/js/account_asset.js @@ -32,7 +32,7 @@ odoo.define('smile_account_asset.create_asset', function (require) { if (el.modelName === 'account.invoice.line' && action.xml_id === "smile_account_asset.action_account_invoice_line") { el.$buttons.on('click', '.o_list_button_create_asset', create_asset.bind(el)); - } else if (el.$buttons) { + } else if (el.$buttons !== undefined) { el.$buttons.find('.btn.btn-primary.btn-sm.o_list_button_create_asset').hide(); } })