流程查询
diff --git a/yuthon_report/models/current_receivable_rent_report.py b/yuthon_report/models/current_receivable_rent_report.py
index 349362f2f..ded5be19b 100644
--- a/yuthon_report/models/current_receivable_rent_report.py
+++ b/yuthon_report/models/current_receivable_rent_report.py
@@ -63,13 +63,7 @@ class CurrentReceivableRentReport(models.Model):
for idx, rec in enumerate(receivables, start=1):
amt = rec.original_amount or 0.0
- # 从property.rent.list中获取税率
- rent_list = self.env['property.rent.list'].search([
- ('lessee_id', '=', rec.lessee_id.id if rec.lessee_id else False),
- ('property_id', 'in', rec.property_ids.ids if rec.property_ids else []),
- ('due_date', '=', rec.due_date),
- ], limit=1)
- tax_rate = rent_list.tax if rent_list else (rec.tax or 0.0)
+ tax_rate = rec.tax or 0.0
amt_nt = amt / (1 + tax_rate / 100) if tax_rate else amt
total_amount += amt
total_amount_nt += amt_nt
diff --git a/yuthon_report/static/src/components/yuthon_report/receivable_report.xml b/yuthon_report/static/src/components/yuthon_report/receivable_report.xml
index 14cd14a6a..4c8627c3d 100644
--- a/yuthon_report/static/src/components/yuthon_report/receivable_report.xml
+++ b/yuthon_report/static/src/components/yuthon_report/receivable_report.xml
@@ -51,9 +51,11 @@
diff --git a/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss b/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss
index b48b3cd88..3847f6bd2 100644
--- a/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss
+++ b/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss
@@ -23,4 +23,9 @@
}
.stat-change {
font-size: 0.9rem;
+ }
+
+ /* 下拉框placeholder样式 */
+ #formview_default_conditions option[value=""] {
+ color: #6c757d;
}
\ No newline at end of file
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 69bf609f7..c159d8158 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -752,7 +752,7 @@
-
+