From d31ab116aa2593c289aebadec8463ee3622bda06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 11:07:22 +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_official/models/yuthon_official.py | 3 +++ yuthon_official/views/yuthon_official_views.xml | 9 ++++++++- .../models/property_lease_contract.py | 4 +++- .../views/property_lease_contract.xml | 4 +++- yuthon_trade/models/yuthon_business_approval.py | 3 +++ yuthon_trade/views/yuthon_business_approval_viwes.xml | 7 ++++++- yuthon_will_task/models/inherit_room_booking.py | 8 +++++--- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py index edac09304..c9537881b 100644 --- a/yuthon_official/models/yuthon_official.py +++ b/yuthon_official/models/yuthon_official.py @@ -41,6 +41,9 @@ class YuthonOfficial(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") is_official_incoming = fields.Boolean(string="是否收文") active = fields.Boolean('Active', default=True, tracking=True) + is_chapter = fields.Boolean(string="是否用章") + type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型') + scope_chapter_ids = fields.Many2many('seals.scope.setting', string='用章范围') red_suit = fields.Char(string="套红") official_documents_ids = fields.Many2many('ir.attachment', string="附件") diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml index 9934dcfca..4b3cafa20 100644 --- a/yuthon_official/views/yuthon_official_views.xml +++ b/yuthon_official/views/yuthon_official_views.xml @@ -29,13 +29,16 @@ invisible="urgency_level != 'urgent'"/> - + + + + @@ -79,6 +82,10 @@ + + + + diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index d927d58c5..93bf482db 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -99,7 +99,9 @@ class PropertyLeaseContract(models.Model): tenure_type = fields.Selection([('self', '自有'), ('agency', '代管')], string='权属类型', compute="_compute_admin_id", store=True) contract_code = fields.Char(string="合同编号") display_name = fields.Char(string="合同编号", compute="_compute_display_name", store=True) - + is_chapter = fields.Boolean(string="是否用章") + type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型') + scope_chapter_ids = fields.Many2many('seals.scope.setting', string='用章范围') contract_date = fields.Date(string="合同签订日期") is_print = fields.Boolean(string="当月打印", compute ="_compute_is_print", store=True) property_documents_ids = fields.Many2many( diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index 5256a94b6..e469111ca 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -46,7 +46,7 @@ - + @@ -101,6 +101,8 @@ + + diff --git a/yuthon_trade/models/yuthon_business_approval.py b/yuthon_trade/models/yuthon_business_approval.py index 347e61d1e..695147013 100644 --- a/yuthon_trade/models/yuthon_business_approval.py +++ b/yuthon_trade/models/yuthon_business_approval.py @@ -22,6 +22,9 @@ class YuthonBusinessApproval(models.Model): information_categories_ids = fields.Many2many('yuthon.information.categories', string='类型') reason = fields.Text(string="正文") document_ids = fields.Many2many('ir.attachment', string="附件") + is_chapter = fields.Boolean(string="是否用章") + type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型') + scope_chapter_ids = fields.Many2many('seals.scope.setting', string='用章范围') active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index 08c8aa92f..7c05a5524 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -21,13 +21,16 @@ invisible="urgency_level != 'urgent'"/> - + + + + @@ -44,6 +47,8 @@ + + diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py index 09a60a198..d5fefe716 100644 --- a/yuthon_will_task/models/inherit_room_booking.py +++ b/yuthon_will_task/models/inherit_room_booking.py @@ -1,4 +1,5 @@ from odoo import api, fields, models +from datetime import datetime, timedelta, date class InheritRoomBooking(models.Model): @@ -17,15 +18,16 @@ class InheritRoomBooking(models.Model): def get_hour_selection(datetime_obj): if not datetime_obj: return None - hour = datetime_obj.hour - minute = datetime_obj.minute + datetime_plus_8h = datetime_obj + timedelta(hours=8) + hour = datetime_plus_8h.hour + minute = datetime_plus_8h.minute return str(hour) if minute == 0 else f"{hour}.5" if task_time_ids: start_datetime = new_record.start_datetime start_date = start_datetime.date() request_hour_from = get_hour_selection(new_record.start_datetime) - request_hour_to = get_hour_selection(new_record.stop_datetime) + request_hour_to = get_hour_selection(new_record.end_datetime) self.env['yuthon.will.task'].sudo().create({ 'name': new_record.name, 'users_ids': [(6, 0, new_record.room_users_ids.ids)], From e960d47793be368c2bffe0c3ebc2f739bcd59e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 11:20:04 +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_report/views/receivable_report_views.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yuthon_report/views/receivable_report_views.xml b/yuthon_report/views/receivable_report_views.xml index ada16241c..1e83ff7e8 100644 --- a/yuthon_report/views/receivable_report_views.xml +++ b/yuthon_report/views/receivable_report_views.xml @@ -26,6 +26,8 @@ + + + \ No newline at end of file