From 8946736694c9c87eb5583945f30a82ce5c93aadb 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: Mon, 9 Mar 2026 21:36:54 +0800 Subject: [PATCH 1/4] =?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_approval/wizard/property_rental_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index 374722864..1f77af193 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -35,7 +35,7 @@ class PropertyRentalWizard(models.Model): rent_id = self.env['property.rent.list'].search([ ('contract_id', '=', record.id), ('property_id', '=', property_id), - ('due_date', '>=', first_day_of_month), + ('due_date', '>', first_day_of_month), ('due_date', '<=', last_day_of_month), ]) From 382ef8fcc17ac3bf708860157730c5fdf19e76fb 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: Mon, 9 Mar 2026 21:40:20 +0800 Subject: [PATCH 2/4] =?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_approval/wizard/property_rental_wizard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index 1f77af193..72999030d 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -42,7 +42,7 @@ class PropertyRentalWizard(models.Model): # 判断是否有已生成应收 existing_receivable = self.env['property.accounts.receivable'].search([ ('lessee_id', '=', record.lessee_id.id), - ('due_date', '>=', first_day_of_month), + ('due_date', '>', first_day_of_month), ('due_date', '<=', last_day_of_month), ('management_type_id.name', '=', '租金'), ('contract_id', '=', record.id), @@ -263,6 +263,7 @@ class PropertyRentalWizard(models.Model): records = self.env['property.lease.contract'].search(domain +[ ('actual_start_time', '<', next_month_first_day), ('actual_end_time', '>=', first_day), + ('contract_code', '=', '租（2021）E02号') ]) if not records: records = self.env['property.lease.contract'].search(domain +[ From 287e61826732fef92a76f7d09309327d2bcb41c0 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: Mon, 9 Mar 2026 21:40:31 +0800 Subject: [PATCH 3/4] =?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_approval/wizard/property_rental_wizard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index 72999030d..54e711ee6 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -263,7 +263,6 @@ class PropertyRentalWizard(models.Model): records = self.env['property.lease.contract'].search(domain +[ ('actual_start_time', '<', next_month_first_day), ('actual_end_time', '>=', first_day), - ('contract_code', '=', '租（2021）E02号') ]) if not records: records = self.env['property.lease.contract'].search(domain +[ From def291d624788cffd05e416e68ac06e673f7d483 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Tue, 10 Mar 2026 09:57:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=8F=E7=BA=A2=E7=82=B9=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wizard/soong_workflow_comment_wizard.py | 2 +- .../src/webclient/actions/client_actions.js | 6 ++--- .../static/src/webclient/navbar/navbar.js | 22 ++++++++++++------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index a28ab7f47..38b3fc7ac 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -399,7 +399,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): partners = self.env['res.partner'].search([]) bus_message = {'type': 'wkf_notify'} notifications = [[partner, 'sun_badge_menu.reload_menu_data', [bus_message]] for partner in partners] - self.env["bus.bus"]._sendmany(notifications) + # self.env["bus.bus"]._sendmany(notifications) # 浏览器叮咚 def add_comment(self): self.ensure_one() diff --git a/sun_badge_menu/static/src/webclient/actions/client_actions.js b/sun_badge_menu/static/src/webclient/actions/client_actions.js index 535100536..8c0ee3426 100644 --- a/sun_badge_menu/static/src/webclient/actions/client_actions.js +++ b/sun_badge_menu/static/src/webclient/actions/client_actions.js @@ -9,9 +9,9 @@ import {escape, sprintf} from "@web/core/utils/strings"; import {Component, markup, onMounted, xml} from "@odoo/owl"; -export function clickRefreshButton() { - document.querySelector('button[name="sh_refresh"].sh_refresh')?.click(); -} +// export function clickRefreshButton() { +// document.querySelector('button[name="sh_refresh"].sh_refresh')?.click(); +// } /** * Client action to go back home. */ diff --git a/sun_badge_menu/static/src/webclient/navbar/navbar.js b/sun_badge_menu/static/src/webclient/navbar/navbar.js index e9feaa542..f7011b82d 100644 --- a/sun_badge_menu/static/src/webclient/navbar/navbar.js +++ b/sun_badge_menu/static/src/webclient/navbar/navbar.js @@ -5,7 +5,7 @@ import { patch } from "@web/core/utils/patch"; import { deepCopy } from "@web/core/utils/objects"; import { useService } from "@web/core/utils/hooks"; import { url } from "@web/core/utils/urls"; -import { clickRefreshButton } from "../actions/client_actions" +// import { clickRefreshButton } from "../actions/client_actions" const WKF_NOTIFY_TYPE = 'wkf_notify' @@ -28,13 +28,19 @@ patch(NavBar.prototype, { for (const d of detail) { if (d?.type === WKF_NOTIFY_TYPE) { this.menuService.reload(); - return this.audio.play() - .then(() => { - clickRefreshButton(); - }).catch((e) => { - console.log(e) - }); + return this.audio.play().catch((e) => { + console.log(e) + }); } + // if (d?.type === WKF_NOTIFY_TYPE) { + // this.menuService.reload(); + // return this.audio.play() + // .then(() => { + // clickRefreshButton(); + // }).catch((e) => { + // console.log(e) + // }); + // } } const oldMenuApps = deepCopy(this.menuService.getApps()) @@ -63,7 +69,7 @@ patch(NavBar.prototype, { } } } - clickRefreshButton(); + // clickRefreshButton(); }, 300) }); }