[MIG]rma v10

This commit is contained in:
aheficent
2017-12-19 16:38:50 +01:00
committed by ahenriquez
parent 9642305f3c
commit 31ebd47872
20 changed files with 50 additions and 53 deletions

View File

@@ -4,7 +4,7 @@
{
'name': 'RMA (Return Merchandise Authorization)',
'version': '9.0.1.0.0',
'version': '10.0.1.0.0',
'license': 'LGPL-3',
'category': 'RMA',
'summary': 'Introduces the return merchandise authorization (RMA) process '

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 openerp import api, fields, models
from odoo import api, fields, models
class ProcurementOrder(models.Model):

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 openerp import fields, models
from odoo import fields, models
class ProductTemplate(models.Model):

View File

@@ -2,7 +2,7 @@
# Copyright 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 fields, models
from odoo import fields, models
class ProductCategory(models.Model):

View File

@@ -2,7 +2,7 @@
# Copyright 2017 Eficent Business and IT Consulting Services S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from openerp import api, fields, models
from odoo import api, fields, models
class ResPartner(models.Model):

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 openerp import api, fields, models
from odoo import api, fields, models
class RmaOperation(models.Model):

View File

@@ -2,8 +2,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 import api, fields, models, _
from openerp.exceptions import UserError
from odoo import api, fields, models, _
from odoo.exceptions import UserError
from datetime import datetime

View File

@@ -2,9 +2,9 @@
# © 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, UserError
from openerp.addons import decimal_precision as dp
from odoo import api, fields, models, _
from odoo.exceptions import ValidationError, UserError
from odoo.addons import decimal_precision as dp
import operator
ops = {'=': operator.eq,
'!=': operator.ne}
@@ -74,9 +74,8 @@ class RmaOrderLine(models.Model):
for move in rec.procurement_ids.mapped('move_ids').filtered(
lambda m: m.state in states and op(m.location_id.usage,
rec.type)):
qty += product_obj._compute_qty_obj(
move.product_uom, move.product_uom_qty,
rec.uom_id)
qty += product_obj._compute_quantity(
move.product_uom_qty, rec.uom_id)
return qty
@api.multi

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 openerp import api, fields, models
from odoo import api, fields, models
class StockPicking(models.Model):

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 openerp import fields, models
from odoo import fields, models
class StockWarehouse(models.Model):

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 openerp.tests import common
from odoo.tests import common
class TestRma(common.TransactionCase):

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 openerp.addons.rma.tests import test_rma
from odoo.addons.rma.tests import test_rma
class TestRmaDropship(test_rma.TestRma):

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 openerp.addons.rma.tests import test_rma
from odoo.addons.rma.tests import test_rma
class TestSupplierRma(test_rma.TestRma):

View File

@@ -300,7 +300,7 @@
</group>
<notebook>
<page name="route" string="Routes">
<group>
<group>
<group name="inbound" string="Inbound">
<field name="in_warehouse_id"/>
@@ -319,29 +319,27 @@
<field name="out_route_id"/>
</group>
</group>
</group>
</page>
<page name="stock" string="Stock Moves">
<field name="move_ids" nolabel="1" readonly="1"/>
</page>
<page name="quantities" string="Quantities">
<group>
<group name="quantities" col="4" string="Quantities">
<group name="receive">
<field name="qty_to_receive"/>
<field name="qty_incoming"/>
<field name="qty_received"/>
</group>
<group name="deliver">
<field name="qty_to_deliver"/>
<field name="qty_outgoing"/>
<field name="qty_delivered"/>
</group>
<group name="supplier_rma"
attrs="{'invisible':[('customer_to_supplier','=',False)]}">
<field name="qty_to_supplier_rma"/>
<field name="qty_in_supplier_rma"/>
</group>
<group name="quantities" string="Quantities">
<group name="receive">
<field name="qty_to_receive"/>
<field name="qty_incoming"/>
<field name="qty_received"/>
</group>
<group name="deliver">
<field name="qty_to_deliver"/>
<field name="qty_outgoing"/>
<field name="qty_delivered"/>
</group>
<group name="supplier_rma"
attrs="{'invisible':[('customer_to_supplier','=',False)]}">
<field name="qty_to_supplier_rma"/>
<field name="qty_in_supplier_rma"/>
</group>
</group>
</page>

View File

@@ -2,8 +2,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 import api, fields, models, _
from openerp.exceptions import ValidationError
from odoo import api, fields, models, _
from odoo.exceptions import ValidationError
class RmaAddStockMove(models.TransientModel):

View File

@@ -3,10 +3,10 @@
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
import time
from openerp import models, fields, api, _
from openerp.exceptions import ValidationError
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DT_FORMAT
import openerp.addons.decimal_precision as dp
from odoo import models, fields, api, _
from odoo.exceptions import ValidationError
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT as DT_FORMAT
import odoo.addons.decimal_precision as dp
class RmaMakePicking(models.TransientModel):

View File

@@ -2,9 +2,9 @@
# © 2017 Eficent Business and IT Consulting Services S.L.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
import openerp.addons.decimal_precision as dp
from openerp import _, api, fields, models
from openerp.exceptions import ValidationError
import odoo.addons.decimal_precision as dp
from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
class RmaLineMakeSupplierRma(models.TransientModel):

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Eficent Business and IT Consulting Services S.L.
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
<openerp>
<odoo>
<data>
<record id="view_rma_order_line_make_supplier_rma"
model="ir.ui.view">
@@ -85,5 +85,5 @@
</data>
</openerp>
</odoo>

View File

@@ -2,10 +2,10 @@
# © 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 models, fields
from odoo import models, fields
class StockConfigSettings(models.Model):
class StockConfigSettings(models.TransientModel):
_inherit = 'stock.config.settings'
group_rma_delivery_address = fields.Selection([

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<odoo>
<data>
<record id="view_stock_config_settings_rma" model="ir.ui.view">
<field name="name">stock.config.settings.rma</field>
@@ -14,4 +14,4 @@
</field>
</record>
</data>
</openerp>
</odoo>