!1118 结束

Merge pull request !1118 from 李鹏宇/dev

yuthon_property_approval/models/property_lease_contract.py

@@ -643,17 +643,16 @@ class PropertyLeaseContract(models.Model):
                 'rent_list_ids': rent_list,
                 'management_list_ids':management_list,})
 
-
-
-
-    def action_copy_record(self):
-        for record in self:
-            vals = record.read()[0]
-            vals['state'] = 'new'
-            vals.pop('id', None)
-            new_record = self.create(vals)
-
-
+    def disposable_button(self):
+        property_ids = self.env["property.lease.contract"].browse(
+            self._context.get('active_ids', self._context.get('active_id')))
+        for record in property_ids:
+            admin_id = record.admin_id
+            user_id = record.users_id
+            if admin_id and user_id:
+                record.write({
+                    'admin_id': user_id.id,
+                    'users_id': admin_id.id,})
 
 class PropertyLeaseContractLine(models.Model):
     _name = 'property.lease.contract.line'

yuthon_property_approval/views/property_lease_contract.xml

@@ -55,7 +55,7 @@
                         <field name="rent_company" string="出租方"/>
                         <field name="company_id" invisible="1" required="1"/>
                         <field name="lessee_id" required="1"/>
-                        <field name="users_id" readonly="1" invisible="1"/>
+                        <field name="users_id" readonly="1"/>
                         <field name="department_id" invisible="1"/>
                         <field name="name" required="1"/>
                         <field name="use_address"/>
@@ -181,7 +181,7 @@
                             </div>
 <!--                            <field name="first_years_begin" required="1"/>-->
 <!--                            <field name="increments_every_few_years" required="1"/>-->
-                            <field name="admin_id" invisible="1"/>
+                            <field name="admin_id"/>
                             <field name="is_water" invisible="1"/>
                             <field name="is_electricity" invisible="1"/>
                             <field name="is_mange" invisible="1"/>
@@ -311,4 +311,11 @@
         <field name="state">code</field>
         <field name="code">action = model.action_use_address()</field>
     </record>
+     <record id="all_data_action_use_admin" model="ir.actions.server">
+        <field name="name">调换</field>
+        <field name="model_id" ref="yuthon_property_approval.model_property_lease_contract"/>
+        <field name="binding_model_id" ref="yuthon_property_approval.model_property_lease_contract"/>
+        <field name="state">code</field>
+        <field name="code">action = model.disposable_button()</field>
+    </record>
 </odoo>