diff --git a/soong_workflow/models/soong_note.py b/soong_workflow/models/soong_note.py index 9ef621c02..6c054c776 100644 --- a/soong_workflow/models/soong_note.py +++ b/soong_workflow/models/soong_note.py @@ -5,4 +5,16 @@ from odoo import api, fields, models, _ class SoongNote(models.Model): _name = 'soong.note' - name = fields.Char(string="常用审批意见") + name = fields.Char(string="审批意见") + + +class SoongRetuenNote(models.Model): + _name = 'soong.return.note' + + name = fields.Char(string="退回意见") + + +class SoongReturntType(models.Model): + _name = 'soong.return.type' + + name = fields.Char(string="退回类型") diff --git a/soong_workflow/models/soong_workflow.py b/soong_workflow/models/soong_workflow.py index 4822b184c..3c7f12186 100644 --- a/soong_workflow/models/soong_workflow.py +++ b/soong_workflow/models/soong_workflow.py @@ -45,9 +45,10 @@ class SoongWorkflow(models.Model): remove_default_attrs_mod = fields.Boolean(string="Remove Default Attributes & Modifiers", default=True, help="This option will remove default attributes set on fields & buttons of current model view in order to customized all attributes depending on your needs\nAttributes like: [required, readonly, invisible].") current_stage_highlight_color = fields.Char(default="rgb(0, 255, 255)", help="The color to highlight the current stage on flow",) - start_time = fields.Datetime(string="Start Time", copy=False) - end_time = fields.Datetime(string="End Time", copy=False) - is_enable = fields.Boolean(string="Enable", default="False", compute="compute_is_enable", store=True) + + start_time = fields.Datetime(string="生效日期", copy=False) + end_time = fields.Datetime(string="结束日期", copy=False) + is_enable = fields.Boolean(string="是否启用", default="False", compute="compute_is_enable", store=True) def copy(self, default=None): workflow_id = self.search([('model_id', '=', self.model_id.id)]) diff --git a/soong_workflow/security/ir.model.access.csv b/soong_workflow/security/ir.model.access.csv index 22fa7a293..e99db2b17 100644 --- a/soong_workflow/security/ir.model.access.csv +++ b/soong_workflow/security/ir.model.access.csv @@ -18,5 +18,7 @@ access_soong_workflow_record_user,soong_workflow_record_user,model_soong_workflo access_soong_user_role,soong_user_role,model_soong_user_role,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_approval_users,soong_approval_users,model_soong_approval_users,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_note,soong_note,model_soong_note,soong_workflow.group_soong_workflow_user,1,1,1,1 +access_soong_return_note,soong_return_note,model_soong_return_note,soong_workflow.group_soong_workflow_user,1,1,1,1 +access_soong_return_type,soong_return_type,model_soong_return_type,soong_workflow.group_soong_workflow_user,1,1,1,1 access_soong_approval_notice_wizard,soong_approval_notice_wizard,model_soong_approval_notice_wizard,base.group_user,1,1,1,1 diff --git a/soong_workflow/views/soong_note_views.xml b/soong_workflow/views/soong_note_views.xml index 7027795fe..9d8d3db3c 100644 --- a/soong_workflow/views/soong_note_views.xml +++ b/soong_workflow/views/soong_note_views.xml @@ -17,10 +17,60 @@ tree - + soong.return.type.tree + soong.return.type + + + + + + + + + 退回类型配置 + soong.return.type + tree + + + + soong.return.note.tree + soong.return.note + + + + + + + + + 退回意见配置 + soong.return.note + tree + + + + + + + + + diff --git a/yuthon_contract/__manifest__.py b/yuthon_contract/__manifest__.py index 1eef50253..0f4e88540 100644 --- a/yuthon_contract/__manifest__.py +++ b/yuthon_contract/__manifest__.py @@ -17,7 +17,7 @@ 'views/contract_menu_views.xml', 'views/inherit_hr_contract_views.xml', 'views/inherit_sale_order_views.xml', - 'views/inherit_res_partner.xml', + # 'views/inherit_res_partner.xml', ], 'installable': True, 'application': True, diff --git a/yuthon_hr_attendance/controllers/kaoqin_test.py b/yuthon_hr_attendance/controllers/kaoqin_test.py index 9bfb1d79c..c29565705 100644 --- a/yuthon_hr_attendance/controllers/kaoqin_test.py +++ b/yuthon_hr_attendance/controllers/kaoqin_test.py @@ -65,8 +65,7 @@ class BusController(Controller): # validity_period = datetime.strptime(data.get('validity_period'), '%Y-%m-%d').date() employee_id = request.env(user=SUPERUSER_ID)["hr.employee"].search([('name', '=', user_name)]) attendance_iot = request.env(user=SUPERUSER_ID)["attendance.iot.manager"] - if not attendance_iot.search( - [('employee_id', '=', employee_id.id), ('attendance_number', '=', data.get('sn'))]): + if not attendance_iot.search([('employee_id', '=', employee_id.id), ('attendance_number', '=', data.get('sn'))]): employee_id.write({ 'image_1920': data.get('photo'), }) diff --git a/yuthon_sale_renting/__manifest__.py b/yuthon_sale_renting/__manifest__.py index ba30b1dc5..d117dcbd6 100644 --- a/yuthon_sale_renting/__manifest__.py +++ b/yuthon_sale_renting/__manifest__.py @@ -10,12 +10,12 @@ 'category': 'Human Resources/Attendances', 'version': '0.1', 'license': 'LGPL-3', - 'depends': ['sale_renting', 'mail', 'documents', 'soong_workflow', 'contacts'], + 'depends': ['base', 'sale_renting', 'mail', 'documents', 'soong_workflow', 'contacts'], 'data': [ 'data/sale_renting_code_data.xml', 'security/ir.model.access.csv', - 'views/contacts_inherit_menu_views.xml', 'views/yuthon_res_partner_views.xml', + 'views/contacts_inherit_menu_views.xml', 'views/property_assess_views.xml', 'views/property_confirm_views.xml', 'views/property_move_views.xml', @@ -27,4 +27,3 @@ 'installable': True, 'application': True, } - diff --git a/yuthon_sale_renting/views/contacts_inherit_menu_views.xml b/yuthon_sale_renting/views/contacts_inherit_menu_views.xml index 4fae6f18a..7baa720a6 100644 --- a/yuthon_sale_renting/views/contacts_inherit_menu_views.xml +++ b/yuthon_sale_renting/views/contacts_inherit_menu_views.xml @@ -38,6 +38,7 @@ action="action_employee" parent="contacts.res_partner_menu_contacts" sequence="3"/> + - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yuthon_sale_renting/views/yuthon_res_partner_views.xml b/yuthon_sale_renting/views/yuthon_res_partner_views.xml index 046f7006c..37c874f2a 100644 --- a/yuthon_sale_renting/views/yuthon_res_partner_views.xml +++ b/yuthon_sale_renting/views/yuthon_res_partner_views.xml @@ -27,7 +27,7 @@ yuthon.res.partner.views.tree res.partner - +