diff --git a/yuthon_property/models/property_meter_reading.py b/yuthon_property/models/property_meter_reading.py
index d71640ae2..e6b4392cb 100644
--- a/yuthon_property/models/property_meter_reading.py
+++ b/yuthon_property/models/property_meter_reading.py
@@ -6,13 +6,14 @@ class PropertyMeterReading(models.Model):
_description = '抄表'
code = fields.Char(string='仪表编号')
- position = fields.Char(string='位置')
+ position = fields.Char(string='单元编号')
property_id = fields.Many2one('yuthon.property', string='物业')
contract = fields.Char(string='合同')
- customer = fields.Char(string='客户')
+ customer_id = fields.Many2one('property.tenant.information', string='承租方')
state = fields.Char(string='状态')
meter_type = fields.Selection([('electric', '电表'), ('water', '水表')], string='仪表类型')
payment_account = fields.Selection([('prepaid', '电费'), ('postpaid', '水费')], string='缴费科目')
+ other = fields.Char(string='其他')
billing_period = fields.Date(string='账期')
meter_date= fields.Date(string='抄表年月')
last_meter = fields.Date(string='上次抄表')
@@ -23,3 +24,4 @@ class PropertyMeterReading(models.Model):
amount_wastage = fields.Float(string='损耗量')
dosage = fields.Float(string='本次用量')
generate_charges = fields.Float(string='生成费用')
+ type = fields.Selection([('public', '公共'), ('fees', '收费')], string='类型')
\ No newline at end of file
diff --git a/yuthon_property/models/property_tenant_information.py b/yuthon_property/models/property_tenant_information.py
index 5e9ddc650..67d5442c6 100644
--- a/yuthon_property/models/property_tenant_information.py
+++ b/yuthon_property/models/property_tenant_information.py
@@ -7,13 +7,25 @@ class PropertyTenantInformation(models.Model):
name = fields.Char(string='姓名')
guarantor = fields.Char(string='担保人')
- entity_type = fields.Selection([('person', '个人'), ('company', '企业')], string='实体类型')
+ entity_type = fields.Selection([('person', '个人'), ('company', '企业')], string='承租方类型')
contact = fields.Char(string='联系人')
+ legal = fields.Char(string='法人')
phone = fields.Char(string='联系电话')
+ home_phone = fields.Char(string='座机')
email = fields.Char(string='电子邮箱')
address = fields.Text(string='送达地址')
+ scope_business = fields.Char(string='经营范围')
invoicing_type = fields.Selection([('spot', '专票'), ('cape', '普票')], string="开票类型")
rental_purposes = fields.Many2one('yuthon.rental.purpose', string="出租用途")
invoicing_begins = fields.Char(string="开票抬头")
tax_number = fields.Char(string="税号")
+ card = fields.Char(string="身份号")
industry = fields.Char(string="行业")
+ start_date = fields.Date(string="生效日期")
+ end_date = fields.Date(string="失效日期")
+ id_card_id = fields.Many2one('ir.attachment', string='法人身份证')
+ business_license_id = fields.Many2one('ir.attachment', string='营业执照')
+ power_attorney_id = fields.Many2one('ir.attachment', string='委托代理书')
+ attorne_card_id = fields.Many2one('ir.attachment', string='委托代理人身份证')
+
+
diff --git a/yuthon_property/views/property_meter_reading_views.xml b/yuthon_property/views/property_meter_reading_views.xml
index 9624c6fd0..917fdc914 100644
--- a/yuthon_property/views/property_meter_reading_views.xml
+++ b/yuthon_property/views/property_meter_reading_views.xml
@@ -7,22 +7,24 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
@@ -38,8 +40,9 @@
-
+
+
@@ -53,6 +56,7 @@
+
diff --git a/yuthon_property/views/property_tenant_information_views.xml b/yuthon_property/views/property_tenant_information_views.xml
index c85321d07..d243fa2e2 100644
--- a/yuthon_property/views/property_tenant_information_views.xml
+++ b/yuthon_property/views/property_tenant_information_views.xml
@@ -27,18 +27,29 @@
+
+
+
+
+
+
+
+
+
+
+