1

.gitignore

@@ -26,6 +26,7 @@ share/python-wheels/
 ./.idea
 .idea
 .idea/*
+.pyc
 *.pyc
 .DS_STORE
 .vscode

yuthon_property/views/property_meter_archives_views.xml

@@ -88,7 +88,8 @@
         <field name="model">meter.archives.line</field>
         <field name="arch" type="xml">
             <tree string="电表任务" create="False" editable="bottom" js_class="custom_meter_button" decoration-success="not current_read" >
-                 <field name="sequence" column_invisible="1"/>
+                <field name="archives_id" string="电表名"/>
+                <field name="sequence" column_invisible="1"/>
                 <field name="number" column_invisible="1"/>
                 <field name="epitope_values_id" domain="[('type', '=', 'ammeter')]"/>
                 <field name="unit_number"/>

yuthon_property/views/property_meter_water_views.xml

@@ -10,6 +10,7 @@
                     <button class="oe_highlight" name="button_water_state" string="停用" type="object"/>
                     <button class="oe_highlight" name="update_epitope_values" string="更新" type="object"/>
                 </header>
+                <field name="water_id" string="水表名"/>
                 <field name="sequence1"/>
                 <field name="number" column_invisible="1"/>
                 <field name="name" required="1"/>

yuthon_property/wizard/electric_water_wizard.py

@@ -47,7 +47,7 @@ class ElectricWaterWizard(models.TransientModel):
                 # 查找上个月的记录，上次用量，上次读数，上次抄表日期
                 last_month_line = water.line_ids.search([('meter_date', '<', self.push_date)]).sorted('meter_date')[-1]
                 # 如果当前数据不存在，则新建任务，按照天的纬度
-                self_month_line = water.line_ids.search([('meter_date', '=', self.push_date)])
+                self_month_line = water.line_ids.search([('meter_date', '=', self.push_date), ('water_id', '=', water.id)])
                 if not self_month_line:
                     water.line_ids.create({
                         'water_id': water.id,
@@ -55,7 +55,6 @@ class ElectricWaterWizard(models.TransientModel):
                         'last_read': last_month_line.last_read,
                         'last_dosage': last_month_line.last_dosage,
                         'meter_date': self.push_date,
-
                         'epitope_values_id': water.epitope_values_id.id,
                         'lessee_id': water.lessee_id.id,
                         'yuthon_property_ids': [(6, 0, water.yuthon_property_ids.ids)],

yuthon_salary/models/inherit_hr_payslip.py

@@ -397,7 +397,7 @@ class InheritHrPayslip(models.Model):
         employee_id = self.env['hr.employee'].search([('id', '=', vals['employee_id'])])
         payroll = self.env['hr.contract'].search([('employee_id', '=', employee_id.id), ('state', '=', 'open')])[-1].structure_type_id.default_struct_id
         if payroll.rule_ids.search([('name', '=', '基本工资'), ('struct_id', '=', payroll.id)]):
-            base_salary = payroll.rule_ids.search([('name', '=', '基本工资'), ('struct_id', '=', payroll.id)]).amount_fix
+            base_salary = payroll.rule_ids.search([('name', '=', '基本工资'), ('struct_id', '=', payroll.id)])[-1].amount_fix
         # if record.worked_days_line_ids.search([('name', '=', '工会会费')]):
         #     record.line_ids.search([('name', '=', '工会会费')]).total = round(abs(base_salary * 0.005) * -1, 2)
             record.write({'union_dues': round(abs(base_salary * 0.005) * -1, 2)})