!4182 添加功能

Merge pull request !4182 from 李鹏宇/dev_zhou

yuthon_maintain/views/maintenance_equipment_views.xml

@@ -95,9 +95,10 @@
                         <attribute name="column_invisible">1</attribute>
                     </xpath>
                     <xpath expr="//tree/field[@name='technician_user_id']" position="attributes">
-                        <attribute name="string">员工</attribute>
+                        <attribute name="column_invisible">1</attribute>
                     </xpath>
                     <xpath expr="//tree/field[@name='technician_user_id']" position="after">
+                        <field name="employee_id" string="员工"/>
                         <field name="department_id1"/>
                     </xpath>
                     <xpath expr="//tree/field[@name='department_id']" position="attributes">

yuthon_property/views/property_bank_statements_views.xml

@@ -84,6 +84,7 @@
         <field name="name">对账</field>
         <field name="res_model">property.bank.statements</field>
         <field name="view_mode">tree,search</field>
+        <field name="domain">[('is_company', '=', True)]</field>
         <field name="domain">[('bank_state', '=', 'not_reconciled')]</field>
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_property_bank_statements_tree')})]"/>

yuthon_property_approval/wizard/choose_property_wizard.py

@@ -9,7 +9,6 @@ class ChoosePropertyWizard(models.Model):
 
     def confirm(self):
         rec = self.lease_contract_id
-        self.lease_contract_id.lease_ids.unlink()
         lease_name = []
         lease_ids_to_add = []
         fee_list = []
@@ -39,11 +38,13 @@ class ChoosePropertyWizard(models.Model):
             rec.admin_id = admin_id
             rec.company_id = company_id
             rec.precinct_id = precinct_id
-
-        self.lease_contract_id.lease_ids = lease_ids_to_add
-        self.lease_contract_id.write({'name': ','.join(lease_name),
-                                      'use_address': ','.join(lease_name),
-                                      'address_for_delivery': ','.join(lease_name),
+        existing_names = [lease.address_id.name for lease in self.lease_contract_id.lease_ids if lease.address_id]
+        all_names = list(set(existing_names + lease_name))  # 去重
+        existing_lease_ids = [(4, lease.id) for lease in self.lease_contract_id.lease_ids]
+        self.lease_contract_id.lease_ids = existing_lease_ids + lease_ids_to_add
+        self.lease_contract_id.write({'name': ','.join(all_names),
+                                      'use_address': ','.join(all_names),
+                                      'address_for_delivery': ','.join(all_names),
                                       'total_area': sum([lease.property_area for lease in rec.lease_ids])})