diff --git a/rma_account/__manifest__.py b/rma_account/__manifest__.py index 8d3dfdac..67ed41f6 100644 --- a/rma_account/__manifest__.py +++ b/rma_account/__manifest__.py @@ -3,13 +3,13 @@ { 'name': 'RMA Account', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'license': 'LGPL-3', 'category': 'RMA', 'summary': 'Integrates RMA with Invoice Processing', 'author': "Eficent, Odoo Community Association (OCA)", 'website': 'http://www.github.com/OCA/rma', - 'depends': ['account', 'rma'], + 'depends': ['stock_account', 'rma'], 'demo': ['data/rma_operation.xml'], 'data': [ 'security/ir.model.access.csv', diff --git a/rma_account/tests/test_rma_account.py b/rma_account/tests/test_rma_account.py index a4f41fdb..2f53a503 100644 --- a/rma_account/tests/test_rma_account.py +++ b/rma_account/tests/test_rma_account.py @@ -1,7 +1,7 @@ # Copyright 2017-18 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) -from openerp.tests import common +from odoo.tests import common class TestRmaAccount(common.SingleTransactionCase): @@ -194,6 +194,7 @@ class TestRmaAccount(common.SingleTransactionCase): }) make_refund.invoice_refund() rma.refund_line_ids.invoice_id.invoice_validate() + rma._compute_refund_count() self.assertEqual(rma.refund_count, 1) self.assertEqual(rma.qty_to_refund, 0.0) self.assertEqual(rma.qty_refunded, 15.0) diff --git a/rma_account/wizards/rma_refund.py b/rma_account/wizards/rma_refund.py index 57491a76..48c72eeb 100644 --- a/rma_account/wizards/rma_refund.py +++ b/rma_account/wizards/rma_refund.py @@ -112,7 +112,7 @@ class RmaRefund(models.TransientModel): account = accounts['stock_input'] if not account: raise ValidationError(_( - "Accounts are not configure for this product.")) + "Accounts are not configured for this product.")) values = { 'name': item.line_id.name or item.rma_id.name, 'origin': item.line_id.name or item.rma_id.name, @@ -202,7 +202,7 @@ class RmaRefundItem(models.TransientModel): qty_to_refund = fields.Float( string='Quantity To Refund', digits=dp.get_precision('Product Unit of Measure')) - uom_id = fields.Many2one('product.uom', string='Unit of Measure', + uom_id = fields.Many2one('uom.uom', string='Unit of Measure', readonly=True) refund_policy = fields.Selection(selection=[ ('no', 'Not required'), ('ordered', 'Based on Ordered Quantities'),