From 331f23097413ab313af6dc19e9bef6f4851fc112 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Mon, 12 Dec 2022 10:04:16 +0800 Subject: [PATCH] =?UTF-8?q?stock.production.lot=E5=AF=B9=E8=B1=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAstock.lot=EF=BC=8Chttp=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/http.py | 6 +++++- sf_manufacturing/models/__init__.py | 2 -- sf_manufacturing/models/mrp_production.py | 4 ++-- sf_manufacturing/models/stock.py | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sf_bf_connect/models/http.py b/sf_bf_connect/models/http.py index 2396571f..f2b10882 100644 --- a/sf_bf_connect/models/http.py +++ b/sf_bf_connect/models/http.py @@ -4,13 +4,17 @@ import datetime import time import hashlib from odoo import fields, models, api -from odoo.http import request, AuthenticationError +from odoo.http import request __author__ = 'jinling.yang' _logger = logging.getLogger(__name__) +class AuthenticationError(Exception): + pass + + class Http(models.AbstractModel): _inherit = 'ir.http' diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py index 8f632de7..b439701c 100644 --- a/sf_manufacturing/models/__init__.py +++ b/sf_manufacturing/models/__init__.py @@ -9,5 +9,3 @@ from . import stock - - diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index a39e6d92..55cd0ca4 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -51,10 +51,10 @@ class MrpProduction(models.Model): def action_generate_serial(self): self.ensure_one() - self.lot_producing_id = self.env['stock.production.lot'].create({ + self.lot_producing_id = self.env['stock.lot'].create({ 'product_id': self.product_id.id, 'company_id': self.company_id.id, - 'name': self.env['stock.production.lot']._get_next_serial(self.company_id, self.product_id) or self.env[ + 'name': self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env[ 'ir.sequence'].next_by_code('stock.lot.serial'), }) if self.move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_line_ids: diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index c31b3e61..cf1433f7 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -181,7 +181,7 @@ class StockRule(models.Model): class ProductionLot(models.Model): - _inherit = 'stock.production.lot' + _inherit = 'stock.lot' @api.model def generate_lot_names1(self, display_name, first_lot, count): @@ -217,10 +217,10 @@ class ProductionLot(models.Model): def _get_next_serial(self, company, product): """Return the next serial number to be attributed to the product.""" if product.tracking == "serial": - last_serial = self.env['stock.production.lot'].search( + last_serial = self.env['stock.lot'].search( [('company_id', '=', company.id), ('product_id', '=', product.id)], limit=1, order='id DESC') if last_serial: - return self.env['stock.production.lot'].generate_lot_names1(product.display_name, last_serial.name, 2)[ + return self.env['stock.lot'].generate_lot_names1(product.display_name, last_serial.name, 2)[ 1] return "%s-%03d" % (product.display_name, 1)