合并

sf_base/models/base.py

@@ -239,10 +239,8 @@ class MachineToolType(models.Model):
 class CuttingTool(models.Model):
     _name = 'sf.cutting_tool.category'
     _description = '刀具类别'
-
     code = fields.Char('编码')
     name = fields.Char('名称')
-
     remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
 
@@ -250,7 +248,6 @@ class CuttingTool(models.Model):
 class CuttingToolType(models.Model):
     _name = 'sf.cutting_tool.type'
     _description = '刀具型号'
-
     code = fields.Char('编码')
     name = fields.Char('名称')
     diameter = fields.Integer('直径')

sf_manufacturing/models/mrp_production.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from odoo import api, fields, models
+from odoo import api, fields, models,_
 
 
 

sf_manufacturing/models/mrp_workorder.py

@@ -1,9 +1,13 @@
 import json
+import math
+
 import requests
 import logging
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from odoo import api, fields, models, SUPERUSER_ID, _
+from odoo.exceptions import ValidationError
+from odoo.addons.sf_base.commons.common import Common
 
 
 class ResMrpWorkOrder(models.Model):

sf_manufacturing/report/tray_report.xml

@@ -34,7 +34,6 @@
                 <t t-call="web.external_layout">
                     <t t-foreach="docs" t-as="o">
                         <div class="page">
-
                             <div t-field="o.code"
                                  t-options="{'widget': 'barcode', 'width': 600, 'height': 100, 'img_style': 'width:350px;height:60px'}"/>
                             <div t-field="o.code" style="text-align: center"/>