mirror of
https://github.com/ForgeFlow/stock-rma.git
synced 2025-01-21 12:57:49 +02:00
[IMP] default operation in product and product_categ for customer and supplier
[IMP]Separate menus for customer and supplier operations * Add active field to rma operation * Added tests * Fix travis * Fix create supplier rma from customer rma
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
:alt: License LGPL-3
|
:alt: License LGPL-3
|
||||||
|
|
||||||
RMA Purchase
|
RMA Purchase
|
||||||
===========
|
============
|
||||||
|
|
||||||
Purchase as RMA source
|
Purchase as RMA source
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,7 @@
|
|||||||
'version': '9.0.1.0.0',
|
'version': '9.0.1.0.0',
|
||||||
'category': 'RMA',
|
'category': 'RMA',
|
||||||
'summary': 'RMA from PO',
|
'summary': 'RMA from PO',
|
||||||
'description': """
|
'license': 'LGPL-3',
|
||||||
RMA from PO
|
|
||||||
""",
|
|
||||||
'author': 'Eficent',
|
'author': 'Eficent',
|
||||||
'website': 'http://www.github.com/OCA/rma',
|
'website': 'http://www.github.com/OCA/rma',
|
||||||
'depends': ['rma_account', 'purchase'],
|
'depends': ['rma_account', 'purchase'],
|
||||||
|
|||||||
@@ -19,13 +19,14 @@ class RmaOrder(models.Model):
|
|||||||
purchase_list.append(procurement_id.purchase_id.id)
|
purchase_list.append(procurement_id.purchase_id.id)
|
||||||
rec.po_count = len(list(set(purchase_list)))
|
rec.po_count = len(list(set(purchase_list)))
|
||||||
|
|
||||||
@api.one
|
@api.multi
|
||||||
def _compute_origin_po_count(self):
|
def _compute_origin_po_count(self):
|
||||||
po_list = []
|
po_list = []
|
||||||
for rma_line in self.rma_line_ids:
|
for rec in self:
|
||||||
if rma_line.purchase_order_line_id and \
|
for rma_line in rec.rma_line_ids:
|
||||||
rma_line.purchase_order_line_id.id:
|
if rma_line.purchase_order_line_id and \
|
||||||
po_list.append(rma_line.purchase_order_line_id.order_id.id)
|
rma_line.purchase_order_line_id.id:
|
||||||
|
po_list.append(rma_line.purchase_order_line_id.order_id.id)
|
||||||
self.origin_po_count = len(list(set(po_list)))
|
self.origin_po_count = len(list(set(po_list)))
|
||||||
|
|
||||||
po_count = fields.Integer(compute=_compute_po_count,
|
po_count = fields.Integer(compute=_compute_po_count,
|
||||||
|
|||||||
@@ -8,28 +8,32 @@ from openerp.addons import decimal_precision as dp
|
|||||||
class RmaOrderLine(models.Model):
|
class RmaOrderLine(models.Model):
|
||||||
_inherit = "rma.order.line"
|
_inherit = "rma.order.line"
|
||||||
|
|
||||||
@api.one
|
@api.multi
|
||||||
def _compute_purchase_count(self):
|
def _compute_purchase_count(self):
|
||||||
purchase_list = []
|
for rec in self:
|
||||||
for procurement_id in self.procurement_ids:
|
purchase_list = []
|
||||||
if procurement_id.purchase_id and procurement_id.purchase_id.id:
|
for procurement_id in rec.procurement_ids:
|
||||||
purchase_list.append(procurement_id.purchase_id.id)
|
if procurement_id.purchase_id and \
|
||||||
self.purchase_count = len(list(set(purchase_list)))
|
procurement_id.purchase_id.id:
|
||||||
|
purchase_list.append(procurement_id.purchase_id.id)
|
||||||
|
rec.purchase_count = len(list(set(purchase_list)))
|
||||||
|
|
||||||
@api.one
|
@api.multi
|
||||||
@api.depends('procurement_ids.purchase_line_id')
|
@api.depends('procurement_ids.purchase_line_id')
|
||||||
def _get_purchase_order_lines(self):
|
def _get_purchase_order_lines(self):
|
||||||
purchase_list = []
|
for rec in self:
|
||||||
for procurement_id in self.procurement_ids:
|
purchase_list = []
|
||||||
if procurement_id.purchase_line_id and \
|
for procurement_id in rec.procurement_ids:
|
||||||
procurement_id.purchase_line_id.id:
|
if procurement_id.purchase_line_id and \
|
||||||
purchase_list.append(procurement_id.purchase_line_id.id)
|
procurement_id.purchase_line_id.id:
|
||||||
self.purchase_order_line_ids = [(6, 0, purchase_list)]
|
purchase_list.append(procurement_id.purchase_line_id.id)
|
||||||
|
rec.purchase_order_line_ids = [(6, 0, purchase_list)]
|
||||||
|
|
||||||
@api.one
|
@api.multi
|
||||||
@api.depends('procurement_ids.purchase_line_id')
|
@api.depends('procurement_ids.purchase_line_id')
|
||||||
def _compute_qty_purchased(self):
|
def _compute_qty_purchased(self):
|
||||||
self.qty_purchased = self._get_rma_purchased_qty()
|
for rec in self:
|
||||||
|
rec.qty_purchased = rec._get_rma_purchased_qty()
|
||||||
|
|
||||||
purchase_count = fields.Integer(compute=_compute_purchase_count,
|
purchase_count = fields.Integer(compute=_compute_purchase_count,
|
||||||
string='# of Purchases', copy=False,
|
string='# of Purchases', copy=False,
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
# © 2017 Eficent Business and IT Consulting Services S.L.
|
# © 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
|
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
|
||||||
|
|
||||||
import time
|
from openerp import api, fields, models
|
||||||
from openerp import _, api, fields, models
|
|
||||||
from openerp.exceptions import ValidationError
|
from openerp.exceptions import ValidationError
|
||||||
|
|
||||||
|
|
||||||
@@ -45,11 +44,12 @@ class RmaAddPurchase(models.TransientModel):
|
|||||||
string='Purcahse Order Lines')
|
string='Purcahse Order Lines')
|
||||||
|
|
||||||
def _prepare_rma_line_from_po_line(self, line):
|
def _prepare_rma_line_from_po_line(self, line):
|
||||||
operation = line.product_id.rma_operation_id and \
|
if self.env.context.get('customer'):
|
||||||
line.product_id.rma_operation_id.id or False
|
operation = line.product_id.rma_customer_operation_id or \
|
||||||
if not operation:
|
line.product_id.categ_id.rma_customer_operation_id
|
||||||
operation = line.product_id.categ_id.rma_operation_id and \
|
else:
|
||||||
line.product_id.categ_id.rma_operation_id.id or False
|
operation = line.product_id.rma_supplier_operation_id or \
|
||||||
|
line.product_id.categ_id.rma_supplier_operation_id
|
||||||
data = {
|
data = {
|
||||||
'purchase_order_line_id': line.id,
|
'purchase_order_line_id': line.id,
|
||||||
'product_id': line.product_id.id,
|
'product_id': line.product_id.id,
|
||||||
@@ -75,8 +75,8 @@ class RmaAddPurchase(models.TransientModel):
|
|||||||
{'in_route_id': operation.in_route_id.id or route,
|
{'in_route_id': operation.in_route_id.id or route,
|
||||||
'out_route_id': operation.out_route_id.id or route,
|
'out_route_id': operation.out_route_id.id or route,
|
||||||
'receipt_policy': operation.receipt_policy,
|
'receipt_policy': operation.receipt_policy,
|
||||||
'location_id': operation.location_id.id or \
|
'location_id': operation.location_id.id or
|
||||||
self.env.ref('stock.stock_location_stock').id,
|
self.env.ref('stock.stock_location_stock').id,
|
||||||
'operation_id': operation.id,
|
'operation_id': operation.id,
|
||||||
'refund_policy': operation.refund_policy,
|
'refund_policy': operation.refund_policy,
|
||||||
'delivery_policy': operation.delivery_policy
|
'delivery_policy': operation.delivery_policy
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# © 2017 Eficent Business and IT Consulting Services S.L.
|
# © 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
|
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
|
||||||
from openerp import _, api, fields, models
|
from openerp import api, fields, models
|
||||||
|
|
||||||
|
|
||||||
class RmaMakePicking(models.TransientModel):
|
class RmaMakePicking(models.TransientModel):
|
||||||
|
|||||||
Reference in New Issue
Block a user