!9800 !9799 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…

Merge pull request !9800 from 李鹏宇/dev

yuthon_property/models/property_bank_statements.py

@@ -197,6 +197,8 @@ class ReceivableModifyLine(models.Model):
     original_amount = fields.Float(related='bank_id.original_amount', string='交易金额', store=False)
     receivable_id = fields.Many2one('property.accounts.receivable', string='应收账单')
     management_type_id = fields.Many2one('yuthon.management.type', related='receivable_id.management_type_id', string='应收类型', store=False)
+    due_date = fields.Date(related='receivable_id.due_date', string='应收开始', store=False)
+    due_date_end = fields.Date(related='receivable_id.due_date_end', string='应收结束', store=False)
     is_write = fields.Boolean()
 
     reconciliation_date = fields.Date(string='对账日期')

yuthon_property/security/ir.model.access.csv

@@ -88,7 +88,8 @@ access_evaluation_plan_wizard,evaluation_plan_wizard,model_evaluation_plan_wizar
 access_receivable_log_wizard, receivable.log.wizard,model_receivable_log_wizard,base.group_user,1,1,1,1
 access_amount_way,amount_way,model_amount_way,base.group_user,1,1,1,1
 access_property_summary_report, property_summary_report,model_property_summary_report,base.group_user,1,1,1,1
-access_receivable_modify_line, receivable.modify.line,model_receivable_modify_line,base.group_user,1,1,1,1
+access_receivable_modify_line, receivable.modify.line,model_receivable_modify_line,base.group_user,1,0,0,0
+access_receivable_modify_line_admin, receivable.modify.line,model_receivable_modify_line,base.group_system,1,1,1,1
 
 access_meter_price_wizard, meter_price_wizard,model_meter_price_wizard,base.group_user,1,1,1,1
 access_water_price_wizard, water_price_wizard,model_water_price_wizard,base.group_user,1,1,1,1
@@ -96,7 +97,6 @@ access_electric_water_wizard, electric_water_wizard,model_electric_water_wizard,
 
 access_hydropower_logs,hydropower.logs,model_hydropower_logs,base.group_user,1,1,1,1
 access_initialize_wizard,initialize.wizard,model_initialize_wizard,base.group_user,1,1,1,1
-access_receivable_modify_line, receivable.modify.line,model_receivable_modify_line,base.group_user,1,1,1,1
 access_meter_archives_line, meter.archives.line,model_meter_archives_line,base.group_user,1,1,1,1
 access_meter_water_line, meter.water.line,model_meter_water_line,base.group_user,1,1,1,1
 access_yuthon_epitope_values, yuthon.epitope.values,model_yuthon_epitope_values,base.group_user,1,1,1,1

yuthon_property/views/property_bank_statements_views.xml

@@ -114,15 +114,17 @@
         <field name="name">receivable.modify.line.tree</field>
         <field name="model">receivable.modify.line</field>
         <field name="arch" type="xml">
-            <tree string="应收流水中间表">
+            <tree string="应收流水中间表" editable="top">
                 <field name="bank_id"/>
-                <field name="original_amount"/>
-                <field name="receivable_id"/>
-                <field name="management_type_id"/>
                 <field name="reconciliation_date"/>
-                <field name="is_penalty"/>
                 <field name="not_collected"/>
                 <field name="amount"/>
+                <field name="original_amount"/>
+                <field name="receivable_id"/>
+                <field name="due_date"/>
+                <field name="due_date_end"/>
+                <field name="management_type_id"/>
+                <field name="is_penalty"/>
             </tree>
         </field>
     </record>