pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pengyuthon

Browse Source
This commit is contained in:
李鹏宇
2024-09-10 18:20:30 +08:00
parent d7699b397a
commit 41c785a43f
19 changed files with 53 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/__manifest__.py
+1 -1
View File
@@ -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',
room/models/room_booking.py
+7 -6
View File
@@ -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
room/views/room_booking_views.xml
+12 -14
View File
@@ -139,25 +139,23 @@
</h1>
</div>
<group>
<group>
<field name="room_id"/>
<field name="stop_datetime" invisible="1"/>
<field name="start_datetime" string="Date" widget="daterange" options="{'end_date_field': 'stop_datetime'}"/>
<!-- <field name="other_user_ids" widget="many2many_tags"/>-->
<field name="other_company_user_ids" widget="many2many_tags" readonly="1"/>
<field name="meeting_form"/>
<field name="meeting_type"/>
<field name="driver_name" invisible="meeting_type != 'exterior'"/>
<field name="driver_phone" invisible="meeting_type != 'exterior'"/>
<field name="meeting_place" invisible="meeting_type != 'exterior'"/>
<field name="is_notice"/>
</group>
<group>
<group string="参与人员">
<field name="organizer_id" widget="many2one_avatar_user"/>
<field name="department_ids" widget="many2many_tags"/>
<field name="employee_ids" widget="many2many_tags"/>
<field name="users_role_ids" widget="many2many_tags"/>
<field name="room_users_ids" widget="many2many_tags" readonly="1"/>
<field name="other_company_user_ids" widget="many2many_tags" readonly="1"/>
</group>
<group string="基本信息">
<field name="room_id"/>
<field name="stop_datetime" invisible="1"/>
<field name="start_datetime" string="Date" widget="daterange" options="{'end_date_field': 'stop_datetime'}"/>
<field name="meeting_form"/>
<field name="meeting_type"/>
<field name="fleet_id" invisible="meeting_type != 'exterior'"/>
<field name="meeting_place" invisible="meeting_type != 'exterior'"/>
<field name="is_notice"/>
</group>
</group>
<notebook>
yuthon_fleet/__init__.py
-3
View File
@@ -1,3 +0,0 @@
# -*- coding: utf-8 -*-
from . import models
yuthon_fleet/__manifest__.py
-21
View File
@@ -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,
}
yuthon_fleet/models/__init__.py
-3
View File
@@ -1,3 +0,0 @@
# -*- coding: utf-8 -*-
from . import inherit_yuthon_fleet
yuthon_fleet/models/inherit_yuthon_fleet.py
View File
yuthon_fleet/security/ir.model.access.csv
-4
View File
@@ -1,4 +0,0 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
yuthon_fleet/static/description/icon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

yuthon_fleet/views/inherit_yuthon_fleet_views.xml
-27
View File
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="inherit_fleet_vehicle_form" model="ir.ui.view">
<field name="name">inherit.fleet.vehicle.form</field>
<field name="model">fleet.vehicle</field>
<field name="inherit_id" ref="fleet.fleet_vehicle_view_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@name='page_model']" position="after">
<page string="保险合同" name="baoxian">
</page>
<page string="加油（充电）费" name="jiayou">
</page>
<page string="维修费" name="weixiu">
</page>
<page string="附件" name="fujian">
</page>
<page string="保养费" name="baoyang">
</page>
</xpath>
</field>
</record>
</odoo>
yuthon_sps/__init__.py
-1
View File
@@ -1 +0,0 @@
from . import models
yuthon_sps/__manifest__.py
-12
View File
@@ -1,12 +0,0 @@
{
'name': "yuthon sps",
'summary': "进销存",
'description': """""",
'data': [
'security/ir.model.access.csv', # 模块的访问控制文件。这些文件通常包括 CSV 文件，用于定义模型、字段、组等的访问权限。
'views/menuitem.xml',
], # 模块的数据文件列表。这些文件通常包括 XML 文件，用于定义模型、视图、菜单、动作等。
'demo': [], # 模块的演示数据文件列表。这些文件通常包括 XML 文件，用于定义演示数据。
'depends': [], # 模块所依赖的其他模块列表。这些模块必须先安装才能安装此模块。
}
yuthon_sps/models/__init__.py
-1
View File
@@ -1 +0,0 @@
from . import yuthon_sps
yuthon_sps/models/yuthon_sps.py
-8
View File
@@ -1,8 +0,0 @@
from odoo import models, fields, api
class YuthonSps(models.Model):
_name = 'yuthon.sps'
_description = '进销存'
name = fields.Char(string='名称')
yuthon_sps/security/ir.model.access.csv
-3
View File
@@ -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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_yuthon_sps yuthon_sps model_yuthon_sps base.group_user 1 1 1 1
yuthon_sps/static/description/icon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

yuthon_sps/views/menuitem.xml
-200
View File
@@ -1,200 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="yuthon_sps_action" model="ir.actions.act_window">
<field name="name">进销存</field>
<field name="res_model">yuthon.sps</field><!-- 指定模型 -->
<field name="view_mode">tree,form</field><!-- 指定视图 -->
</record>
<menuitem id="yuthon_sps_menu"
sequence="1"
web_icon="yuthon_sps,static/description/icon.png"
name="进销存"/>
<!-- 二级标题 -->
<menuitem id="yuthon_sps_purchasing_menu"
sequence="1"
name="进货"
parent="yuthon_sps_menu"/>
<!--三级标题-->
<menuitem id="yuthon_sps_purchasing_procure_menu"
sequence="1"
name="采购订单"
parent="yuthon_sps_purchasing_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_purchasing_ware_menu"
sequence="3"
name="采购入仓"
parent="yuthon_sps_purchasing_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_purchasing_return_menu"
sequence="5"
name="采购退货"
parent="yuthon_sps_purchasing_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_purchasing_statemene_menu"
sequence="7"
name="供应商对账单"
parent="yuthon_sps_purchasing_menu" action="yuthon_sps_action"/>
<!-- 二级标题 -->
<menuitem id="yuthon_sps_carry_menu"
sequence="3"
name="销售"
parent="yuthon_sps_menu"/>
<!-- 三级标题 -->
<menuitem id="yuthon_sps_carry_price_menu"
sequence="1"
name="报单价"
parent="yuthon_sps_carry_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_order_menu"
sequence="3"
name="销售订单"
parent="yuthon_sps_carry_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_give_menu"
sequence="5"
name="送货单"
parent="yuthon_sps_carry_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_return_menu"
sequence="7"
name="销售退货"
parent="yuthon_sps_carry_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_from_menu"
sequence="10"
name="报表"
parent="yuthon_sps_carry_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_from_moth_menu"
sequence="1"
name="月"
parent="yuthon_sps_carry_from_menu"
action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_from_half_menu"
sequence="5"
name="半年"
parent="yuthon_sps_carry_from_menu"
action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_carry_from_year_menu"
sequence="10"
name="年度"
parent="yuthon_sps_carry_from_menu"
action="yuthon_sps_action"/>
<!--二级标题-->
<menuitem id="yuthon_sps_house_menu"
sequence="14"
name="仓库管理"
parent="yuthon_sps_menu"/>
<!--三级标题-->
<menuitem id="yuthon_sps_house_opening_menu"
sequence="1"
name="期初"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_house_condition_menu"
sequence="3"
name="库存状况"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_house_inventory_menu"
sequence="5"
name="盘点"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_house_ware_menu"
sequence="7"
name="入仓"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_house_return_menu"
sequence="10"
name="出仓"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_house_losses_menu"
sequence="14"
name="报损单"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_house_overflow_menu"
sequence="16"
name="报溢单"
parent="yuthon_sps_house_menu" action="yuthon_sps_action"/>
<!--二级标题-->
<menuitem id="yuthon_sps_finance_menu"
sequence="17"
name="财务管理"
parent="yuthon_sps_menu"/>
<!--三级标题-->
<menuitem id="yuthon_sps_finance_collection_menu"
sequence="1"
name="收款单"
parent="yuthon_sps_finance_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_finance_pay_menu"
sequence="3"
name="付款单"
parent="yuthon_sps_finance_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_finance_form_menu"
sequence="17"
name="报表"
parent="yuthon_sps_finance_menu"/>
<menuitem id="yuthon_sps_finance_from_moth_menu"
sequence="1"
name="月"
parent="yuthon_sps_finance_form_menu"
action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_finance_from_half_menu"
sequence="5"
name="半年"
parent="yuthon_sps_finance_form_menu"
action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_finance_from_year_menu"
sequence="10"
name="年度"
parent="yuthon_sps_finance_form_menu"
action="yuthon_sps_action"/>
<!--二级标题-->
<menuitem id="yuthon_sps_data_menu"
sequence="19"
name="基础资料"
parent="yuthon_sps_menu" />
<!--三级标题-->
<menuitem id="yuthon_sps_data_good_menu"
sequence="1"
name="产品资料"
parent="yuthon_sps_data_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_data_supply_menu"
sequence="5"
name="供应商"
parent="yuthon_sps_data_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_data_customer_menu"
sequence="10"
name="客户"
parent="yuthon_sps_data_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_data_house_menu"
sequence="15"
name="仓库资料"
parent="yuthon_sps_data_menu" action="yuthon_sps_action"/>
<menuitem id="yuthon_sps_other_menu"
sequence="19"
name="其他资料"
parent="yuthon_sps_data_menu" action="yuthon_sps_action"/>
</odoo>
yuthon_work_brand/views/hr_menus.xml
+12 -17
View File
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!-- 招聘 -->
<!-- <record id="hr_recruitment.menu_hr_recruitment_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="hr_recruitment.menu_hr_recruitment_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 人事 -->
<!-- <record id="hr.menu_hr_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="hr.menu_hr_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 出勤 -->
<!-- <record id="hr_attendance.menu_hr_attendance_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="hr_attendance.menu_hr_attendance_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 绩效 -->
<!-- <record id="yuthon_performance.yuthon_performance_menu_config_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="yuthon_performance.yuthon_performance_menu_config_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 人力资源 -->
<menuitem id="human_resources_menu_root_board"
@@ -214,11 +214,6 @@
parent="holiday_manage_menu_root_board" action="yuthon_hr_attendance.holiday_manage_type_action" sequence="1"/>
<menuitem id="holiday_manage_balance_board" name="假期余额"
parent="holiday_manage_menu_root_board" action="yuthon_hr_attendance.holiday_balance_action" sequence="3"/>
<!-- <menuitem id="tianhe_holiday_setting_menu_board"-->
<!-- parent="hr_attendance_root_board"-->
<!-- sequence="9"-->
<!-- name="假期类型配置"-->
<!-- action="yuthon_hr_attendance.holiday_setting_action"/>-->
<!-- 培训管理 -->
<menuitem id="training_manager_root_board"
name="培训管理"
yuthon_work_brand/views/work_menus.xml
+21 -17
View File
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!-- 工作流 -->
<!-- <record id="soong_workflow.menu_soong_workflow_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="soong_workflow.menu_soong_workflow_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 议题 -->
<!-- <record id="yuthon_issue.tianhe_issue_library_menu_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="yuthon_issue.tianhe_issue_library_menu_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 通知公告 -->
<!-- <record id="yuthon_notice.yuthon_notice_menu_config_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="yuthon_notice.yuthon_notice_menu_config_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 会议室 -->
<!-- <record id="room.room_menu_root" model="ir.ui.menu">-->
<!-- <field name="active">False</field>-->
<!-- </record>-->
<record id="room.room_menu_root" model="ir.ui.menu">
<field name="active">False</field>
</record>
<!-- 网站 -->
<record id="website.menu_website_configuration" model="ir.ui.menu">
<field name="active">False</field>
@@ -91,21 +91,25 @@
sequence="5"/>
<!-- 议题库 -->
<menuitem id="tianhe_issue_library_menu_root_board"
name="议题库"
name="议题管理"
parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
sequence="7"/>
<menuitem id="tianhe_issue_library_all_board"
<menuitem id="tianhe_issue_library_manage_menu_root_board"
name="议题库"
parent="tianhe_issue_library_menu_root_board"
sequence="1"/>
<menuitem id="tianhe_issue_library_all_board"
parent="tianhe_issue_library_manage_menu_root_board"
name="全部"
action="yuthon_issue.issue_library_action"
sequence="1"/>
<menuitem id="tianhe_issue_library_menu_root_board_will_board"
parent="tianhe_issue_library_menu_root_board"
parent="tianhe_issue_library_manage_menu_root_board"
name="待上会"
action="yuthon_issue.issue_library_action_will"
sequence="5"/>
<menuitem id="tianhe_issue_library_menu_root_board_on_meet_board"
parent="tianhe_issue_library_menu_root_board"
parent="tianhe_issue_library_manage_menu_root_board"
name="已上会"
action="yuthon_issue.issue_library_action_done"
sequence="10"/>
@@ -132,7 +136,7 @@
parent="tianhe_issue_library_menu_root_board"
name="议题审批"
action="yuthon_issue.issue_library_action"
sequence="9"/>
sequence="5"/>
<menuitem id="issue_approval_party_menu_board"
parent="issue_approval_menu_board"
name="党总支议题审批"