[IMP] Improved Unit Test Case and Fixed Travis

This commit is contained in:
Nikul Chaudhary
2017-11-10 12:48:55 +05:30
committed by ahenriquez
parent 0b707ea7fc
commit e161a9c57a
10 changed files with 30 additions and 24 deletions

View File

@@ -9,7 +9,7 @@
'category': 'RMA',
'summary': 'Introduces the return merchandise authorization (RMA) process '
'in odoo',
'author': "Eficent",
'author': "Eficent, Odoo Community Association (OCA)",
'website': 'http://www.github.com/OCA/rma',
'depends': ['stock', 'mail', 'procurement'],
'demo': ['demo/stock_demo.xml',

View File

@@ -171,7 +171,6 @@ class RmaOrder(models.Model):
res = self.env.ref('rma.view_rma_line_form', False)
else:
res = self.env.ref('rma.view_rma_line_supplier_form', False)
result['views'] = [(res and res.id or False, 'form')]
result['res_id'] = lines.id
return result
@@ -181,13 +180,14 @@ class RmaOrder(models.Model):
action = self.env.ref('rma.action_rma_supplier_lines')
result = action.read()[0]
lines = self.rma_line_ids
related_lines = [line.id for line in lines.supplier_rma_line_ids]
# choose the view_mode accordingly
if len(related_lines) != 1:
result['domain'] = "[('id', 'in', " + \
str(related_lines) + ")]"
elif len(related_lines) == 1:
res = self.env.ref('rma.view_rma_line_supplier_form', False)
result['views'] = [(res and res.id or False, 'form')]
result['res_id'] = related_lines[0]
for line_id in lines:
related_lines = [line.id for line in line_id.supplier_rma_line_ids]
# choose the view_mode accordingly
if len(related_lines) != 1:
result['domain'] = "[('id', 'in', " + \
str(related_lines) + ")]"
elif len(related_lines) == 1:
res = self.env.ref('rma.view_rma_line_supplier_form', False)
result['views'] = [(res and res.id or False, 'form')]
result['res_id'] = related_lines[0]
return result

View File

@@ -372,21 +372,21 @@ class RmaOrderLine(models.Model):
operation = self.env['rma.operation'].search(
[('type', '=', self.type)], limit=1)
if not operation:
raise ValidationError("Please define an operation first.")
raise ValidationError(_("Please define an operation first."))
if not operation.in_route_id or not operation.out_route_id:
route = self.env['stock.location.route'].search(
[('rma_selectable', '=', True)], limit=1)
if not route:
raise ValidationError("Please define an RMA route.")
raise ValidationError(_("Please define an RMA route."))
if not operation.in_warehouse_id or not operation.out_warehouse_id:
warehouse = self.env['stock.warehouse'].search(
[('company_id', '=', self.company_id.id),
('lot_rma_id', '!=', False)], limit=1)
if not warehouse:
raise ValidationError(
"Please define a warehouse with a default RMA location.")
raise ValidationError(_(
"Please define a warehouse with a default RMA location."))
data = {
'product_id': sm.product_id.id,

View File

@@ -3,6 +3,7 @@
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
from odoo.tests import common
from odoo.exceptions import ValidationError
class TestRma(common.TransactionCase):

View File

@@ -24,8 +24,9 @@ class TestRmaDropship(test_rma.TestRma):
}).create({})
res = wizard.make_supplier_rma()
supplier_rma = self.rma.browse(res['res_id'])
supplier_rma.action_rma_to_approve()
supplier_rma.action_rma_approve()
for line in supplier_rma.rma_line_ids:
line.action_rma_to_approve()
line.action_rma_approve()
wizard = self.rma_make_picking.with_context({
'active_id': 1,
'active_ids': supplier_rma.rma_line_ids.ids,
@@ -89,3 +90,7 @@ class TestRmaDropship(test_rma.TestRma):
"Wrong qty to supplier rma")
self.assertEquals(line.qty_in_supplier_rma, 2,
"Wrong qty in supplier rma")
for line in self.rma_droship_id.rma_line_ids:
line.action_rma_done()
self.assertEquals(line.state, 'done',
"Wrong State")

View File

@@ -2,7 +2,7 @@
# © 2017 Eficent Business and IT Consulting Services S.L.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
from odoo.addons.rma.tests import test_rma
from . import test_rma
class TestSupplierRma(test_rma.TestRma):

View File

@@ -2,7 +2,7 @@
<odoo>
<data>
<record id="procurement_form_view" model="ir.ui.view">
<record id="procurement_form_view_0" model="ir.ui.view">
<field name="name">procurement.order.form</field>
<field name="model">procurement.order</field>
<field name="inherit_id"

View File

@@ -86,7 +86,7 @@ class RmaAddStockMove(models.TransientModel):
'location_id': (operation.location_id.id or
operation.in_warehouse_id.lot_rma_id.id or
warehouse.lot_rma_id.id)
}
}
return data
@api.model

View File

@@ -83,7 +83,7 @@ class RmaMakePicking(models.TransientModel):
elif item.line_id.partner_id:
delivery_address = item.line_id.partner_id
else:
raise ValidationError('Unknown delivery address')
raise ValidationError(_('Unknown delivery address'))
return delivery_address
@api.model
@@ -111,9 +111,9 @@ class RmaMakePicking(models.TransientModel):
warehouse = line.out_warehouse_id
route = line.out_route_id
if not route:
raise ValidationError("No route specified")
raise ValidationError(_("No route specified"))
if not warehouse:
raise ValidationError("No warehouse specified")
raise ValidationError(_("No warehouse specified"))
procurement_data = {
'name': line.rma_id and line.rma_id.name or line.name,
'group_id': group.id,

View File

@@ -110,7 +110,7 @@ class RmaLineMakeSupplierRma(models.TransientModel):
'location_id': (operation.location_id.id or
operation.in_warehouse_id.lot_rma_id.id or
warehouse.lot_rma_id.id)
}
}
return data
@api.multi