diff --git a/yuthon_official/models/officical_type.py b/yuthon_official/models/officical_type.py index 48741d23a..02625d9db 100644 --- a/yuthon_official/models/officical_type.py +++ b/yuthon_official/models/officical_type.py @@ -10,3 +10,9 @@ class OfficialType(models.Model): name = fields.Char(string="公文类型") note = fields.Char(string="说明") + +class MainFlats(models.Model): + _name = 'main.flats' + _description = '主送单位' + + name = fields.Char(string="主送单位") \ No newline at end of file diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py index bbde74317..b7bff514c 100644 --- a/yuthon_official/models/yuthon_official.py +++ b/yuthon_official/models/yuthon_official.py @@ -21,7 +21,7 @@ class YuthonOfficial(models.Model): main_text = fields.Text(string='文件内容') come_file_id = fields.Char(string="来文编号") incoming_file_id = fields.Char(string="收文编号") - main_flats = fields.Char(string="主送单位") + main_flats_id = fields.Many2one('main.flats', string="主送单位") copy_flats = fields.Char(string="抄送单位") department_ids = fields.Many2many('hr.department', string='部门范围') employee_ids = fields.Many2many('hr.employee', string='人员范围') diff --git a/yuthon_official/security/ir.model.access.csv b/yuthon_official/security/ir.model.access.csv index a03c2f03e..1c2ffe2a5 100644 --- a/yuthon_official/security/ir.model.access.csv +++ b/yuthon_official/security/ir.model.access.csv @@ -8,4 +8,5 @@ access_yuthon_official_incoming_party,yuthon_official_incoming_party,model_yutho access_yuthon_official_incoming_labor,yuthon_official_incoming_labor,model_yuthon_official_incoming_labor,base.group_user,1,1,1,1 access_yuthon_official_incoming_normal,yuthon_official_incoming_normal,model_yuthon_official_incoming_normal,base.group_user,1,1,1,1 access_yuthon_cross_departmental, yuthon_cross_departmental,model_yuthon_cross_departmental,base.group_user,1,1,1,1 -access_yuthon_file_processing,yuthon_file_processing,model_yuthon_file_processing,base.group_user,1,1,1,1 \ No newline at end of file +access_yuthon_file_processing,yuthon_file_processing,model_yuthon_file_processing,base.group_user,1,1,1,1 +access_main_flats,main_flats,model_main_flats,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_labor_views.xml b/yuthon_official/views/yuthon_official_labor_views.xml index c4a5fc242..39ed81d48 100644 --- a/yuthon_official/views/yuthon_official_labor_views.xml +++ b/yuthon_official/views/yuthon_official_labor_views.xml @@ -58,7 +58,7 @@ - + diff --git a/yuthon_official/views/yuthon_official_party_views.xml b/yuthon_official/views/yuthon_official_party_views.xml index 11bc97dbb..44c18fce0 100644 --- a/yuthon_official/views/yuthon_official_party_views.xml +++ b/yuthon_official/views/yuthon_official_party_views.xml @@ -66,7 +66,7 @@ - + diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml index 7767d4ac4..37cdfbd2b 100644 --- a/yuthon_official/views/yuthon_official_views.xml +++ b/yuthon_official/views/yuthon_official_views.xml @@ -65,10 +65,11 @@ - + + diff --git a/yuthon_property_approval/__manifest__.py b/yuthon_property_approval/__manifest__.py index 0b26e2e65..8efd0ff7b 100644 --- a/yuthon_property_approval/__manifest__.py +++ b/yuthon_property_approval/__manifest__.py @@ -111,7 +111,7 @@ ], }, 'demo': [], - 'depends': ['mail', 'soong_workflow', 'documents', 'yuthon_property', 'hr', 'yuthon_issue', 'base'], + 'depends': ['mail', 'soong_workflow', 'documents', 'yuthon_property', 'hr', 'yuthon_issue', 'base', 'yuthon_trade'], 'installable': True, 'application': True, } diff --git a/yuthon_trade/models/yuthon_trade_setting.py b/yuthon_trade/models/yuthon_trade_setting.py index fae5d5f3f..b9f4765eb 100644 --- a/yuthon_trade/models/yuthon_trade_setting.py +++ b/yuthon_trade/models/yuthon_trade_setting.py @@ -10,7 +10,7 @@ class YuthonCareSetting(models.Model): class YuthonInformationCategories(models.Model): _name = 'yuthon.information.categories' - _description = '信息分类' + _description = '业务类型' name = fields.Char(string='名称')