diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index f4b11c6ce..77fbe58e4 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -21,20 +21,20 @@ parent="menu_soong_workflow_root" action="soong_workflow_other_record_action" sequence="4"/> - - + + ir.actions.act_window soong.workflow.record tree,kanban,search - [('reclaim_state', '=', False), ('approvals_group_id.name', '=', '人力资源')] + [('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'), ('approvals_group_id.name', '=', '考勤')] @@ -128,7 +128,8 @@ ir.actions.act_window soong.workflow.record tree,kanban,search - [('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源')] + [('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源'), ('approvals_group_id.name', '!=', '考勤')] + {'search_default_my_department_shifts': True,} diff --git a/yuthon_base/__init__.py b/yuthon_base/__init__.py new file mode 100644 index 000000000..24c19d687 --- /dev/null +++ b/yuthon_base/__init__.py @@ -0,0 +1,2 @@ + +from . import models \ No newline at end of file diff --git a/yuthon_base/__manifest__.py b/yuthon_base/__manifest__.py new file mode 100644 index 000000000..d1913e99f --- /dev/null +++ b/yuthon_base/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +{ + 'name': "yuthon base", + 'summary': "base", + 'description': """""", + 'author': 'zhou', + 'version': '0.1', + 'license': 'LGPL-3', + 'data': [ + 'security/ir.model.access.csv', + ], + 'demo': [], + 'depends': ['hr', 'mail', 'base', 'survey'], + 'installable': True, + 'application': True, +} + + diff --git a/yuthon_base/models/__init__.py b/yuthon_base/models/__init__.py new file mode 100644 index 000000000..c7116d815 --- /dev/null +++ b/yuthon_base/models/__init__.py @@ -0,0 +1 @@ +from . import inherit_ir_attachment \ No newline at end of file diff --git a/yuthon_base/models/inherit_ir_attachment.py b/yuthon_base/models/inherit_ir_attachment.py new file mode 100644 index 000000000..8f33c534b --- /dev/null +++ b/yuthon_base/models/inherit_ir_attachment.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from datetime import datetime, timedelta, time +from email.policy import default + +from odoo import models, fields, api, _ +from odoo.exceptions import UserError, ValidationError +import re +from odoo.tools.misc import format_date + + +class InheritIrAttachment(models.Model): + _inherit = 'ir.attachment' + + public = fields.Boolean(string='公共文档', default=True) + + diff --git a/yuthon_base/security/ir.model.access.csv b/yuthon_base/security/ir.model.access.csv new file mode 100644 index 000000000..08145a00f --- /dev/null +++ b/yuthon_base/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink + diff --git a/yuthon_trade/views/yuthon_trade_menu.xml b/yuthon_trade/views/yuthon_trade_menu.xml index ba734d7fc..dca6d6bc5 100644 --- a/yuthon_trade/views/yuthon_trade_menu.xml +++ b/yuthon_trade/views/yuthon_trade_menu.xml @@ -23,11 +23,6 @@ parent="executive_manage_approval" action="action_yuthon_trade_pay" sequence="19"/> - + \ No newline at end of file