From d636cbee0d3b80a35bfaeb0a9ae6d1c40db356b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 5 Aug 2024 22:02:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_res_partner/__manifest__.py | 2 + yuthon_res_partner/data/tenant.industry.csv | 52 +++++++++++++++++++ yuthon_res_partner/models/__init__.py | 1 + yuthon_res_partner/models/tenant_industry.py | 12 +++++ .../models/yuthon_res_partner.py | 8 ++- .../security/ir.model.access.csv | 1 + .../views/contacts_inherit_menu_views.xml | 6 ++- yuthon_res_partner/views/tenant_industry.xml | 19 +++++++ .../views/yuthon_res_partner_views.xml | 38 ++++++++------ 9 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 yuthon_res_partner/data/tenant.industry.csv create mode 100644 yuthon_res_partner/models/tenant_industry.py create mode 100644 yuthon_res_partner/views/tenant_industry.xml diff --git a/yuthon_res_partner/__manifest__.py b/yuthon_res_partner/__manifest__.py index 9800f7161..fb6b1db3e 100644 --- a/yuthon_res_partner/__manifest__.py +++ b/yuthon_res_partner/__manifest__.py @@ -12,8 +12,10 @@ 'license': 'LGPL-3', 'depends': ['base', 'account', 'contacts'], 'data': [ + 'data/tenant.industry.csv', 'security/ir.model.access.csv', 'views/yuthon_res_partner_views.xml', + 'views/tenant_industry.xml', 'views/contacts_inherit_menu_views.xml', ], 'installable': True, diff --git a/yuthon_res_partner/data/tenant.industry.csv b/yuthon_res_partner/data/tenant.industry.csv new file mode 100644 index 000000000..762b39c94 --- /dev/null +++ b/yuthon_res_partner/data/tenant.industry.csv @@ -0,0 +1,52 @@ +"name","note" +"商务服务业","", +"贸易","", +"餐饮","", +"科技","", +"咨询","", +"酒店","", +"批发业","", +"专业技术服务业","", +"研究和试验发展","", +"培训","", +"信息技术","", +"个人","", +"制造业","", +"建筑业","", +"医疗卫生","", +"零售业","", +"住宿业","", +"居民服务业","", +"货币金融服务","", +"建筑安装业","", +"文化艺术业","", +"卫生","", +"社会工作","", +"电气机械和器材制造业","", +"音乐、美术、舞蹈培训","", +"科技推广和应用服务业","", +"橡胶和塑料制品业","", +"通用设备制造业","", +"建筑装饰、装修和其他建筑业","", +"计算机、通信和其他电子设备制造业","", +"房地产业","", +"教育","", +"纺织品、针织品及原料批发","", +"建筑装饰和装修业","", +"信息技术咨询服务","", +"房地产中介服务","", +"汽车修理与维护","", +"化学原料和化学制品制造业","", +"基他服务业","", +"工程和技术研究和试验发展","", +"电阳电容电感元件制造","", +"其他未列明信息技术服务业","", +"公共设施管理业","", +"咨询与调查","", +"其他专用设备制造","", +"信息传输、软件和信息技术服务业","", +"软件开发","", +"其他科技推广服务业","", +"其他未列明专业技术服务业","", +"法律服务","", +"其他制造业","", diff --git a/yuthon_res_partner/models/__init__.py b/yuthon_res_partner/models/__init__.py index c005a0071..692739ff4 100644 --- a/yuthon_res_partner/models/__init__.py +++ b/yuthon_res_partner/models/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import yuthon_res_partner +from . import tenant_industry diff --git a/yuthon_res_partner/models/tenant_industry.py b/yuthon_res_partner/models/tenant_industry.py new file mode 100644 index 000000000..b14680918 --- /dev/null +++ b/yuthon_res_partner/models/tenant_industry.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models, fields, api, exceptions, _ + + +class TenantIndustry(models.Model): + _name = 'tenant.industry' + _description = '承租方行业' + + name = fields.Char(string="行业") + note = fields.Char(string="说明") diff --git a/yuthon_res_partner/models/yuthon_res_partner.py b/yuthon_res_partner/models/yuthon_res_partner.py index a97855cb9..b5a5a261b 100644 --- a/yuthon_res_partner/models/yuthon_res_partner.py +++ b/yuthon_res_partner/models/yuthon_res_partner.py @@ -10,7 +10,6 @@ class ResPartner(models.Model): partner_type = fields.Selection([('tenant', '承租方'), ('employee', '员工'), ('company', '公司')], default='employee', string="客户类型") - tenant_type = fields.Selection([], string="租户类型") juridical_person = fields.Char(string="法人") tenant_user_card = fields.Char(string="身份证") tenant_scope = fields.Char(string="经营范围") @@ -22,9 +21,14 @@ class ResPartner(models.Model): billing_type = fields.Char(string="开票类型") partner_name = fields.Char(string="联系人") - partner_address = fields.Char(string="承送达地址") + partner_address = fields.Char(string="送达地址") partner_type2 = fields.Char(string="承租方类型") + tenant_name = fields.Char(string="承租方名称") + cell_phone = fields.Char(string='座机') + tax_number = fields.Char(string='税号') + tenant_industry = fields.Many2one('tenant.industry', string='行业') + diff --git a/yuthon_res_partner/security/ir.model.access.csv b/yuthon_res_partner/security/ir.model.access.csv index d7595f820..5fd673f7e 100644 --- a/yuthon_res_partner/security/ir.model.access.csv +++ b/yuthon_res_partner/security/ir.model.access.csv @@ -1,4 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_tenant_industry,tenant_industry,model_tenant_industry,base.group_user,1,1,1,1 diff --git a/yuthon_res_partner/views/contacts_inherit_menu_views.xml b/yuthon_res_partner/views/contacts_inherit_menu_views.xml index 7baa720a6..da4edee9c 100644 --- a/yuthon_res_partner/views/contacts_inherit_menu_views.xml +++ b/yuthon_res_partner/views/contacts_inherit_menu_views.xml @@ -38,10 +38,14 @@ action="action_employee" parent="contacts.res_partner_menu_contacts" sequence="3"/> - + \ No newline at end of file diff --git a/yuthon_res_partner/views/tenant_industry.xml b/yuthon_res_partner/views/tenant_industry.xml new file mode 100644 index 000000000..ccb3a703b --- /dev/null +++ b/yuthon_res_partner/views/tenant_industry.xml @@ -0,0 +1,19 @@ + + + + tenant.industry.tree + tenant.industry + + + + + + + + + + 承租方行业 + tenant.industry + tree + + \ No newline at end of file diff --git a/yuthon_res_partner/views/yuthon_res_partner_views.xml b/yuthon_res_partner/views/yuthon_res_partner_views.xml index 920a5de5c..c62024201 100644 --- a/yuthon_res_partner/views/yuthon_res_partner_views.xml +++ b/yuthon_res_partner/views/yuthon_res_partner_views.xml @@ -5,38 +5,44 @@ res.partner + + + + + + + + + - - - - - - - - - + + + + + + - yuthon.res.partner.views.tree res.partner - - - + + + - + - - + + +