diff --git a/room/__manifest__.py b/room/__manifest__.py index 4de600a29..1d1798327 100644 --- a/room/__manifest__.py +++ b/room/__manifest__.py @@ -7,7 +7,7 @@ 'description': 'Experience the Ease of Booking Meeting Rooms with Real-Time Availability Display.', 'category': 'Services/Room', 'version': '1.0', - 'depends': ['mail', 'hr', 'documents', 'yuthon_wechat'], + 'depends': ['mail', 'hr', 'documents', 'yuthon_wechat', 'fleet'], 'data': [ 'data/message_template_views.xml', 'data/room_wechat_cron_data.xml', diff --git a/room/models/room_booking.py b/room/models/room_booking.py index 5c4107d22..ff103cc26 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -29,10 +29,11 @@ class RoomBooking(models.Model): company_id = fields.Many2one(related="room_id.company_id", string="Company", readonly=True, store=True) # pengyuthon is_notice = fields.Boolean(string="是否发布通知", default=True) - meeting_type = fields.Selection([('up', '线上'), ('down', '线下'),('exterior','外部')], default='down', string="会议形式", + meeting_type = fields.Selection([('up', '线上'), ('down', '线下'), ('exterior', '外部')], default='down', string="会议形式", required=True) - meeting_form= fields.Selection([('party', '党委会'), ('team', '班子会'),('director','董事会'), - ('train','培训会'),('temporary','临时会议'),('department','部门例会'),('project','项目会议')], string="会议类型",) + meeting_form = fields.Selection([('party', '党委会'), ('team', '班子会'), ('director', '董事会'), + ('train', '培训会'), ('temporary', '临时会议'), ('department', '部门例会'), + ('project', '项目会议')], string="会议类型",) department_ids = fields.Many2many('hr.department', string='部门范围') employee_ids = fields.Many2many('hr.employee', string='人员范围') users_role_ids = fields.Many2many('soong.user.role', string='角色范围') @@ -45,8 +46,8 @@ class RoomBooking(models.Model): meeting_class_document_ids = fields.One2many('class.document', 'room_booking_id', string="班子会议文档") meeting_boss_note = fields.Text(string="董事会议纪要") meeting_boss_document_ids = fields.One2many('boss.document', 'room_booking_id', string="董事会议文档") - driver_name= fields.Char(string="司机姓名") - driver_phone = fields.Char(string="司机联系方式") + + fleet_id = fields.Many2one('fleet.vehicle', string="车辆") meeting_place = fields.Char(string="会议地点") meeting_sing_ids = fields.One2many('room.meeting.sign', 'room_booking_id', string="签到详情") meeting_data = fields.Html(string="会议说明", sanitize=False) @@ -89,7 +90,7 @@ class RoomBooking(models.Model): users_role_list = department_users_list = [] # 部门人员 for depart in self.department_ids: - department_users_data = self.env['hr.employee'].search([('department_id', '=', depart.id)]) + department_users_data = self.env['hr.employee'].search([('department_id', '=', depart.id.origin)]) department_users_list = [de.user_id.id for de in department_users_data] # 人员 employee_users_list = self.employee_ids.user_id.ids diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml index b719d2689..bf2f4cb73 100644 --- a/room/views/room_booking_views.xml +++ b/room/views/room_booking_views.xml @@ -139,25 +139,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/yuthon_fleet/__init__.py b/yuthon_fleet/__init__.py deleted file mode 100644 index cde864bae..000000000 --- a/yuthon_fleet/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import models diff --git a/yuthon_fleet/__manifest__.py b/yuthon_fleet/__manifest__.py deleted file mode 100644 index f500b7983..000000000 --- a/yuthon_fleet/__manifest__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -{ - 'name': "Yuthon Fleet", - 'summary': "车辆管理", - 'description': """ - - """, - 'author': 'pengyuthon', - 'website': 'https://www.pengyuthon.com', - 'category': 'Human Resources/Attendances', - 'version': '0.1', - 'license': 'LGPL-3', - 'depends': ['base', 'fleet'], - 'data': [ - 'security/ir.model.access.csv', - 'views/inherit_yuthon_fleet_views.xml', - ], - 'installable': True, - 'application': True, -} - diff --git a/yuthon_fleet/models/__init__.py b/yuthon_fleet/models/__init__.py deleted file mode 100644 index 96c6e266f..000000000 --- a/yuthon_fleet/models/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import inherit_yuthon_fleet diff --git a/yuthon_fleet/models/inherit_yuthon_fleet.py b/yuthon_fleet/models/inherit_yuthon_fleet.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/yuthon_fleet/security/ir.model.access.csv b/yuthon_fleet/security/ir.model.access.csv deleted file mode 100644 index d7595f820..000000000 --- a/yuthon_fleet/security/ir.model.access.csv +++ /dev/null @@ -1,4 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink - - - diff --git a/yuthon_fleet/static/description/icon.png b/yuthon_fleet/static/description/icon.png deleted file mode 100644 index af23c5873..000000000 Binary files a/yuthon_fleet/static/description/icon.png and /dev/null differ diff --git a/yuthon_fleet/views/inherit_yuthon_fleet_views.xml b/yuthon_fleet/views/inherit_yuthon_fleet_views.xml deleted file mode 100644 index 1c94bee51..000000000 --- a/yuthon_fleet/views/inherit_yuthon_fleet_views.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - inherit.fleet.vehicle.form - fleet.vehicle - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yuthon_sps/__init__.py b/yuthon_sps/__init__.py deleted file mode 100644 index 9a7e03ede..000000000 --- a/yuthon_sps/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models \ No newline at end of file diff --git a/yuthon_sps/__manifest__.py b/yuthon_sps/__manifest__.py deleted file mode 100644 index 1ea522de4..000000000 --- a/yuthon_sps/__manifest__.py +++ /dev/null @@ -1,12 +0,0 @@ -{ - 'name': "yuthon sps", - 'summary': "进销存", - 'description': """""", - 'data': [ - 'security/ir.model.access.csv', # 模块的访问控制文件。这些文件通常包括 CSV 文件,用于定义模型、字段、组等的访问权限。 - 'views/menuitem.xml', - ], # 模块的数据文件列表。这些文件通常包括 XML 文件,用于定义模型、视图、菜单、动作等。 - 'demo': [], # 模块的演示数据文件列表。这些文件通常包括 XML 文件,用于定义演示数据。 - 'depends': [], # 模块所依赖的其他模块列表。这些模块必须先安装才能安装此模块。 -} - diff --git a/yuthon_sps/models/__init__.py b/yuthon_sps/models/__init__.py deleted file mode 100644 index 626d11f00..000000000 --- a/yuthon_sps/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import yuthon_sps \ No newline at end of file diff --git a/yuthon_sps/models/yuthon_sps.py b/yuthon_sps/models/yuthon_sps.py deleted file mode 100644 index 340334979..000000000 --- a/yuthon_sps/models/yuthon_sps.py +++ /dev/null @@ -1,8 +0,0 @@ -from odoo import models, fields, api - - -class YuthonSps(models.Model): - _name = 'yuthon.sps' - _description = '进销存' - - name = fields.Char(string='名称') \ No newline at end of file diff --git a/yuthon_sps/security/ir.model.access.csv b/yuthon_sps/security/ir.model.access.csv deleted file mode 100644 index 07b8cceef..000000000 --- a/yuthon_sps/security/ir.model.access.csv +++ /dev/null @@ -1,3 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_yuthon_sps,yuthon_sps,model_yuthon_sps,base.group_user,1,1,1,1 - diff --git a/yuthon_sps/static/description/icon.png b/yuthon_sps/static/description/icon.png deleted file mode 100644 index fb8a3023a..000000000 Binary files a/yuthon_sps/static/description/icon.png and /dev/null differ diff --git a/yuthon_sps/views/menuitem.xml b/yuthon_sps/views/menuitem.xml deleted file mode 100644 index 15e0bbfab..000000000 --- a/yuthon_sps/views/menuitem.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - 进销存 - yuthon.sps - tree,form - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 596d19861..337de265a 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -1,21 +1,21 @@ - - - + + False + - - - + + False + - - - + + False + - - - + + False + - - - - - - - - + + False + - - - + + False + - - - + + False + - - - + + False + False @@ -91,21 +91,25 @@ sequence="5"/> - + @@ -132,7 +136,7 @@ parent="tianhe_issue_library_menu_root_board" name="议题审批" action="yuthon_issue.issue_library_action" - sequence="9"/> + sequence="5"/>