mirror of
https://github.com/ForgeFlow/stock-rma.git
synced 2025-01-21 12:57:49 +02:00
[MIG]rma_operating_unit to v10
This commit is contained in:
committed by
Aaron ForgeFlow
parent
3eeaa50707
commit
11e53f04fa
@@ -3,8 +3,8 @@
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
{
|
||||
"name": "Operating Unit in RMA Orders",
|
||||
"version": "9.0.1.0.0",
|
||||
"name": "Operating Unit in RMA Groups",
|
||||
"version": "10.0.1.0.0",
|
||||
"author": "Eficent",
|
||||
"license": "LGPL-3",
|
||||
"website": "http://www.eficent.com",
|
||||
@@ -12,7 +12,8 @@
|
||||
"depends": ["rma", "operating_unit"],
|
||||
"data": [
|
||||
"security/rma_security.xml",
|
||||
"views/rma_order_view.xml"
|
||||
"views/rma_order_view.xml",
|
||||
"views/rma_order_line_view.xml",
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
@@ -2,3 +2,4 @@
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
from . import rma_order
|
||||
from . import rma_order_line
|
||||
|
||||
@@ -2,14 +2,26 @@
|
||||
# © 2017 Eficent Business and IT Consulting Services S.L.
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
from openerp import api, fields, models, _
|
||||
from openerp.exceptions import ValidationError
|
||||
from odoo import api, fields, models, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
class RmaOrder(models.Model):
|
||||
|
||||
_inherit = "rma.order"
|
||||
|
||||
@api.multi
|
||||
@api.constrains('rma_line_ids', 'rma_line_ids.operating_unit')
|
||||
def _check_operating_unit(self):
|
||||
for rma in self:
|
||||
bad_lines = rma.rma_line_ids.filtered(
|
||||
lambda l: l.operating_unit_id != rma.operating_unit_id)
|
||||
if bad_lines:
|
||||
raise ValidationError(
|
||||
_('The operating unit of the rma lines have to match the'
|
||||
' one of the group'))
|
||||
return True
|
||||
|
||||
@api.model
|
||||
def _default_operating_unit(self):
|
||||
return self.env.user.default_operating_unit_id
|
||||
|
||||
22
rma_operating_unit/models/rma_order_line.py
Normal file
22
rma_operating_unit/models/rma_order_line.py
Normal file
@@ -0,0 +1,22 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# © 2018 Eficent Business and IT Consulting Services S.L.
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class RmaOrderLine(models.Model):
|
||||
|
||||
_inherit = "rma.order.line"
|
||||
|
||||
@api.model
|
||||
def _default_operating_unit(self):
|
||||
if self.rma_id.operating_unit_id:
|
||||
return self.rma_id.operating_unit_id.id
|
||||
return self.env.user.default_operating_unit_id
|
||||
|
||||
operating_unit_id = fields.Many2one(
|
||||
comodel_name='operating.unit',
|
||||
string='Operating Unit',
|
||||
default=_default_operating_unit,
|
||||
)
|
||||
@@ -1,7 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# © 2017 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
|
||||
from odoo import exceptions
|
||||
|
||||
|
||||
class TestRmaOperatingUnit(common.TransactionCase):
|
||||
@@ -10,10 +11,14 @@ class TestRmaOperatingUnit(common.TransactionCase):
|
||||
super(TestRmaOperatingUnit, self).setUp()
|
||||
self.res_users_model = self.env['res.users']
|
||||
self.rma_model = self.env['rma.order']
|
||||
self.rma_line_model = self.env['rma.order.line']
|
||||
|
||||
self.company = self.env.ref('base.main_company')
|
||||
self.partner = self.env.ref('base.res_partner_1')
|
||||
self.grp_rma_manager = self.env.ref('rma.group_rma_manager')
|
||||
self.grp_ou = self.env.ref("operating_unit.group_multi_operating_unit")
|
||||
self.grp_stock = self.env.ref("stock.group_stock_manager")
|
||||
self.product = self.env.ref('product.product_product_12')
|
||||
|
||||
# Main Operating Unit
|
||||
self.main_OU = self.env.ref('operating_unit.main_operating_unit')
|
||||
@@ -22,15 +27,18 @@ class TestRmaOperatingUnit(common.TransactionCase):
|
||||
|
||||
# Users
|
||||
self.user1 = self._create_user('user_1',
|
||||
[self.grp_rma_manager],
|
||||
[self.grp_rma_manager, self.grp_ou,
|
||||
self.grp_stock],
|
||||
self.company,
|
||||
[self.main_OU, self.b2c_OU])
|
||||
self.user2 = self._create_user('user_2',
|
||||
[self.grp_rma_manager],
|
||||
[self.grp_rma_manager, self.grp_ou,
|
||||
self.grp_stock],
|
||||
self.company,
|
||||
[self.b2c_OU])
|
||||
self.user3 = self._create_user('user_3',
|
||||
[self.grp_rma_manager],
|
||||
[self.grp_rma_manager, self.grp_ou,
|
||||
self.grp_stock],
|
||||
self.company,
|
||||
[self.main_OU, self.b2c_OU])
|
||||
|
||||
@@ -66,6 +74,25 @@ class TestRmaOperatingUnit(common.TransactionCase):
|
||||
})
|
||||
return rma_order
|
||||
|
||||
def _create_rma_line(self, rma, uid, operating_unit):
|
||||
"""Creates an RMA"""
|
||||
rma_order_line = self.rma_line_model.sudo(uid).create({
|
||||
'operating_unit_id': operating_unit.id,
|
||||
'rma_id': rma.id,
|
||||
'partner_id': self.partner.id,
|
||||
'in_route_id': 1,
|
||||
'out_route_id': 1,
|
||||
'in_warehouse_id': 1,
|
||||
'out_warehouse_id': 1,
|
||||
'location_id': 1,
|
||||
'receipt_policy': 'ordered',
|
||||
'delivery_policy': 'ordered',
|
||||
'name': self.product.name,
|
||||
'product_id': self.product.id,
|
||||
'uom_id': self.product.uom_id.id
|
||||
})
|
||||
return rma_order_line
|
||||
|
||||
def test_security(self):
|
||||
# User 2 is only assigned to Operating Unit B2C, and cannot
|
||||
# access RMA of Main Operating Unit.
|
||||
@@ -75,3 +102,10 @@ class TestRmaOperatingUnit(common.TransactionCase):
|
||||
self.main_OU.id)])
|
||||
self.assertEqual(record.ids, [], 'User 2 should not have access to '
|
||||
'OU %s.' % self.main_OU.name)
|
||||
|
||||
def test_constraint(self):
|
||||
# RMA group should contain rma lines for the same OU
|
||||
with self.assertRaises(exceptions.ValidationError):
|
||||
self._create_rma_line(self.rma_order1, self.user1.id, self.main_OU)
|
||||
self._create_rma_line(self.rma_order1, self.user1.id, self.b2c_OU)
|
||||
self.rma_order1._check_operating_unit()
|
||||
|
||||
69
rma_operating_unit/views/rma_order_line_view.xml
Normal file
69
rma_operating_unit/views/rma_order_line_view.xml
Normal file
@@ -0,0 +1,69 @@
|
||||
<?xml version="1.0"?>
|
||||
<!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
|
||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||
<odoo>
|
||||
<record id="view_rma_line_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.line.tree</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_line_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="state" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_line_supplier_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.line.supplier.tree</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_line_supplier_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="state" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_supplier_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.supplier.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_supplier_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date_rma" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_rma_line_supplier_form" model="ir.ui.view">
|
||||
<field name="name">rma.order.line.supplier.form</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_line_supplier_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="origin" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_line_form" model="ir.ui.view">
|
||||
<field name="name">rma.order.line.form</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_line_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="origin" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_rma_line_filter" model="ir.ui.view">
|
||||
<field name="name">rma.order.line.select</field>
|
||||
<field name="model">rma.order.line</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_line_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -1,67 +1,64 @@
|
||||
<?xml version="1.0"?>
|
||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="view_rma_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="assigned_to" position="after">
|
||||
<field name="operating_unit_id"/>
|
||||
</field>
|
||||
<odoo>
|
||||
<record id="view_rma_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date_rma" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</record>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_supplier_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.supplier.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_supplier_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="assigned_to" position="after">
|
||||
<field name="operating_unit_id"/>
|
||||
</field>
|
||||
<record id="view_rma_supplier_tree" model="ir.ui.view">
|
||||
<field name="name">rma.order.supplier.tree</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_supplier_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date_rma" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</record>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_supplier_form" model="ir.ui.view">
|
||||
<field name="name">rma.order.supplier.form</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_supplier_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="company" position="inside">
|
||||
<field name="company_id" invisible = "True"/>
|
||||
<field name="operating_unit_id" domain = "[('company_id','=', company_id)]"
|
||||
options="{'no_create': True}"/>
|
||||
</group>
|
||||
<record id="view_rma_supplier_form" model="ir.ui.view">
|
||||
<field name="name">rma.order.supplier.form</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_supplier_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="company" position="inside">
|
||||
<field name="company_id" invisible = "True"/>
|
||||
<field name="operating_unit_id" domain = "[('company_id','=', company_id)]"
|
||||
options="{'no_create': True}" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_form" model="ir.ui.view">
|
||||
<field name="name">rma.order.form</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="company" position="inside">
|
||||
<field name="company_id" invisible = "True"/>
|
||||
<field name="operating_unit_id" domain = "[('company_id','=', company_id)]"
|
||||
options="{'no_create': True}" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_rma_filter" model="ir.ui.view">
|
||||
<field name="name">rma.order.select</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_rma_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="after">
|
||||
<field name="operating_unit_id" groups="operating_unit.group_multi_operating_unit"/>
|
||||
</field>
|
||||
</record>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_form" model="ir.ui.view">
|
||||
<field name="name">rma.order.form</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="company" position="inside">
|
||||
<field name="company_id" invisible = "True"/>
|
||||
<field name="operating_unit_id" domain = "[('company_id','=', company_id)]"
|
||||
options="{'no_create': True}"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_rma_rma_filter" model="ir.ui.view">
|
||||
<field name="name">rma.order.select</field>
|
||||
<field name="model">rma.order</field>
|
||||
<field name="inherit_id" ref="rma.view_rma_rma_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="assigned_to" position="after">
|
||||
<field name="operating_unit_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user