1
This commit is contained in:
@@ -199,7 +199,7 @@ class MeterWaterLine(models.Model):
|
||||
:return:
|
||||
"""
|
||||
for i in self:
|
||||
last_id = self.env['meter.archives.line'].search(
|
||||
last_id = self.env['meter.water.line'].search(
|
||||
[('meter_date', '<', i.meter_date), ('water_id', '=', i.water_id.id)]).sorted('meter_date')
|
||||
if last_id:
|
||||
i.last_dosage = last_id[-1].current_meter
|
||||
|
||||
@@ -115,6 +115,9 @@
|
||||
<field name="model">property.meter.archives</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="电表">
|
||||
<field name="name"/>
|
||||
<field name="epitope_values_id"/>
|
||||
|
||||
<field name="yuthon_property_ids"/>
|
||||
<field name="lessee_id"/>
|
||||
</search>
|
||||
@@ -127,6 +130,8 @@
|
||||
<search string="电表任务">
|
||||
<field name="yuthon_property_ids"/>
|
||||
<field name="lessee_id"/>
|
||||
<field name="archives_id"/>
|
||||
<field name="epitope_values_id"/>
|
||||
<group expand="0" string="Group By">
|
||||
<filter string="按月" name="group_by_meter_date_month" domain="[]" context="{'group_by': 'meter_date:month'}"/>
|
||||
</group>
|
||||
@@ -147,7 +152,7 @@
|
||||
<field name="view_mode">tree,search</field>
|
||||
<field name="context">{'search_default_group_by_meter_date_month': True, 'search_default_group_by_name': True}</field>
|
||||
<field name="search_view_id" ref="yuthon_property.meter_archives_line_search"/>
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_meter_archives_line_tree')})]"/>
|
||||
</record>
|
||||
<record id="all_data_meter_property" model="ir.actions.server">
|
||||
|
||||
@@ -116,7 +116,8 @@
|
||||
<field name="model">property.meter.water</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="水表">
|
||||
<field name="name"/>
|
||||
<field name="water_id"/>
|
||||
<field name="epitope_values_id"/>
|
||||
<field name="yuthon_property_ids"/>
|
||||
<field name="lessee_id"/>
|
||||
</search>
|
||||
@@ -127,6 +128,8 @@
|
||||
<field name="model">meter.water.line</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="水表">
|
||||
<field name="name"/>
|
||||
<field name="epitope_values_id"/>
|
||||
<field name="yuthon_property_ids"/>
|
||||
<field name="lessee_id"/>
|
||||
<group expand="0" string="Group By">
|
||||
|
||||
Reference in New Issue
Block a user