From 2241838f5faf294984a7e279661f3554d4cbb5d7 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Tue, 12 Nov 2024 18:58:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/security/issue_approval_group.xml    | 15 +++++++++++++++
 .../models/yuthon_plan_management.py              |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 yuthon_issue/security/issue_approval_group.xml

diff --git a/yuthon_issue/security/issue_approval_group.xml b/yuthon_issue/security/issue_approval_group.xml
new file mode 100644
index 000000000..b554eb7ef
--- /dev/null
+++ b/yuthon_issue/security/issue_approval_group.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="rule_yuthon_issue_company" model="ir.rule">
+            <field name="name">决策清单记录规则</field>
+            <field name="model_id" ref="model_yuthon_issue"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="domain_force">[('yuthon_company', 'in',self.env.user.employee_id.yuthon_company)]</field>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_performance/models/yuthon_plan_management.py b/yuthon_performance/models/yuthon_plan_management.py
index 207eeb400..53eb094f0 100644
--- a/yuthon_performance/models/yuthon_plan_management.py
+++ b/yuthon_performance/models/yuthon_plan_management.py
@@ -20,6 +20,7 @@ class YuthonWorkTasksLine(models.Model):
     _description = "工作任务明细"
 
     plan_id = fields.Many2one('yuthon.plan.management','关联个人工作任务')
+    select_time = fields.Selection(related='plan_id.select_time',string='选择时间')
     task_type = fields.Selection([('KPI','KPI'),('GS','GS')],string='任务类型')
     task_name = fields.Many2one('yuthon.index.management',string='任务名称')
     plan = fields.Char('计划安排及具体措施行动')

From 4d2a7d9369fe99314c7a8a3e31ccbd5256d2d5e3 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Tue, 12 Nov 2024 19:00:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/security/issue_approval_group.xml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 yuthon_issue/security/issue_approval_group.xml

diff --git a/yuthon_issue/security/issue_approval_group.xml b/yuthon_issue/security/issue_approval_group.xml
deleted file mode 100644
index b554eb7ef..000000000
--- a/yuthon_issue/security/issue_approval_group.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <data>
-        <record id="rule_yuthon_issue_company" model="ir.rule">
-            <field name="name">决策清单记录规则</field>
-            <field name="model_id" ref="model_yuthon_issue"/>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-            <field name="domain_force">[('yuthon_company', 'in',self.env.user.employee_id.yuthon_company)]</field>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file