From 5737d7b0bc195c2c80dfb2e2d72f67d77ce37e7e Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 24 Nov 2023 10:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/__init__.py | 1 - sf_dlm/models/__init__.py | 4 ---- sf_maintenance/__manifest__.py | 2 +- sf_manufacturing/models/mrp_workorder.py | 8 ++++---- sf_mrs_connect/models/__init__.py | 3 --- sf_sale/models/__init__.py | 2 -- sf_sale/models/sale_order.py | 8 +------- web_widget_model_viewer/__init__.py | 1 - web_widget_model_viewer/__manifest__.py | 4 ++-- 9 files changed, 8 insertions(+), 25 deletions(-) diff --git a/sf_bf_connect/__init__.py b/sf_bf_connect/__init__.py index de1d4d01..3834eca4 100644 --- a/sf_bf_connect/__init__.py +++ b/sf_bf_connect/__init__.py @@ -1,4 +1,3 @@ # -*-coding:utf-8-*- from . import controllers from . import models - diff --git a/sf_dlm/models/__init__.py b/sf_dlm/models/__init__.py index 604ef9a2..6619bd58 100644 --- a/sf_dlm/models/__init__.py +++ b/sf_dlm/models/__init__.py @@ -1,5 +1 @@ from . import product_supplierinfo - - - - diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py index 9c3c978a..297bd31b 100644 --- a/sf_maintenance/__manifest__.py +++ b/sf_maintenance/__manifest__.py @@ -19,4 +19,4 @@ 'application': False, 'auto_install': False, 'license': 'LGPL-3', -} \ No newline at end of file +} diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 7a7f10ce..133c1ec0 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1,10 +1,10 @@ import logging -from datetime import datetime -from dateutil.relativedelta import relativedelta -import os import base64 -import math +from datetime import datetime import requests +import os +import math +from dateutil.relativedelta import relativedelta # import subprocess from odoo import api, fields, models, SUPERUSER_ID, _ from odoo.addons.sf_base.commons.common import Common diff --git a/sf_mrs_connect/models/__init__.py b/sf_mrs_connect/models/__init__.py index cfaee631..2f84348c 100644 --- a/sf_mrs_connect/models/__init__.py +++ b/sf_mrs_connect/models/__init__.py @@ -1,6 +1,3 @@ from . import ftp_operate from . import res_config_setting from . import sync_common - - - diff --git a/sf_sale/models/__init__.py b/sf_sale/models/__init__.py index d1850ec0..d8b09a48 100644 --- a/sf_sale/models/__init__.py +++ b/sf_sale/models/__init__.py @@ -1,5 +1,3 @@ from . import sale_order from . import quick_easy_order from . import auto_quatotion_common - - diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index c699a9d0..0bb6672a 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -14,7 +14,6 @@ class ReSaleOrder(models.Model): pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式') check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked') - payment_term_id = fields.Many2one( comodel_name='account.payment.term', string="交付条件", @@ -32,6 +31,7 @@ class ReSaleOrder(models.Model): 'date_order': now_time, 'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time), 'partner_id': partner.id, + 'check_status': 'checked', 'state': 'draft', 'person_of_delivery': delivery_name, 'telephone_of_delivery': delivery_telephone, @@ -74,9 +74,3 @@ class ResaleOrderLine(models.Model): _inherit = 'sale.order.line' model_glb_file = fields.Binary('模型的glb文件') - - -class ResCrmTeam(models.Model): - _inherit = 'crm.team' - - diff --git a/web_widget_model_viewer/__init__.py b/web_widget_model_viewer/__init__.py index 8b137891..e69de29b 100644 --- a/web_widget_model_viewer/__init__.py +++ b/web_widget_model_viewer/__init__.py @@ -1 +0,0 @@ - diff --git a/web_widget_model_viewer/__manifest__.py b/web_widget_model_viewer/__manifest__.py index 94da93a4..2bd9bbad 100644 --- a/web_widget_model_viewer/__manifest__.py +++ b/web_widget_model_viewer/__manifest__.py @@ -10,7 +10,7 @@ "depends": ['web'], "demo": [], "data": [ - #'views/views.xml', #这是为了测试的效果,可以删除 + # 'views/views.xml', #这是为了测试的效果,可以删除 ], 'assets': { 'web.assets_qweb': [ @@ -21,4 +21,4 @@ ], }, 'license': 'LGPL-3', -} \ No newline at end of file +}