From e05c05bcf54619b8cb14e436d0cba8d38b742af5 Mon Sep 17 00:00:00 2001 From: Chakhrit Meeying Date: Fri, 27 Nov 2020 09:01:55 +0700 Subject: [PATCH 1/2] #5064_Search_employee_boss_view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Config : ให้ search employee ในหน้า Boss View Module : pabi_workflow issues : https://mobileapp.nstda.or.th/redmine/issues/5064 --- pabi_workflow/views/wkf_config_boss_view.xml | 687 ++++++++++--------- 1 file changed, 344 insertions(+), 343 deletions(-) diff --git a/pabi_workflow/views/wkf_config_boss_view.xml b/pabi_workflow/views/wkf_config_boss_view.xml index 14d4537cf..86a6402ef 100755 --- a/pabi_workflow/views/wkf_config_boss_view.xml +++ b/pabi_workflow/views/wkf_config_boss_view.xml @@ -1,343 +1,344 @@ - - - - # Boss View - - tree.pb2.boss.view - pb2.boss.view - - - - - - - - - - - - - - - - - - - search.pb2.boss.view - pb2.boss.view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Boss View - pb2.boss.view - form - tree - {'search_default_doc_type_ex': 1, - 'search_default_group_by_doc_type': 1, - 'search_default_group_by_section_id': 1} - - - - - # TOP Work Flow Configuration Menu - - - - # Boss Level Approval - - view.wkf.cmd.boss.level.approval.tree - wkf.cmd.boss.level.approval - - - - - - - - - - - - - view.wkf.cmd.boss.level.approval.form - wkf.cmd.boss.level.approval - -
- - - - - - - - - - -
-
-
- - - view.wkf.cmd.boss.level.approval.search - wkf.cmd.boss.level.approval - - - - - - - - - - - - - - - - - - - Boss Level Approval - wkf.cmd.boss.level.approval - form - - - - - - # Boss Level Approval History - - view.wkf.cmd.boss.level.approval.history.tree - wkf.cmd.boss.level.approval.history - - - - - - - - - - - - - - - - - - - - - - - view.wkf.cmd.boss.level.approval.history.search - wkf.cmd.boss.level.approval.history - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Boss Level History - wkf.cmd.boss.level.approval.history - form - tree - - - - - - - #Boss Special Level Approval - - view.wkf.cmd.boss.special.level.tree - wkf.cmd.boss.special.level - - - - - - - - - - - view.wkf.cmd.boss.special.level.form - wkf.cmd.boss.special.level - -
- - - - - - - - -
-
-
- - - Special Level - wkf.cmd.boss.special.level - form - - - - - - - # Special Flow Emotion - # If a section is setting up for special level, all level under this level - # will be forced to be in the workflow too. - - view.special.emotion.flow.tree - res.org - - - - - - - - - - - view.special.emotion.flow.form - res.org - -
- -

- - -

- - - - - - - -
- Note: -

- All user in level below will be forced to participate in workflow, - even emotional activity amount exceed their normal approval limit. -

-

- For example, if you select "L7" here (given, limit for L7=1,000,000.00, L4=500,000.00, L3=250,000.00). -
- For requested emotional activities amount 750,000.00, although exceeded L3 and L4 limits, - all of them (L3, L4, L7) will forced to participate in the workflow. -

-
-
-
-
- - - Special Emotion Flow - res.org - form - tree,form - {} - - - - - tree - - - - - - - form - - - - - - - -
-
+ + + + # Boss View + + tree.pb2.boss.view + pb2.boss.view + + + + + + + + + + + + + + + + + + + search.pb2.boss.view + pb2.boss.view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Boss View + pb2.boss.view + form + tree + {'search_default_doc_type_ex': 1, + 'search_default_group_by_doc_type': 1, + 'search_default_group_by_section_id': 1} + + + + + # TOP Work Flow Configuration Menu + + + + # Boss Level Approval + + view.wkf.cmd.boss.level.approval.tree + wkf.cmd.boss.level.approval + + + + + + + + + + + + + view.wkf.cmd.boss.level.approval.form + wkf.cmd.boss.level.approval + +
+ + + + + + + + + + +
+
+
+ + + view.wkf.cmd.boss.level.approval.search + wkf.cmd.boss.level.approval + + + + + + + + + + + + + + + + + + + Boss Level Approval + wkf.cmd.boss.level.approval + form + + + + + + # Boss Level Approval History + + view.wkf.cmd.boss.level.approval.history.tree + wkf.cmd.boss.level.approval.history + + + + + + + + + + + + + + + + + + + + + + + view.wkf.cmd.boss.level.approval.history.search + wkf.cmd.boss.level.approval.history + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Boss Level History + wkf.cmd.boss.level.approval.history + form + tree + + + + + + + #Boss Special Level Approval + + view.wkf.cmd.boss.special.level.tree + wkf.cmd.boss.special.level + + + + + + + + + + + view.wkf.cmd.boss.special.level.form + wkf.cmd.boss.special.level + +
+ + + + + + + + +
+
+
+ + + Special Level + wkf.cmd.boss.special.level + form + + + + + + + # Special Flow Emotion + # If a section is setting up for special level, all level under this level + # will be forced to be in the workflow too. + + view.special.emotion.flow.tree + res.org + + + + + + + + + + + view.special.emotion.flow.form + res.org + +
+ +

+ + +

+ + + + + + + +
+ Note: +

+ All user in level below will be forced to participate in workflow, + even emotional activity amount exceed their normal approval limit. +

+

+ For example, if you select "L7" here (given, limit for L7=1,000,000.00, L4=500,000.00, L3=250,000.00). +
+ For requested emotional activities amount 750,000.00, although exceeded L3 and L4 limits, + all of them (L3, L4, L7) will forced to participate in the workflow. +

+
+
+
+
+ + + Special Emotion Flow + res.org + form + tree,form + {} + + + + + tree + + + + + + + form + + + + + + + +
+
From 95c7783d4da4c065971bf6267786815b71eeb120 Mon Sep 17 00:00:00 2001 From: Chakhrit Meeying Date: Tue, 1 Dec 2020 16:35:12 +0700 Subject: [PATCH 2/2] #5064_Search_employee_boss_view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Config : แก้ไข search ชื่อ และ เพิ่ม search section,Org Module : pabi_workflow issues : https://mobileapp.nstda.or.th/redmine/issues/5064 --- pabi_workflow/views/wkf_config_boss_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pabi_workflow/views/wkf_config_boss_view.xml b/pabi_workflow/views/wkf_config_boss_view.xml index 86a6402ef..e98d19ae6 100755 --- a/pabi_workflow/views/wkf_config_boss_view.xml +++ b/pabi_workflow/views/wkf_config_boss_view.xml @@ -26,8 +26,9 @@ search.pb2.boss.view pb2.boss.view - - + + +