diff --git a/yuthon_property_approval/security/property_group.xml b/yuthon_property_approval/security/property_group.xml index 86381f0df..02b8d73b8 100644 --- a/yuthon_property_approval/security/property_group.xml +++ b/yuthon_property_approval/security/property_group.xml @@ -1,8 +1,10 @@ - - - - - + + 物业管理 (片区管理员 + + + 管理员 + + diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index 4717e1be0..d6ee3b296 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -87,6 +87,8 @@ + + @@ -638,8 +640,8 @@ - - + + diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index 512525211..b19b524f1 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -233,7 +233,7 @@ class PropertyRentalWizard(models.Model): new_version = False # 当期应收日期 - if not record.is_contract and new_version: + if new_version: if start_year_month <= date_field_year_month <= end_year_month: if rent_id.period_rent != 0 and record.contract_sort not in ['guanggao', 'guanzi', 'room']: self.create_rent_list(record, rent_id, rent_amount, start_date, multiplier)