!1304 结束

Merge pull request !1304 from 李鹏宇/dev

yuthon_property/__manifest__.py

@@ -46,7 +46,6 @@
         'views/property_check_decorate_views.xml',
         'views/property_other_list_views.xml',
         'views/property_meter_reading_views.xml',
-        'views/property_bank_statements_views.xml',
         'wizard/yuthon_property_wizard_views.xml',
         'wizard/property_meter_wizard_views.xml',
         'wizard/property_tenant_wizard_views.xml',

yuthon_property/models/property_bank_statements.py

@@ -3,9 +3,6 @@ from odoo import models, fields, api
 
 class PropertyBankStatements(models.Model):
     _name = 'property.bank.statements'
-    _description = '银行流水'
+    _description = 'Bank Statement'
 
-    name = fields.Char(string="流水号")
-    condition = fields.Selection([('be_executed', '待执行'), ('executed', '已执行'), ('executing', '执行中')], string="状态", default='be_executed')
-    start_date = fields.Date(string="开始时间")
-    end_date = fields.Date(string="结束时间")
+    name = fields.Char(string='Name')

yuthon_property/models/property_rent_list.py

@@ -5,7 +5,6 @@ class PropertyRentList(models.Model):
   _name = 'property.rent.list'
   _description = '租金列表'
 
-  contract_code = fields.Char(string='合同编号', required=True)
   property_id = fields.Many2one('yuthon.property', string='物业')
   lessee_id = fields.Many2one('property.tenant.information', string='承租方')
   due_date = fields.Date(string='应收日期')
@@ -25,8 +24,15 @@ class PropertyRentList(models.Model):
   is_invoice = fields.Boolean(string='开票')
   is_suspend = fields.Boolean(string='挂起')
   create_time = fields.Datetime(string='创建时间', default=fields.Datetime.now)
+  is_push = fields.Boolean(string='已推送')
   last_update_time = fields.Datetime(string='最后修改时间')
 
   def write(self, vals):
     vals['last_update_time'] = fields.Datetime.now()
-    return super(PropertyRentList, self).write(vals)
+    return super(PropertyRentList, self).write(vals)
+
+  def unlink(self):
+    return super().unlink()
+
+  def button_push(self):
+    pass

yuthon_property/security/ir.model.access.csv

@@ -58,5 +58,4 @@ access_property_meter_wizard,property_meter_wizard,model_property_meter_wizard,b
 access_yuthon_industry_setting,yuthon_industry_setting,model_yuthon_industry_setting,base.group_user,1,1,1,1
 access_property_tenant_wizard,property_tenant_wizard,model_property_tenant_wizard,base.group_user,1,1,1,1
 access_property_water_wizard,property_water_wizard,model_property_water_wizard,base.group_user,1,1,1,1
-access_property_bank_statements,property_bank_statements,model_property_bank_statements,base.group_user,1,1,1,1
 access_yuthon_purpose_evidence,yuthon_purpose_evidence,model_yuthon_purpose_evidence,base.group_user,1,1,1,1

yuthon_property/views/menuitem.xml

@@ -195,7 +195,7 @@
               sequence="3"
               name="银行流水"
               parent="yuthon_property_other_list"
-              action="action_bank_statement"/>
+              action="view_property_rent_list_action2"/>
     <menuitem id="yuthon_security_inspection_menu"
               sequence="19"
               name="安全巡检(二期)"

yuthon_property/views/property_bank_statements_views.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="view_bank_statement_tree" model="ir.ui.view">
-        <field name="name">Bank Statement Tree</field>
-        <field name="model">property.bank.statements</field>
-        <field name="arch" type="xml">
-            <tree string="银行流水"  editable="bottom">
-                <field name="name"/>
-                <field name="condition"/>
-                <field name="start_date"/>
-                <field name="end_date"/>
-            </tree>
-        </field>
-    </record>
-    <record id="view_bank_statement_search" model="ir.ui.view">
-        <field name="name">Bank Statement Search</field>
-        <field name="model">property.bank.statements</field>
-        <field name="arch" type="xml">
-            <search string="银行流水">
-                <field name="name"/>
-                <group expand="0" string="状态">
-                    <filter name="group_by_condition" string="状态" context="{'group_by':'condition'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-    <record id="action_bank_statement" model="ir.actions.act_window">
-        <field name="name">银行流水</field>
-        <field name="res_model">property.bank.statements</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_group_by_condition':1}</field>
-    </record>
-</odoo>

yuthon_property/views/property_rent_list_views.xml

@@ -6,7 +6,6 @@
         <field name="arch" type="xml">
             <tree editable="bottom" string="租金列表" decoration-danger = "charge_status == 'unpaid'"
                   decoration-success="charge_status == 'fully_paid'">
-                <field name="contract_code"/>
                 <field name="property_id"/>
                 <field name="lessee_id"/>
                 <field name="due_date"/>
@@ -15,8 +14,11 @@
                 <field name="remark"/>
                 <field name="charge_status" column_invisible="1"/>
                 <field name="multiplier" column_invisible="1"/>
+                <field name="is_push" column_invisible="1"/>
                 <field name="create_time"/>
                 <field name="last_update_time"/>
+                <button name="unlink" type="object" class="btn-primary" string="删除"/>
+                <button name="button_push" type="object" class="btn-primary" string="推送"/>
             </tree>
         </field>
     </record>
@@ -27,7 +29,6 @@
             <search>
                 <field name="property_id"/>
                 <field name="lessee_id"/>
-                <field name="contract_code"/>
             </search>
         </field>
     </record>
@@ -35,39 +36,20 @@
         <field name="name">租金列表</field>
         <field name="res_model">property.rent.list</field>
         <field name="view_mode">tree,search</field>
+        <field name="domain">[('is_push', '=',  False)]</field>
     </record>
-
-    <record id="view_property_rent_list_tree2" model="ir.ui.view">
-        <field name="name">property.rent.list.tree</field>
-        <field name="model">property.rent.list</field>
-        <field name="arch" type="xml">
-            <tree editable="bottom" string="租金列表">
-                <field name="contract_code"/>
-                <field name="property_id"/>
-                <field name="lessee_id"/>
-                <field name="due_date"/>
-                <field name="original_amount"/>
-                <field name="discount_amount"/>
-                <field name="remark"/>
-                <field name="multiplier" column_invisible="1"/>
-                <field name="is_invalid" optional="hide"/>
-                <field name="is_red" optional="hide"/>
-                <field name="red_date" optional="hide"/>
-                <field name="charge_status" optional="hide"/>
-                <field name="is_invoice" optional="hide"/>
-                <field name="is_suspend" optional="hide"/>
-                <field name="create_time"/>
-                <field name="last_update_time"/>
-            </tree>
-        </field>
-    </record>
-
     <record id="view_property_rent_list_action2" model="ir.actions.act_window">
-        <field name="name">租金列表</field>
+        <field name="name">应收账单</field>
         <field name="res_model">property.rent.list</field>
         <field name="view_mode">tree,search</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_property_rent_list_tree2')})]"/>
+        <field name="domain">[('is_push', '=', True)]</field>
+    </record>
+    <record id="all_button_push_property" model="ir.actions.server">
+        <field name="name">批量推送</field>
+        <field name="model_id" ref="yuthon_property.model_property_rent_list"/>
+        <field name="binding_model_id" ref="yuthon_property.model_property_rent_list"/>
+        <field name="state">code</field>
+        <field name="code">action = model.button_push()</field>
     </record>
 </odoo>
 

yuthon_property_approval/views/property_lease_contract.xml

@@ -18,7 +18,6 @@
             </tree>
         </field>
     </record>
-
     <record id="view_property_lease_contract_form" model="ir.ui.view">
         <field name="name">property.lease.contract.form</field>
         <field name="model">property.lease.contract</field>
@@ -738,4 +737,14 @@
         <field name="state">code</field>
         <field name="code">action = model.action_update_contract()</field>
     </record>
+    <record id="inherit_property_rent_list_tree" model="ir.ui.view">
+        <field name="name">property.lease.contract.tree</field>
+        <field name="model">property.rent.list</field>
+        <field name="inherit_id" ref="yuthon_property.view_property_rent_list_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='property_id']" position="before">
+                    <field name="contract_id" string="合同"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>