diff --git a/jikimo_account_process/__manifest__.py b/jikimo_account_process/__manifest__.py index 0c1b521c..637e74b0 100644 --- a/jikimo_account_process/__manifest__.py +++ b/jikimo_account_process/__manifest__.py @@ -20,7 +20,7 @@ 'version': '0.1', # any module necessary for this one to work correctly - 'depends': ['base', 'account'], + 'depends': ['base', 'account', 'l10n_cn'], # always loaded 'data': [ diff --git a/jikimo_account_process/models/account_move.py b/jikimo_account_process/models/account_move.py index e85d4e16..94242570 100644 --- a/jikimo_account_process/models/account_move.py +++ b/jikimo_account_process/models/account_move.py @@ -1,4 +1,4 @@ -from odoo import models, fields, api +from odoo import models, fields, api, _ from odoo.exceptions import ValidationError @@ -7,6 +7,14 @@ class CustomAccountMoveLine(models.Model): _inherit = 'account.move' _description = "account move line" + fapiao = fields.Char(string='发票号', size=20, copy=False, tracking=True, required=True) + + @api.constrains('fapiao') + def _check_fapiao(self): + for record in self: + if record.fapiao and (len(record.fapiao) != 20 or not record.fapiao.isdecimal()): + raise ValidationError(_("Fapiao number is an 20-digit number. Please enter a correct one.")) + @api.model_create_multi def create(self, vals): for val in vals: diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py index 80fe2f46..272a3e8a 100644 --- a/sf_quality/models/quality.py +++ b/sf_quality/models/quality.py @@ -86,15 +86,14 @@ class QualityCheck(models.Model): raise ValidationError('请重新选择【判定结果】-【检测结果】') if self.workorder_id.routing_type != 'CNC加工' and self.workorder_id.individuation_page_PTD is False: self.workorder_id.production_id.write({'detection_result_ids': [(0, 0, { - 'rework_reason': self.workorder_id.reason, - 'detailed_reason': self.workorder_id.detailed_reason, + 'rework_reason': self.reason, + 'detailed_reason': self.detailed_reason, 'processing_panel': self.workorder_id.processing_panel, 'routing_type': self.workorder_id.routing_type, - 'handle_result': '待处理' if (self.workorder_id.test_results in ['返工', '报废'] - or self.workorder_id.is_rework is True) else '', - 'test_results': self.workorder_id.test_results, + 'handle_result': '待处理', + 'test_results': self.test_results, 'test_report': self.workorder_id.detection_report})], - 'is_scrap': True if self.workorder_id.test_results == '报废' else False + 'is_scrap': True if self.test_results == '报废' else False }) if self.workorder_id.state not in ['done']: self.workorder_id.write(