diff --git a/yuthon_property/models/yuthon_property_message.py b/yuthon_property/models/yuthon_property_message.py index 80a713314..4418c9943 100644 --- a/yuthon_property/models/yuthon_property_message.py +++ b/yuthon_property/models/yuthon_property_message.py @@ -5,8 +5,10 @@ from odoo.exceptions import UserError, ValidationError class YuthonPropertyMessage(models.Model): _name = 'yuthon.property.message' _description = '产权管理' + _order = 'sequence asc' name = fields.Char(string='产权地址') + sequence = fields.Char(string='序号') owner_id = fields.Many2one('yuthon.owner.message', string="权属人") title_certificate = fields.Char(string="产权证号", default="无产权") pooled_area = fields.Float(string="公摊面积", digits=(16, 4)) diff --git a/yuthon_property/views/property_management_list_views.xml b/yuthon_property/views/property_management_list_views.xml index a27c7430d..7406ff3be 100644 --- a/yuthon_property/views/property_management_list_views.xml +++ b/yuthon_property/views/property_management_list_views.xml @@ -5,8 +5,8 @@ property.management.list - + diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml index 71790ab0c..b666f6581 100644 --- a/yuthon_property/views/property_meter_archives_views.xml +++ b/yuthon_property/views/property_meter_archives_views.xml @@ -88,22 +88,24 @@ meter.archives.line - - - - - + + - - - + + + + + + + + diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml index 01ae85e0e..57df40d27 100644 --- a/yuthon_property/views/property_meter_water_views.xml +++ b/yuthon_property/views/property_meter_water_views.xml @@ -92,20 +92,21 @@ + + + + + + + + - - - - - - - - + diff --git a/yuthon_property/views/property_rent_list_views.xml b/yuthon_property/views/property_rent_list_views.xml index fdce9825b..56d5f7c6a 100644 --- a/yuthon_property/views/property_rent_list_views.xml +++ b/yuthon_property/views/property_rent_list_views.xml @@ -5,18 +5,18 @@ property.rent.list + decoration-success="charge_status == 'fully_paid'" js_class="custom_rent_list_button" edit="false" delete="false" limit="15"> - + + - diff --git a/yuthon_property/views/yuthon_property_message_views.xml b/yuthon_property/views/yuthon_property_message_views.xml index 4a689d7c8..140f2274c 100644 --- a/yuthon_property/views/yuthon_property_message_views.xml +++ b/yuthon_property/views/yuthon_property_message_views.xml @@ -5,6 +5,7 @@ yuthon.property.message + diff --git a/yuthon_property/wizard/meter_price_wizard.py b/yuthon_property/wizard/meter_price_wizard.py index f3ff0c272..7669c1bb8 100644 --- a/yuthon_property/wizard/meter_price_wizard.py +++ b/yuthon_property/wizard/meter_price_wizard.py @@ -52,11 +52,12 @@ class MeterPriceWizard(models.TransientModel): 'meter_date': self.price_date, 'line_loss': self.line_loss }) - self.env['hydropower.logs'].create({ - 'meter_type': 'electric', - 'logs_date': self.price_date, - 'price': self.price, - 'line_loss': self.line_loss, - }) + + self.env['hydropower.logs'].create({ + 'meter_type': 'electric', + 'logs_date': self.price_date, + 'price': self.price, + 'line_loss': self.line_loss, + }) diff --git a/yuthon_property/wizard/water_price_wizard.py b/yuthon_property/wizard/water_price_wizard.py index 87f013a98..242e13cfb 100644 --- a/yuthon_property/wizard/water_price_wizard.py +++ b/yuthon_property/wizard/water_price_wizard.py @@ -52,12 +52,13 @@ class WaterPriceWizard(models.TransientModel): 'meter_date': self.price_date, 'line_loss': self.line_loss }) - self.env['hydropower.logs'].create({ - 'meter_type': 'water', - 'logs_date': self.price_date, - 'price': self.price, - 'line_loss': self.line_loss, - }) + + self.env['hydropower.logs'].create({ + 'meter_type': 'water', + 'logs_date': self.price_date, + 'price': self.price, + 'line_loss': self.line_loss, + }) diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index 4619ade2d..b9d0120eb 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -65,12 +65,12 @@