!1086 1

Merge pull request !1086 from 李鹏宇/dev

yuthon_property_approval/models/property_lease_contract.py

@@ -45,11 +45,11 @@ class PropertyLeaseContract(models.Model):
     phone = fields.Char(related='lessee_id.phone', string="联系电话")
     email = fields.Char(related='lessee_id.email', string="电子邮箱")
     invoicing_type = fields.Selection([('spot', '专票'), ('cape', '普票')], related='lessee_id.invoicing_type', string="开票类型")
-    rental_purposes = fields.Many2one(related='lessee_id.rental_purposes', string="出租用途")
+    rental_purposes = fields.Many2one('yuthon.rental.purpose', string="出租用途")
     invoicing_begins = fields.Char(related='lessee_id.invoicing_begins', string="开票抬头")
     tax_number = fields.Char(related='lessee_id.tax_number', string="税号")
     industry = fields.Char(related='lessee_id.industry', string="行业")
-    address_for_delivery = fields.Text(related='lessee_id.address',string="送达地址")
+    address_for_delivery = fields.Text(string="送达地址")
 
     lease_term = fields.Float(string="租期")
     lease_term_year = fields.Integer(string="租期(年)")

yuthon_property_approval/views/property_lease_contract.xml

@@ -106,7 +106,7 @@
                             </group>
                         </page>
                     </notebook>
-                    <group col="3" string="承租方个人信息">
+                    <group col="2" string="承租方个人信息">
                         <group>
                             <field name="contact" required="1"/>
                             <field name="phone" required="1"/>
@@ -114,12 +114,8 @@
                         </group>
                         <group>
                             <field name="invoicing_type" required="1"/>
-                            <field name="rental_purposes" required="1"/>
                             <field name="invoicing_begins" required="1"/>
-                        </group>
-                        <group>
                             <field name="industry" required="1"/>
-                            <field name="address_for_delivery" required="1"/>
                         </group>
                     </group>
                     <group>
@@ -148,6 +144,8 @@
                             <field name="date_payment_date" required="1"/>
                             <field name="total_area"/>
                             <field name="expected_reminders" required="1"/>
+                            <field name="rental_purposes" required="1"/>
+                            <field name="address_for_delivery" required="1"/>
                         </group>
                     </group>
                     <group col="2" string="收费详细">