diff --git a/sh_backmate_theme_adv_enterprise/controllers/home.py b/sh_backmate_theme_adv_enterprise/controllers/home.py
index 4af9a6013..48fc97fd9 100644
--- a/sh_backmate_theme_adv_enterprise/controllers/home.py
+++ b/sh_backmate_theme_adv_enterprise/controllers/home.py
@@ -23,9 +23,7 @@ MENU_BADGE_MODEL_FUNC_ENUM = {
'yuthon_property.yuthon_property_tariff_list': {'model': 'property.tariff.list', 'func': 'get_no_read_count'},
'yuthon_property.yuthon_property_water_list': {'model': 'property.water.list', 'func': 'get_no_read_count'},
'yuthon_property.yuthon_property_deposit_list': {'model': 'property.deposit.list', 'func': 'get_no_read_count'},
- 'soong_workflow.menu_workflow_approval_request_my': {'model': 'soong.workflow.record', 'func': 'get_no_read_count'},
- 'soong_workflow.menu_workflow_approval_request_my_start': {'model': 'soong.workflow.record', 'func': 'get_start_read_count'},
- 'soong_workflow.menu_workflow_approval_request_my_pending_to_do': {'model': 'soong.workflow.record', 'func': 'get_pending_read_count'},
+ 'soong_workflow.menu_workflow_approval_request_my_start': {'model': 'soong.workflow.record', 'func': 'get_no_read_count'},
'soong_workflow.menu_workflow_approval_request_copy': {'model': 'soong.workflow.record.copy', 'func': 'get_no_read_count'},
'yuthon_will_task.menu_yuthon_will_task_root': {'model': 'yuthon.will.task', 'func': 'read_number'},
'issue_library.yuthon_library_my_menu': {'model': 'issue.library', 'func': 'read_number'},
diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 57669311d..43cc642ce 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -15,24 +15,8 @@ class SoongWorkflowRecord(models.Model):
def get_no_read_count(self):
domain = [
- ('soong_state', '=', 'to_do'),
- ('users_ids', 'in', self.env.user.id),
- ('reclaim_state', '=', False)
- ]
- return self.search_count(domain)
-
- def get_start_read_count(self):
- domain = [
- ('approve_state', '=', 'start'),
- ('users_ids', 'in', self.env.user.id),
- ('reclaim_state', '=', False)
- ]
- return self.search_count(domain)
-
- def get_pending_read_count(self):
- domain = [
- ('soong_state', '=', 'to_do'),
('approve_state', '=', 'pending'),
+ ('soong_state', '=', 'to_do'),
('users_ids', 'in', self.env.user.id),
('reclaim_state', '=', False)
]
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index df1e5c272..c8a243504 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -17,8 +17,15 @@
-
+
+
+
+
+
+
+
+
@@ -120,40 +127,13 @@
-
- 草稿
+
+ 我的流程
ir.actions.act_window
soong.workflow.record
tree,kanban,search
- {'check_employee': 1, 'group_by': 'soong_state'}
- [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]
-
-
-
- 待办
- ir.actions.act_window
- soong.workflow.record
- tree,kanban,search
- {'check_employee': 1, 'group_by': 'soong_state'}
- [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('soong_state', '=', 'to_do')]
-
-
-
- 已办
- ir.actions.act_window
- soong.workflow.record
- tree,kanban,search
- {'check_employee': 1, 'group_by': 'soong_state'}
- [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('soong_state', '=', 'done')]
-
-
-
- 结束
- ir.actions.act_window
- soong.workflow.record
- tree,kanban,search
- {'check_employee': 1, 'group_by': 'soong_state'}
- [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')]
+ {'check_employee': 1}
+ [('users_ids', 'in', uid), ('reclaim_state', '=', False)]
diff --git a/yuthon_purchase/models/purchase_workflow.py b/yuthon_purchase/models/purchase_workflow.py
index f6545ed94..cfc889a2f 100644
--- a/yuthon_purchase/models/purchase_workflow.py
+++ b/yuthon_purchase/models/purchase_workflow.py
@@ -197,9 +197,13 @@ class PurchaseServiceLine(models.Model):
class PurchaseFixedAssets(models.Model):
_name = 'purchase.fixed.assets'
+ name = fields.Char(string="名称")
+
class PurchaseServiceOrders(models.Model):
_name = 'purchase.service.orders'
+ name = fields.Char(string="名称")
+
class PurchaseLowOrders(models.Model):
_name = 'purchase.low.orders'
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 92f4e0a60..8f75b9b0c 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -617,45 +617,27 @@
name="我的"
web_icon="yuthon_work_brand,static/description/holiday.png"
sequence="3"/>
-
-
-
-
+
+ sequence="5"/>
+ sequence='10'/>