工作流办结时间,报表
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -51,9 +51,11 @@
|
||||
</div>
|
||||
<div class="col">
|
||||
<select id="formview_default_conditions" class="o_input" t-model="state.condition" t-on-change="onChangeCondition">
|
||||
<option value="">权属类型</option>
|
||||
<option t-foreach="state.conditions" t-as="cond"
|
||||
t-att-value="cond.value"
|
||||
t-key="cond.name">
|
||||
t-key="cond.name"
|
||||
t-if="cond.value">
|
||||
<t t-esc="cond.name"/>
|
||||
</option>
|
||||
</select>
|
||||
|
||||
@@ -23,4 +23,9 @@
|
||||
}
|
||||
.stat-change {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
/* 下拉框placeholder样式 */
|
||||
#formview_default_conditions option[value=""] {
|
||||
color: #6c757d;
|
||||
}
|
||||
Reference in New Issue
Block a user