pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4162 !4161 添加功能

Browse Source 
Merge pull request !4162 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-07-29 14:57:08 +00:00
committed by Gitee
parent a3fb36d7eb 00fc0dafec
commit e6d1b4c2cb
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/models/inherit_yuthon_property.py
+1 -7
View File
@@ -121,15 +121,13 @@ class PropertyBankStatements(models.Model):
def _get_reconciliation_vals(self, record):
if record.name:
dt = datetime.strptime(str(self.start_time), '%Y-%m-%d %H:%M:%S').date()
first_day = dt.replace(day=1)
last_day = first_day + relativedelta(months=1) - relativedelta(days=1)
last_day = dt.replace(day=1) + relativedelta(months=1) - relativedelta(days=1)
total_rent_month = 0
# 应收租金
rent_ids = self.env['property.accounts.receivable'].search([
('lessee_id.name', '=', record.name_account),
('management_type_id.name', '=', '租金'),
('is_reconciliation', '=', False),
('due_date', '>=', fields.Date.to_string(first_day)),
('due_date', '<=', fields.Date.to_string(last_day)),
])
# 应收押金
@@ -137,7 +135,6 @@ class PropertyBankStatements(models.Model):
('lessee_id.name', '=', record.name_account),
('management_type_id.name', '=', '押金'),
('is_reconciliation', '=', False),
('due_date', '>=', fields.Date.to_string(first_day)),
('due_date', '<=', fields.Date.to_string(last_day)),
])
# 应收管理费
@@ -145,7 +142,6 @@ class PropertyBankStatements(models.Model):
('lessee_id.name', '=', record.name_account),
('management_type_id.name', '=', '管理费'),
('is_reconciliation', '=', False),
('due_date', '>=', fields.Date.to_string(first_day)),
('due_date', '<=', fields.Date.to_string(last_day)),
])
# 应收水费
@@ -153,7 +149,6 @@ class PropertyBankStatements(models.Model):
('lessee_id.name', '=', record.name_account),
('management_type_id.name', '=', '水费'),
('is_reconciliation', '=', False),
('due_date', '>=', fields.Date.to_string(first_day)),
('due_date', '<=', fields.Date.to_string(last_day)),
])
# 应收电费
@@ -161,7 +156,6 @@ class PropertyBankStatements(models.Model):
('lessee_id.name', '=', record.name_account),
('management_type_id.name', '=', '电费'),
('is_reconciliation', '=', False),
('due_date', '>=', fields.Date.to_string(first_day)),
('due_date', '<=', fields.Date.to_string(last_day)),
])
yuthon_property_approval/wizard/accounts_wizard_views.xml
+2 -2
View File
@@ -16,10 +16,10 @@
<button name="unsuspend" type="object" string="挂起" class="btn btn-primary button_width"/>
</group>
<group>
<button name="receivable_return" type="object" string="撤销" class="btn btn-primary button_width"/>
<button name="receivable_return" type="object" string="撤销对账" class="btn btn-primary button_width"/>
</group>
<group>
<button name="action_refuse" type="object" string="退回" class="btn btn-primary button_width"/>
<button name="action_refuse" type="object" string="退回应收" class="btn btn-primary button_width"/>
</group>
</group>
<footer/>