mirror of
https://github.com/OCA/manufacture.git
synced 2025-01-28 16:37:15 +02:00
[MIG] quality_control_mrp: Migration to 10.0
This commit is contained in:
committed by
Carlos Roca
parent
38df8b9f0a
commit
9d01f0d00b
@@ -1,6 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
|
||||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
|
||||
from . import qc_inspection
|
||||
from . import mrp_production
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
|
||||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
|
||||
# Copyright 2014 Serv. Tec. Avanzados - Pedro M. Baeza
|
||||
# Copyright 2018 Simone Rubino - Agile Business Group
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
|
||||
from openerp import models, fields, api
|
||||
from openerp.addons.quality_control.models.qc_trigger_line import\
|
||||
from odoo import api, fields, models
|
||||
from odoo.addons.quality_control.models.qc_trigger_line import \
|
||||
_filter_trigger_lines
|
||||
|
||||
|
||||
class MrpProduction(models.Model):
|
||||
_inherit = 'mrp.production'
|
||||
|
||||
@api.one
|
||||
@api.multi
|
||||
@api.depends('qc_inspections')
|
||||
def _count_inspections(self):
|
||||
self.created_inspections = len(self.qc_inspections)
|
||||
for production in self:
|
||||
production.created_inspections = len(production.qc_inspections)
|
||||
|
||||
qc_inspections = fields.One2many(
|
||||
comodel_name='qc.inspection', inverse_name='production', copy=False,
|
||||
@@ -21,26 +23,24 @@ class MrpProduction(models.Model):
|
||||
created_inspections = fields.Integer(
|
||||
compute="_count_inspections", string="Created inspections")
|
||||
|
||||
@api.model
|
||||
def action_produce(self, production_id, production_qty, production_mode,
|
||||
wiz=False):
|
||||
production = self.browse(production_id)
|
||||
done_moves = production.move_created_ids2.filtered(
|
||||
@api.multi
|
||||
def post_inventory(self):
|
||||
done_moves = self.mapped('move_finished_ids').filtered(
|
||||
lambda r: r.state == 'done')
|
||||
res = super(MrpProduction, self).action_produce(
|
||||
production_id, production_qty, production_mode, wiz=wiz)
|
||||
if production_mode == 'consume_produce':
|
||||
inspection_model = self.env['qc.inspection']
|
||||
for move in production.move_created_ids2.filtered(
|
||||
lambda r: r.state == 'done') - done_moves:
|
||||
qc_trigger = self.env.ref('quality_control_mrp.qc_trigger_mrp')
|
||||
trigger_lines = set()
|
||||
for model in ['qc.trigger.product_category_line',
|
||||
'qc.trigger.product_template_line',
|
||||
'qc.trigger.product_line']:
|
||||
trigger_lines = trigger_lines.union(
|
||||
self.env[model].get_trigger_line_for_product(
|
||||
qc_trigger, move.product_id))
|
||||
for trigger_line in _filter_trigger_lines(trigger_lines):
|
||||
inspection_model._make_inspection(move, trigger_line)
|
||||
res = super(MrpProduction, self).post_inventory()
|
||||
inspection_model = self.env['qc.inspection']
|
||||
new_done_moves = self.mapped('move_finished_ids').filtered(
|
||||
lambda r: r.state == 'done') - done_moves
|
||||
if new_done_moves:
|
||||
qc_trigger = self.env.ref('quality_control_mrp.qc_trigger_mrp')
|
||||
for move in new_done_moves:
|
||||
trigger_lines = set()
|
||||
for model in ['qc.trigger.product_category_line',
|
||||
'qc.trigger.product_template_line',
|
||||
'qc.trigger.product_line']:
|
||||
trigger_lines = trigger_lines.union(
|
||||
self.env[model].get_trigger_line_for_product(
|
||||
qc_trigger, move.product_id))
|
||||
for trigger_line in _filter_trigger_lines(trigger_lines):
|
||||
inspection_model._make_inspection(move, trigger_line)
|
||||
return res
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
|
||||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
|
||||
# Copyright 2014 Serv. Tec. Avanzados - Pedro M. Baeza
|
||||
# Copyright 2018 Simone Rubino - Agile Business Group
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
|
||||
from openerp import models, fields, api
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class QcInspection(models.Model):
|
||||
|
||||
Reference in New Issue
Block a user