diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py index 9dd30710..bc8f369e 100644 --- a/sf_base/models/tool_other_features.py +++ b/sf_base/models/tool_other_features.py @@ -38,7 +38,7 @@ class ToolMaterialsBasicParameters(models.Model): width = fields.Float('宽度(mm)') cutting_blade_length = fields.Float('切削刃长(mm)') relief_angle = fields.Integer('后角(°)') - blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20) + blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20,default='0') inscribed_circle_diameter = fields.Float('内接圆直径IC/D(mm)') install_aperture_diameter = fields.Float('安装孔直径(mm)') chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')], diff --git a/sf_hr/__manifest__.py b/sf_hr/__manifest__.py index b3e21ab3..87706dcc 100644 --- a/sf_hr/__manifest__.py +++ b/sf_hr/__manifest__.py @@ -11,7 +11,6 @@ 'data': [ 'views/hr_employee.xml', 'views/res_config_settings_views.xml', - 'views/res_users_view.xml', 'data/cron_data.xml', ], 'demo': [ diff --git a/sf_hr/models/__init__.py b/sf_hr/models/__init__.py index 9744f0cc..ffe76391 100644 --- a/sf_hr/models/__init__.py +++ b/sf_hr/models/__init__.py @@ -2,4 +2,3 @@ from . import hr_employee from . import res_config_setting -from . import res_users diff --git a/sf_hr/models/res_users.py b/sf_hr/models/res_users.py deleted file mode 100644 index 392c297a..00000000 --- a/sf_hr/models/res_users.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import models, fields, api - -import logging - -_logger = logging.getLogger(__name__) - - -class ResUsers(models.Model): - _inherit = 'res.users' - - we_employee_id = fields.Char(string=u'企业微信账号', default="") diff --git a/sf_hr/views/res_users_view.xml b/sf_hr/views/res_users_view.xml deleted file mode 100644 index c65d8e46..00000000 --- a/sf_hr/views/res_users_view.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - res.users.account.form - res.users - - - - - - - - - - - - - -