audrius/manufacture
1
0
Fork 0
mirror of https://github.com/OCA/manufacture.git synced 2025-01-28 16:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] count_inspections methods should be able to manage recordsets (#293)

Browse Source
This commit is contained in:
Simone Rubino
2018-08-08 16:29:20 +02:00
committed by Ignacio Ales
parent 9dd0f8c8e2
commit 6a769659f5
4 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quality_control_stock/__manifest__.py
View File

@@ -6,7 +6,7 @@
{
"name": "Quality control - Stock",
"version": "10.0.1.0.1",
"version": "10.0.1.0.2",
"category": "Quality control",
"license": "AGPL-3",
"author": "OdooMRP team, "

9
quality_control_stock/models/qc_inspection.py
View File

@@ -11,7 +11,7 @@ class QcInspection(models.Model):
@api.multi
@api.depends('object_id')
def get_picking(self):
def _compute_picking(self):
for inspection in self:
inspection.picking = False
if inspection.object_id:
@@ -24,7 +24,7 @@ class QcInspection(models.Model):
@api.multi
@api.depends('object_id')
def get_lot(self):
def _compute_lot(self):
for inspection in self:
inspection.lot = False
if inspection.object_id:
@@ -70,9 +70,10 @@ class QcInspection(models.Model):
return res
picking = fields.Many2one(
comodel_name="stock.picking", compute="get_picking", store=True)
comodel_name="stock.picking", compute="_compute_picking", store=True)
lot = fields.Many2one(
comodel_name='stock.production.lot', compute="get_lot", store=True)
comodel_name='stock.production.lot', compute="_compute_lot",
store=True)
class QcInspectionLine(models.Model):

28
quality_control_stock/models/stock_picking.py
View File

@@ -13,27 +13,29 @@ class StockPicking(models.Model):
@api.multi
@api.depends('qc_inspections', 'qc_inspections.state')
def _count_inspections(self):
self.ensure_one()
self.created_inspections = len(self.qc_inspections)
self.passed_inspections = len([x for x in self.qc_inspections if
x.state == 'success'])
self.failed_inspections = len([x for x in self.qc_inspections if
x.state == 'failed'])
self.done_inspections = (self.passed_inspections +
self.failed_inspections)
def _compute_count_inspections(self):
for picking in self:
picking.created_inspections = len(picking.qc_inspections)
picking.passed_inspections = \
len([x for x in picking.qc_inspections
if x.state == 'success'])
picking.failed_inspections = \
len([x for x in picking.qc_inspections
if x.state == 'failed'])
picking.done_inspections = \
(picking.passed_inspections + picking.failed_inspections)
qc_inspections = fields.One2many(
comodel_name='qc.inspection', inverse_name='picking', copy=False,
string='Inspections', help="Inspections related to this picking.")
created_inspections = fields.Integer(
compute="_count_inspections", string="Created inspections")
compute="_compute_count_inspections", string="Created inspections")
done_inspections = fields.Integer(
compute="_count_inspections", string="Done inspections")
compute="_compute_count_inspections", string="Done inspections")
passed_inspections = fields.Integer(
compute="_count_inspections", string="Inspections OK")
compute="_compute_count_inspections", string="Inspections OK")
failed_inspections = fields.Integer(
compute="_count_inspections", string="Inspections failed")
compute="_compute_count_inspections", string="Inspections failed")
@api.multi
def do_transfer(self):

26
quality_control_stock/models/stock_production_lot.py
View File

@@ -11,24 +11,24 @@ class StockProductionLot(models.Model):
@api.multi
@api.depends('qc_inspections', 'qc_inspections.state')
def _count_inspections(self):
self.ensure_one()
self.created_inspections = len(self.qc_inspections)
self.passed_inspections = len([x for x in self.qc_inspections if
x.state == 'success'])
self.failed_inspections = len([x for x in self.qc_inspections if
x.state == 'failed'])
self.done_inspections = (self.passed_inspections +
self.failed_inspections)
def _compute_count_inspections(self):
for lot in self:
lot.created_inspections = len(lot.qc_inspections)
lot.passed_inspections = \
len([x for x in lot.qc_inspections if x.state == 'success'])
lot.failed_inspections = \
len([x for x in lot.qc_inspections if x.state == 'failed'])
lot.done_inspections = \
(lot.passed_inspections + lot.failed_inspections)
qc_inspections = fields.One2many(
comodel_name='qc.inspection', inverse_name='lot', copy=False,
string='Inspections', help="Inspections related to this lot.")
created_inspections = fields.Integer(
compute="_count_inspections", string="Created inspections")
compute="_compute_count_inspections", string="Created inspections")
done_inspections = fields.Integer(
compute="_count_inspections", string="Done inspections")
compute="_compute_count_inspections", string="Done inspections")
passed_inspections = fields.Integer(
compute="_count_inspections", string="Inspections OK")
compute="_compute_count_inspections", string="Inspections OK")
failed_inspections = fields.Integer(
compute="_count_inspections", string="Inspections failed")
compute="_compute_count_inspections", string="Inspections failed")