!12258 !12257 添加功能

Merge pull request !12258 from 李鹏宇/dev

yuthon_property/models/property_bank_statements.py

@@ -238,6 +238,11 @@ class ReceivableModifyLine(models.Model):
     due_date_end = fields.Date(related='receivable_id.due_date_end', string='应收结束', store=True)
     property_name = fields.Text(string='物业名称', compute='_compute_property_name', store=False, search='_search_property_name')
     delivered1 = fields.Float(string='当期金额', compute='_compute_delivered1')
+    receivable_number = fields.Integer(
+        string='应收账款ID',
+        related='receivable_id.id',
+        readonly=True,
+    )
 
     @api.depends('receivable_id', 'receivable_id.original_amount',
                   'receivable_id.management_type_id', 'amount', 'reconciliation_date')

yuthon_property/views/property_bank_statements_views.xml

@@ -121,7 +121,8 @@
         <field name="model">receivable.modify.line</field>
         <field name="arch" type="xml">
             <tree string="应收流水中间表" editable="top" default_order="due_date desc">
-                 <field name="receivable_id"/>
+                <field name="receivable_id" column_invisible="1"/>
+                <field name="receivable_number"/>
                 <field name="bank_id"/>
                 <field name="is_reconciliation"/>
                 <field name="original_amount"/>

yuthon_property_approval/models/receivable_modify_line.py

@@ -4,12 +4,6 @@ from odoo import api, fields, models
 class ReceivableModifyLine(models.Model):
     _inherit = 'receivable.modify.line'
 
-    receivable_number = fields.Integer(
-        string='应收账款ID',
-        related='receivable_id.id',
-        readonly=True,
-    )
-
     lessee_id = fields.Many2one(
         'property.tenant.information',
         string='承租方',

yuthon_property_approval/views/receivable_modify_line_views.xml

@@ -8,9 +8,6 @@
             <field name="property_name" position="after">
                 <field name="contract_id"/>
             </field>
-            <field name="receivable_id" position="replace">
-                <field name="receivable_number" string="应收账款ID"/>
-            </field>
         </field>
     </record>