From 89c8eecc7c7785989378ca69a7b2322338123475 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 8 Jan 2025 14:43:07 +0800 Subject: [PATCH 1/5] =?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 --- .../security/planning_group.xml | 14 +- .../views/property_lease_contract.xml | 133 ++++-------------- 2 files changed, 37 insertions(+), 110 deletions(-) diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml index 255733526..677c9ad1a 100644 --- a/yuthon_hr_attendance/security/planning_group.xml +++ b/yuthon_hr_attendance/security/planning_group.xml @@ -31,7 +31,6 @@ - 工程部：用户 @@ -99,11 +98,22 @@ - 计划考勤管理员 + 计划考勤管理员 + + + User: 角色匹配的数据访问 + + + + + + + diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index 08c6e8f29..01d5295e2 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -88,32 +88,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -278,6 +252,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -372,32 +371,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -568,16 +541,6 @@ - - - - - - - - - - @@ -601,52 +564,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4140509507676bfc0a26a42deaba0cb5ee36b64e Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 8 Jan 2025 14:43:27 +0800 Subject: [PATCH 2/5] =?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 --- .../security/planning_group.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml index 677c9ad1a..57de1164b 100644 --- a/yuthon_hr_attendance/security/planning_group.xml +++ b/yuthon_hr_attendance/security/planning_group.xml @@ -105,15 +105,15 @@ - - User: 角色匹配的数据访问 - - - - - - - + + + + + + + + + + From 3e24125b89ef52fab1cad3173f436f5dfc788058 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 8 Jan 2025 15:25:57 +0800 Subject: [PATCH 3/5] =?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_property/views/menuitem.xml | 60 ++++----- .../models/property_lease_contract.py | 1 + .../views/property_lease_contract.xml | 123 +++++++++--------- yuthon_work_brand/views/hr_menus.xml | 4 + 4 files changed, 97 insertions(+), 91 deletions(-) diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 5c8ccd831..4bc61ae49 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -79,6 +79,36 @@ sequence="9" name="租赁合同" parent="yuthon_property_menu_root"/> + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -266,6 +236,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -293,7 +293,7 @@ - + @@ -371,36 +371,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -520,6 +490,7 @@ + @@ -554,6 +525,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 0bdaf601b..bc73380e1 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -135,6 +135,10 @@ groups="yuthon_hr_employee.group_hr_employee_manager" action="hr_contract.action_hr_contract" sequence="9"/> + Date: Wed, 8 Jan 2025 16:54:27 +0800 Subject: [PATCH 4/5] =?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_hr_attendance/security/planning_group.xml | 14 +------------- .../models/property_lease_contract.py | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml index 57de1164b..ea139f154 100644 --- a/yuthon_hr_attendance/security/planning_group.xml +++ b/yuthon_hr_attendance/security/planning_group.xml @@ -75,7 +75,6 @@ (4, ref('group_he_attendance_run_manager'))]"/> - 粮储:用户 @@ -96,24 +95,13 @@ - - 计划考勤管理员 + 计划考勤管理员 - - - - - - - - - - diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index d222104ab..7833f8e4b 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -94,7 +94,7 @@ class PropertyLeaseContract(models.Model): is_split = fields.Boolean(string="是否合同拆分") split_context = fields.Char(string="拆分内容", default="该合同已拆分") percentage_liquidated_damages = fields.Many2one('yuthon.penalty.setting', string="违约金比例") - percentage_damages= fields.Float(string="违约金比例") + percentage_damages= fields.Float(string="违约金") date_payment_month = fields.Char(string="支付日期") date_payment_day = fields.Char(string="支付日期") first_pay = fields.Date(string="首次付款日") From 84723d3b2a3ba57ab4db42437ba684313314f94c Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 8 Jan 2025 17:45:29 +0800 Subject: [PATCH 5/5] =?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_hr_attendance/models/card_approval.py | 9 ++++++--- yuthon_hr_attendance/views/hr_attendance_views.xml | 2 +- .../data/data_yuthon_resource_mgmt_config.xml | 2 +- yuthon_property/views/menuitem.xml | 4 ++-- .../models/property_lease_contract.py | 6 ++++++ 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index 0d7295ff2..6ed19b68f 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -40,6 +40,12 @@ class CardApprovals(models.Model): rep.replacement_time = 'all' if rep.attendance_id.is_early_card and rep.attendance_id.is_no_card: rep.replacement_time = 'all' + if rep.attendance_id.is_no_card and not rep.attendance_id.check_out: + rep.replacement_time = 'quitting' + if rep.attendance_id.is_no_card and not rep.attendance_id.check_in: + rep.replacement_time = 'work' + if rep.attendance_id.is_no_card and not rep.attendance_id.check_in and not rep.attendance_id.check_out: + rep.replacement_time = 'all' @api.depends('users_id', 'attendance_id') def _compute_name(self): @@ -92,6 +98,3 @@ class CardApprovals(models.Model): elif self.related_issues_id: raise UserError("已经创建了相关的上会记录，不能取消勾选") - - - diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml index 5243ce549..e4519a3f6 100644 --- a/yuthon_hr_attendance/views/hr_attendance_views.xml +++ b/yuthon_hr_attendance/views/hr_attendance_views.xml @@ -36,7 +36,7 @@ - + diff --git a/yuthon_property/data/data_yuthon_resource_mgmt_config.xml b/yuthon_property/data/data_yuthon_resource_mgmt_config.xml index 6c8def2e6..1b013b99d 100644 --- a/yuthon_property/data/data_yuthon_resource_mgmt_config.xml +++ b/yuthon_property/data/data_yuthon_resource_mgmt_config.xml @@ -69,7 +69,7 @@ 代管 - 自营 + 自有 diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 4bc61ae49..f327cd9b2 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -336,8 +336,8 @@ - + +