diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py index 0d5b65f6c..0dd37d46a 100644 --- a/yuthon_hr_employee/wizard/hr_employee_wizard.py +++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py @@ -24,9 +24,9 @@ class YuthonHrEmployeeWizard(models.Model): raise ValidationError('请上传文件。') book = xlrd.open_workbook(file_contents=base64.decodebytes(self.excel_file)) sh = book.sheet_by_index(0) - for rx in range(2, sh.nrows): + for rx in range(1, sh.nrows): row = sh.row(rx) - self.update_year_salary(row) + self.update_bank_id(row) return { 'name': '批量更新员工', 'type': 'ir.actions.act_window', @@ -364,6 +364,21 @@ class YuthonHrEmployeeWizard(models.Model): } employee_id.write(employee_date) + def update_bank_id(self, row): + employee_id = self.env['hr.employee'].search([('name', '=', row[0].value)]) + bank_account_id = self.env['res.partner.bank'].search([('acc_number', '=', row[1].value)], limit=1) + res_id = self.env['res.partner'].search([('name', '=', row[0].value)]) + if not bank_account_id: + bank_account_id = self.env['res.partner.bank'].create({ + 'acc_number': row[1].value, + 'partner_id': res_id.id, + }) + if employee_id: + employee_date = { + 'bank_account_id': bank_account_id.id, + } + employee_id.write(employee_date) + diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 5d9438dde..c27217ee5 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -13,7 +13,7 @@ class PropertyMeterArchives(models.Model): is_state = fields.Boolean(string='是否启用') type = fields.Selection([('public', '公共'), ('fees', '收费')], string='类型') gauge_magnification = fields.Float(string='仪表倍率', default=1) - maximum_count = fields.Float(string='标准用量', default=999999) + maximum_count = fields.Integer(string='标准用量', default=999999) lessee_id = fields.Many2one(related='yuthon_property_id.lessee_id', string='承租方', store=True) employee_ids = fields.Many2many('hr.employee', string='抄表人') meter_type = fields.Selection([('electric', '电表'), ('water', '水表')], string='仪表类型') diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index 855b7af65..37fe05279 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -12,7 +12,7 @@ class PropertyMeterWater(models.Model): is_state = fields.Boolean(string='是否启用') type = fields.Selection([('public', '公共'), ('fees', '收费')], string='类型') gauge_magnification = fields.Float(string='仪表倍率', default=1) - maximum_count = fields.Float(string='标准用量', default=99999) + maximum_count = fields.Integer(string='标准用量', default=99999) lessee_id = fields.Many2one(related='yuthon_property_id.lessee_id', string='承租方', store=True) employee_ids = fields.Many2many('hr.employee', string='抄表人') meter_type = fields.Selection([('electric', '电表'), ('water', '水表')], string='仪表类型')