!2841 !2840 添加功能

Merge pull request !2841 from 李鹏宇/dev

soong_workflow/views/menuitem.xml

@@ -21,20 +21,20 @@
                   parent="menu_soong_workflow_root"
                   action="soong_workflow_other_record_action"
                   sequence="4"/>
-        <menuitem id="menu_workflow_approval_request_copy"
-                  name="抄送/传阅流程"
-                  parent="menu_soong_workflow_root"
-                  action="soong_workflow_record_action_copy"
-                  sequence="5"/>
-        <menuitem id="menu_workflow_approval_request_admin"
-                  name="流程监控"
-                  parent="menu_soong_workflow_root"
-                  action="soong_workflow_record_action_admin"
-                  sequence="11"/>
         <menuitem id="menu_soong_workflow_hr_employee"
                   name="人力资源流程"
                   parent="menu_soong_workflow_root"
                   action="soong_workflow_hr_employee_action"
+                  sequence="5"/>
+        <menuitem id="menu_workflow_approval_request_copy"
+                  name="抄送/传阅流程"
+                  parent="menu_soong_workflow_root"
+                  action="soong_workflow_record_action_copy"
+                  sequence="8"/>
+        <menuitem id="menu_workflow_approval_request_admin"
+                  name="流程监控"
+                  parent="menu_soong_workflow_root"
+                  action="soong_workflow_record_action_admin"
                   sequence="11"/>
         <menuitem id="menu_soong_workflow_entrust"
                   sequence="13"

soong_workflow/views/soong_workflow_record.xml

@@ -120,7 +120,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,kanban,search</field>
-            <field name="domain">[('reclaim_state', '=', False), ('approvals_group_id.name', '=', '人力资源')]</field>
+            <field name="domain">[('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'), ('approvals_group_id.name', '=', '考勤')]</field>
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
         <record id="soong_workflow_other_record_action" model="ir.actions.act_window">
@@ -128,7 +128,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,kanban,search</field>
-            <field name="domain">[('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源')]</field>
+            <field name="domain">[('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源'), ('approvals_group_id.name', '!=', '考勤')]</field>
+            <field name="context">{'search_default_my_department_shifts': True,}</field>
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
         <record id="soong_workflow_record_action_admin" model="ir.actions.act_window">

yuthon_base/__init__.py

@@ -0,0 +1,2 @@
+
+from . import models

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,
+}
+
+

yuthon_base/models/__init__.py

@@ -0,0 +1 @@
+from . import inherit_ir_attachment

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)
+
+

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
+

yuthon_trade/views/yuthon_trade_menu.xml

@@ -23,11 +23,6 @@
               parent="executive_manage_approval"
               action="action_yuthon_trade_pay"
               sequence="19"/>
-    <menuitem id="executive_trade_policy"
-              name="保单列表"
-              parent="executive_manage_approval"
-              action="view_yuthon_insurance_policy_action"
-              sequence="21"/>
     <menuitem id="executive_trade_purchase"
               name="采购"
               parent="executive_manage_approval"
@@ -168,4 +163,9 @@
               parent="executive_trade_setting"
               action="view_project_funding_setting_action"
               sequence="90"/>
+     <menuitem id="executive_trade_policy"
+              name="保单"
+              parent="executive_trade_setting"
+              action="view_yuthon_insurance_policy_action"
+              sequence="95"/>
 </odoo>