From 41c785a43f9920276c1fba408ddb4901bcbd0573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Tue, 10 Sep 2024 18:20:30 +0800 Subject: [PATCH] pengyuthon --- room/__manifest__.py | 2 +- room/models/room_booking.py | 13 +- room/views/room_booking_views.xml | 26 ++- yuthon_fleet/__init__.py | 3 - yuthon_fleet/__manifest__.py | 21 -- yuthon_fleet/models/__init__.py | 3 - yuthon_fleet/models/inherit_yuthon_fleet.py | 0 yuthon_fleet/security/ir.model.access.csv | 4 - yuthon_fleet/static/description/icon.png | Bin 6899 -> 0 bytes .../views/inherit_yuthon_fleet_views.xml | 27 --- yuthon_sps/__init__.py | 1 - yuthon_sps/__manifest__.py | 12 -- yuthon_sps/models/__init__.py | 1 - yuthon_sps/models/yuthon_sps.py | 8 - yuthon_sps/security/ir.model.access.csv | 3 - yuthon_sps/static/description/icon.png | Bin 3289 -> 0 bytes yuthon_sps/views/menuitem.xml | 200 ------------------ yuthon_work_brand/views/hr_menus.xml | 29 ++- yuthon_work_brand/views/work_menus.xml | 38 ++-- 19 files changed, 53 insertions(+), 338 deletions(-) delete mode 100644 yuthon_fleet/__init__.py delete mode 100644 yuthon_fleet/__manifest__.py delete mode 100644 yuthon_fleet/models/__init__.py delete mode 100644 yuthon_fleet/models/inherit_yuthon_fleet.py delete mode 100644 yuthon_fleet/security/ir.model.access.csv delete mode 100644 yuthon_fleet/static/description/icon.png delete mode 100644 yuthon_fleet/views/inherit_yuthon_fleet_views.xml delete mode 100644 yuthon_sps/__init__.py delete mode 100644 yuthon_sps/__manifest__.py delete mode 100644 yuthon_sps/models/__init__.py delete mode 100644 yuthon_sps/models/yuthon_sps.py delete mode 100644 yuthon_sps/security/ir.model.access.csv delete mode 100644 yuthon_sps/static/description/icon.png delete mode 100644 yuthon_sps/views/menuitem.xml 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 af23c58737f74e4c58aba6aa054e0f44fe8eaf12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6899 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 - - - 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 fb8a3023a74dcc86efa3bec777b2366ac7ffa2f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3289 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 - - - 进销存 - 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"/>