!6845 !6844 添加功能

Merge pull request !6845 from 李鹏宇/dev

yuthon_property_approval/models/property_bills_list.py

@@ -13,7 +13,6 @@ class PropertyBillsList(models.Model):
     contract_id = fields.Many2one('property.lease.contract', string="合同编号")
     lessee_id = fields.Many2one(related="contract_id.lessee_id", string="承租方", store=True)
     property_name = fields.Char(related='contract_id.property_name', string="物业信息")
-    is_written = fields.Boolean(string="已核销", default=False)
 
     def action_pay(self):
         return {

yuthon_property_approval/views/property_bills_list_views.xml

@@ -13,8 +13,7 @@
                 <field name="contract_id"/>
                 <field name="property_name"/>
                 <field name="lessee_id"/>
-                <field name="is_written" column_invisible="1"/>
-                <button name="action_pay" string="核销" type="object" class="btn-primary" column_invisible="is_written"/>
+                <button name="action_pay" string="核销" type="object" class="btn-primary" invisible="actual_date"/>
             </tree>
         </field>
     </record>

yuthon_property_approval/wizard/property_bills_wizard.py

@@ -17,7 +17,6 @@ class PropertyBillsWizard(models.TransientModel):
             if receivable:
                 receivable.write({'has_date': self.actual_date})
             self.bills_list_id.contract_id.contact_state = 'settle'
-            self.bills_list_id.is_written = True
             self.bills_list_id.contract_id.compute_is_has()