diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/docs/getting-started/modules.md b/docs/getting-started/modules.md
index a6391f0..3e3d9c2 100644
--- a/docs/getting-started/modules.md
+++ b/docs/getting-started/modules.md
@@ -18,21 +18,21 @@ SQL Payroll consists of 3 main modules:
| Module | Description |
| -------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
-| [**Maintain Allowance**](../usage/payroll/maintenance/maintain-allowance.md) | Define the allowance type, rate and contribution |
-| **Maintain Claims** | Define the claims type and amount |
-| [**Maintain Commission**](../usage/payroll/maintenance/maintain-commission.md) | Define the commission type, rate and contribution |
-| [**Maintain Contribution**](../usage/payroll/maintenance/maintain-contribution.md) | Enable to set Bonus, Director Fee, EPF, working hour/day per month, OT, etc. |
-| **Maintain Deduction** | Define the deduction type, rate and contribution |
-| [**Maintain Frequency**](../usage/payroll/maintenance/maintain-frequency.md) | Enable to set different frequency, eg. weekly, half month |
-| [**Maintain Overtime**](../usage/payroll/maintenance/maintain-overtime.md) | Define the overtime type, rate , unit type, and contribution |
-| [**Maintain Payment Method**](../usage/payroll/maintenance/maintain-payment-method.md) | Define the bank information |
-| [**Maintain Wages**](../usage/payroll/maintenance/maintain-wages.md) | Enable to set different contribution on Wages, such EPF, SOCSO, EIS, PCB, OT,EA and HRDF |
+| [**Maintain Allowance**](../usage/payroll/setup.md#maintain-allowance) | Define the allowance type, rate and contribution |
+| [**Maintain Claims**](../usage/payroll/setup.md#maintain-claim) | Define the claims type and amount |
+| [**Maintain Commission**](../usage/payroll/setup.md#maintain-commission) | Define the commission type, rate and contribution |
+| [**Maintain Contribution**](../usage/payroll/setup.md#maintain-contribution) | Enable to set Bonus, Director Fee, EPF, working hour/day per month, OT, etc. |
+| [**Maintain Deduction**](../usage/payroll/setup.md#maintain-deduction) | Define the deduction type, rate and contribution |
+| [**Maintain Frequency**](../usage/payroll/setup.md#maintain-frequency) | Enable to set different frequency, eg. weekly, half month |
+| [**Maintain Overtime**](../usage/payroll/setup.md#maintain-overtime) | Define the overtime type, rate , unit type, and contribution |
+| [**Maintain Payment Method**](../usage/payroll/setup.md#maintain-payment-method) | Define the bank information |
+| [**Maintain Wages**](../usage/payroll/setup.md#maintain-wages) | Enable to set different contribution on Wages, such EPF, SOCSO, EIS, PCB, OT,EA and HRDF |
## Other Basic modules
| Module | Description |
| --------------------------------------------------------------------- | -------------------------------------------------------------------- |
-| [**Maintain Employee**](../usage/human-resource/maintain-employee.md) | Help to maintain employees biodata |
+| [**Maintain Employee**](../usage/human-resource/human-resources-setup.md#maintain-employee) | Help to maintain employees biodata |
| **Maintain Branch** | Define the branch name, eg. HQ, branch A, B, C, etc |
| **Maintain Department** | Define the department, eg. Accounts, Sales, Production, etc |
| **Maintain Group** | Define the group level, eg. Director, Manager, Executive, Clerk, etc |
diff --git a/docs/integration/hrms/autostart.md b/docs/integration/hrms/autostart.md
index 701119d..1c09b80 100644
--- a/docs/integration/hrms/autostart.md
+++ b/docs/integration/hrms/autostart.md
@@ -8,8 +8,8 @@ description: A guide to enable Auto Start (Android only)
This setting only available on **Android** devices that supports Auto Start
:::
-**Step:** Search **'SQL HRMS'** | Allow Auto Start
-
+**Step:** Search **'SQL HRMS'** | Allow Auto Start
+
:::info
diff --git a/docs/integration/hrms/e-claim/app-usage.md b/docs/integration/hrms/e-claim/app-usage.md
index 9245d02..c5e5132 100644
--- a/docs/integration/hrms/e-claim/app-usage.md
+++ b/docs/integration/hrms/e-claim/app-usage.md
@@ -9,17 +9,19 @@ description: An E Claim features in SQL HRMS app guide
- **Claim Status Count Summary**:
- - User's total approved, pending and rejected claims in the current year
- - User can tap on each status to view claims with the respective status
+ - User's total approved, pending and rejected claims in the current year
+ - User can tap on each status to view claims with the respective status
- **Claim Amount Summary**: User's total amount of pending and approved claims submitted in the current year
- **Claim Balance Summary**: User’s pending and approved claims on each expenses types by month and by year
## Claim Submission
-**Step 1:**
+
+**Step 1:**
**Default Claim:** Select expense type, claim date, amount and description
**E-Invoice Claim:** Select attachment that includes a **VALID** E-Invoice QR code
+
- User can view the MTD limit, YTD limit and claim balance for each selected expenses type
- For E-Invoice Claim, post date, ref 1 and ref 2 will be filled in based on the E-Invoice and are not editable
- User need to allow Camera and Photos (only for iOS device) permission in order to continue the service (refer [Android Permission](../permission.md#android-2) and [iOS Permission](../permission.md#ios-2))
@@ -29,7 +31,8 @@ description: An E Claim features in SQL HRMS app guide
#### Claim Submission Warning Dialog Box
-The app will help to do the following checkings after user click on the ***'Submit' button***:
+
+The app will help to do the following checkings after user click on the ***'Submit' button***:
1. **Exceed MTD Limit:** Prompts if total submitted amount (including previous submission) exceed the monthly limit of the expenses type
@@ -44,6 +47,7 @@ User can choose to change the claim details by submitting a new claim (***'Reapp
:::
#### Claim Submission Sucessful
+
The app will prompt this dialog message upon successful submission
1. Successful Dialog Box
@@ -59,20 +63,21 @@ The app will prompt this dialog message upon successful submission
## Claim Status
+
User can view all his claim transactions once enter this page
- User can apply filter and sorting order to view different claim transaction listing:
- - Filtering options:
- - Expenses type
- - Date range
- - Claim status
- - Sorting options:
- - Date
- - Expenses type
- - Claim Status
-- Type of claim status:
+ - Filtering options:
+ - Expenses type
+ - Date range
+ - Claim status
+ - Sorting options:
+ - Date
+ - Expenses type
+ - Claim Status
+- Type of claim status:
| **Icon** | **Claim Status** | **Remark** |
| :------- | :--------------- | :--------- |
@@ -86,31 +91,33 @@ User can view all his claim transactions once enter this page
-- User are allowed to edit the claim transaction details or cancel the claim on **Pending Approval** claims.
+- User are allowed to edit the claim transaction details or cancel the claim on **Pending Approval** claims.
- ***'View Change Log' button***: View change log of the claim
## Team Claim (Manager only)
+
Manager can view all claim transactions of his team once enter this page
- Manager can apply filter and sorting order to view different claim transaction listing:
- - Filtering options:
- - Expenses type
- - Date range
- - Claim Status
- - Branch
- - Department
- - Sorting options:
- - Date
- - Expenses type
- - Claim Status
+ - Filtering options:
+ - Expenses type
+ - Date range
+ - Claim Status
+ - Branch
+ - Department
+ - Sorting options:
+ - Date
+ - Expenses type
+ - Claim Status
### Claim Approval
- Managers can apply different actions on his team’s claim transaction based on the claim status
+
| **Claim Status** | **Allowed Actions** |
| :--------------- | :------------------ |
| Pending Approval | Approve, Reject |
@@ -122,7 +129,8 @@ Manager can view all claim transactions of his team once enter this page
- ***'View Change Log' button***: View change log of the claim
#### Claim Approval Warning Dialog Box
-The following checkings will be carried out when manager approving a claim:
+
+The following checkings will be carried out when manager approving a claim:
1. **MTD Claim Over Limit:**
- The app will prompt this dialog box if total approval amount (including previous claim transaction) already exceed the monthly limit of the expenses type
@@ -137,18 +145,22 @@ The following checkings will be carried out when manager approving a claim:
#### Claim Comment Dialog Box
+
Manager can enter a comment for the claim approval / claim status update (optional) before proceed the updates
#### Claim Status Update Successful
+
The app will prompt a dialog message upon successful update on the claim status
### Notification
+
#### Claim Approval
-User will receive the following notification once manager approves his claim:
+
+User will receive the following notification once manager approves his claim:
1. App Notification
@@ -159,7 +171,8 @@ User will receive the following notification once manager approves his claim:
### Claim Approval Failed
-User will receive the following notification if manager failed to approve his claim (exceed year limit):
+
+User will receive the following notification if manager failed to approve his claim (exceed year limit):
1. App Notification
@@ -170,7 +183,8 @@ User will receive the following notification if manager failed to approve his cl
### Claim Approval Rejected
-User will receive the following notification once manager rejects his leave:
+
+User will receive the following notification once manager rejects his leave:
1. App Notification
@@ -181,6 +195,7 @@ User will receive the following notification once manager rejects his leave:
## Activity Center
+
User can view his and his team’s (manager only) claim transaction updates from the Activity Center (Dashboard | Activity Center (Bell icon on top left))
diff --git a/docs/integration/hrms/e-claim/payroll-setup.md b/docs/integration/hrms/e-claim/payroll-setup.md
index 6557c8c..6c311f0 100644
--- a/docs/integration/hrms/e-claim/payroll-setup.md
+++ b/docs/integration/hrms/e-claim/payroll-setup.md
@@ -5,17 +5,18 @@ description: An E Claim setup guide in SQL Payroll
---
## Maintain Claim
+
**Step 1:** Payroll | Maintenance | Maintain Claim… | Select a Claim/ Create New
**Step 2:** Set Yearly Limit and Monthly Limit
-Option 1: Maintain Claim
+Option 1: Maintain Claim
-Option 2: Maintain Employee | Claim Limit tab
+Option 2: Maintain Employee | Claim Limit tab
:::info
Payroll / SQL HRMS app will prioritize claim limit set in Maintain Employee over the claim limit in Maintain Claim
-:::
\ No newline at end of file
+:::
diff --git a/docs/integration/hrms/e-claim/sync-cloud.md b/docs/integration/hrms/e-claim/sync-cloud.md
index 0e770fb..5a65628 100644
--- a/docs/integration/hrms/e-claim/sync-cloud.md
+++ b/docs/integration/hrms/e-claim/sync-cloud.md
@@ -13,7 +13,7 @@ description: An E Claim sync cloud guide in SQL Payroll
- **Red Highlight:** Rejected claim
- Editable columns:
- Comment
- - Action:
+ - Action:
- Approved
- Reject
- Unapprove
@@ -22,6 +22,7 @@ description: An E Claim sync cloud guide in SQL Payroll
## Edit Mode
+
**Step 1:** Right-click on the grid | Edit
@@ -34,4 +35,3 @@ description: An E Claim sync cloud guide in SQL Payroll
- Amount
**Step 2:** Save
-
diff --git a/docs/integration/hrms/e-leave/app-usage.md b/docs/integration/hrms/e-leave/app-usage.md
index 8c24841..0d92bcd 100644
--- a/docs/integration/hrms/e-leave/app-usage.md
+++ b/docs/integration/hrms/e-leave/app-usage.md
@@ -2,6 +2,7 @@
sidebar_position: 2
title: App Usage
description: An E Leave features in SQL HRMS app guide
+slug: /integration/hrms/e-leave/app-usage
---
## Dashboard
@@ -9,27 +10,29 @@ description: An E Leave features in SQL HRMS app guide
- **Leave Status Count Summary**
- - User’s total approved, pending and rejected leaves in the current year
- - User can tap on each status to view leave applications with the respective status
-- **Upcoming Leave**: User’s upcoming approved leave
+ - User’s total approved, pending and rejected leaves in the current year
+ - User can tap on each status to view leave applications with the respective status
+- **Upcoming Leave**: User’s upcoming approved leave
- **Leave Balance Summary (AL, MC and UL)**
- - User can tap on the card to view detailed leave balance for all his leave types
+ - User can tap on the card to view detailed leave balance for all his leave types
## Leave Balance
-### Employee
+### Employee (Leave Balance)
+
User can view leave balance of different year by navigating to different year
### Manager
+
If user is a manager, he can view his team's leave balance by tapping on the employee card
apply
## Leave Application
-### Employee
+### Employee (Leave Application)
@@ -37,7 +40,7 @@ apply
**Step 2:** Select leave date, leave time, leave type, description
- User can view year balance and leave taken for the selected leave type
- - ***'I'm taking leave' checkbox*** :
+ - ***'I'm taking leave' checkbox*** :
- Checked: Normal leave application
- Unchecked: Apply leave as OT replacement
- User need to allow Camera and Photos (only for iOS device) permission to continue the service (refer [Android Permission](../permission.md#android-2) and [iOS Permission](../permission.md#ios-2))
@@ -49,6 +52,7 @@ If user is a manager and has the Manager Auto Approval access (set in payroll sy
:::
### Apply Leave On Behalf (Manager only)
+
Manager can help his team to apply leave on behalf by tapping on the employee card to switch employee
@@ -57,12 +61,14 @@ Manager can help his team to apply leave on behalf by tapping on the employee ca
- Leave applied by Verify Manager will be posted as **Pending Approval**
#### Skipped Public Holiday / Rest Day Dialog box
+
App will automatically skipped all the public holidays and rest days if found within the applied date range
#### Leave Application Warning Dialog Box
-The app will help to do the following checkings after user click on the ***'Submit' button***:
+
+The app will help to do the following checkings after user click on the ***'Submit' button***:
1. **Duplicate Leave Application:** Prompts if there is leave applied on the same date
@@ -79,10 +85,11 @@ The app will help to do the following checkings after user click on the ***'Subm
:::info
-User can choose to change the leave details by submitting a new leave (***'Reapply' button***) or proceed (***'Proceed' button***) with the current leave application (not allowed if leave application exceeds year limit)
+User can choose to change the leave details by submitting a new leave (***'Reapply' button***) or proceed (***'Proceed' button***) with the current leave application (not allowed if leave application exceeds year limit)
:::
#### Leave Application Successful
+
1. Successful Dialog Box
@@ -99,18 +106,18 @@ User can choose to change the leave details by submitting a new leave (***'Reapp
-- User can view all his leave applications once enter this page.
+- User can view all his leave applications once enter this page.
- User can apply filter and sorting order to view different leave application listing:
- - Filtering options:
- - Leave type
- - Date range
- - Leave status
- - Sorting options:
- - Date
- - Leave type
- - Leave status
+ - Filtering options:
+ - Leave type
+ - Date range
+ - Leave status
+ - Sorting options:
+ - Date
+ - Leave type
+ - Leave status
- User can batch edit cancel **Approved / Pending Approval / Pending Verification / Rejected** leave applications
-- Type of leave status:
+- Type of leave status:
| **Icon** | **Leave Status** | **Remark** |
| :------- | :--------------- | :--------- |
@@ -125,10 +132,11 @@ User can choose to change the leave details by submitting a new leave (***'Reapp
-- User are allowed to edit the leave application details or cancel the leave on **Approved / Pending Approval / Pending Verification** leave applications.
+- User are allowed to edit the leave application details or cancel the leave on **Approved / Pending Approval / Pending Verification** leave applications.
- ***'View Change Log' button:*** View change log of the leave
## Team Leave (Manager only)
+
Manager Types: (refer [Manager Authority Settings](payroll-setup.md#manager-authority-settings))
1. **Approval Manager:** Can approve employee leave
@@ -137,48 +145,49 @@ Manager Types: (refer [Manager Authority Settings](payroll-setup.md#manager-auth
-- Manager can view all leave applications of his managing team once enter this page.
+- Manager can view all leave applications of his managing team once enter this page.
- Manager can apply filter and sorting order to view different leave application listing:
- - Filtering options:
- - Leave type
- - Show replacement leave only
- - Date range
- - Leave Status
- - Branch
- - Department
- - Sorting options:
- - Date
- - Leave type
- - Leave Status
-- Manager can batch edit leave application status by clicking on the top right icon. (refer [Batch Leave Approval](#batch-leave-approval))
+ - Filtering options:
+ - Leave type
+ - Show replacement leave only
+ - Date range
+ - Leave Status
+ - Branch
+ - Department
+ - Sorting options:
+ - Date
+ - Leave type
+ - Leave Status
+- Manager can batch edit leave application status by clicking on the top right icon. (refer [Batch Leave Approval](#batch-leave-approval))
### Leave Approval
- ***'View Change Log’ button:*** View change log of the leave
-- Managers can apply different actions on his team’s leave application based on the leave status and his authority
- - Actions that can be done by **Approval Manager**:
- | **Leave Status** | **Allowed Actions** |
- | :--------------- | :------------------ |
- | Pending Verification | Approve Reject |
- | Pending Approval | Approve, Reject |
- | Approved | Undo Approved, Reject |
- | Approved (Sync) | - |
- | Rejected | Approve, Undo Rejected |
- | Cancelled | - |
- - Actions that can be done by **Verify Manager**:
- | **Leave Status** | **Allowed Actions** |
- | :--------------- | :------------------ |
- | Pending Verification | Verify, Reject |
- | Pending Approval | Undo Verify, Reject |
- | Approved | Reject |
- | Approved (Sync) | - |
- | Rejected | Verify, Undo Reject |
- | Cancelled | - |
+- Managers can apply different actions on his team’s leave application based on the leave status and his authority
+ - Actions that can be done by **Approval Manager**:
+ | **Leave Status** | **Allowed Actions** |
+ | :--------------- | :------------------ |
+ | Pending Verification | Approve Reject |
+ | Pending Approval | Approve, Reject |
+ | Approved | Undo Approved, Reject |
+ | Approved (Sync) | - |
+ | Rejected | Approve, Undo Rejected |
+ | Cancelled | - |
+ - Actions that can be done by **Verify Manager**:
+ | **Leave Status** | **Allowed Actions** |
+ | :--------------- | :------------------ |
+ | Pending Verification | Verify, Reject |
+ | Pending Approval | Undo Verify, Reject |
+ | Approved | Reject |
+ | Approved (Sync) | - |
+ | Rejected | Verify, Undo Reject |
+ | Cancelled | - |
#### Leave Approval Warning Dialog Box
-The following checkings will be carried out when manager approving a leave:
+
+The following checkings will be carried out when manager approving a leave:
1. **MTD Leave Over Limit:**
- Manager are allowed to proceed leave approval with same / other leave type (only if there are other leave type options) if total leave day applied (including previous leave application) already exceed the monthly limit of the leave type
@@ -200,16 +209,19 @@ The following checkings will be carried out when manager approving a leave:
#### Leave Comment Dialog Box
+
Manager can enter a comment for the leave approval (optional) before proceeding with the updates
#### Leave Status Update Successful
+
The app will prompt a dialog message upon successful update on the leave status
### Batch Leave Approval
+
**Step 1:** Select the action that manager wants to carry out (Approval Manager View and Verify Manager View)
@@ -223,8 +235,10 @@ Batch Leave Approval will undergo the same checkings as Leave Approval and warni
:::
### Leave Approval Notification
-#### Leave Approval
-User will receive the following notification once manager approves his leave:
+
+#### Leave Approval Notify Message
+
+User will receive the following notification once manager approves his leave:
1. App Notification
@@ -235,7 +249,8 @@ User will receive the following notification once manager approves his leave:
#### Leave Approval Failed
-User will receive the following notification if manager fails to approve his leave (exceed year limit):
+
+User will receive the following notification if manager fails to approve his leave (exceed year limit):
1. App Notification
@@ -246,7 +261,8 @@ User will receive the following notification if manager fails to approve his lea
#### Leave Rejected
-User will receive the following notification once manager rejects his leave:
+
+User will receive the following notification once manager rejects his leave:
1. App Notification
@@ -259,6 +275,7 @@ User will receive the following notification once manager rejects his leave:
## Leave Calendar
### My Leave Calendar
+
User can view all the leave applied in calendar view (excluding rejected and cancelled leave applications)
@@ -266,13 +283,15 @@ User can view all the leave applied in calendar view (excluding rejected and can
- User can tap on the leave cards to enter Leave Application Detail page to view more info / perform edit action
### Team Leave Calendar
-User can view his team’s applied leave in the calendar view
+
+User can view his team’s applied leave in the calendar view
- **Only manager** can tap on the leave cards that belongs to his managing team (refer [Manager Authority Settings](payroll-setup.md#manager-authority-settings)) to enter **Leave Approval** page to view more info / perform leave approval
## Activity Center
+
User can view his and his team’s (manager only) leave application updates from the Activity Center (Dashboard | Activity Center | Bell icon (top left))
-
\ No newline at end of file
+
diff --git a/docs/integration/hrms/e-leave/faq.md b/docs/integration/hrms/e-leave/faq.md
index c172121..700a790 100644
--- a/docs/integration/hrms/e-leave/faq.md
+++ b/docs/integration/hrms/e-leave/faq.md
@@ -2,6 +2,8 @@
sidebar_position: 4
title: FAQ
description: E-Leave Frequently Asked Questions
+slug: /integration/hrms/e-leave/faq
+tags: ["SQL Payroll", "FAQ", "Register", "Email", "E Leave"]
---
## Leave Applications & Approvals
@@ -135,3 +137,29 @@ This occurs when:
:::info[Reminder]
If you rely on HRMS for leave and claim applications, always finish with **Update Payroll** so records are posted to SQL Payroll.
:::
+
+### 13. How to register the staff email to access the E Leave?
+
+#### Register Setup
+
+1. **Update one email address** for each employee (staff) in **Maintain Employee**.
+
+ 
+
+2. Go to **Cloud → Sync Cloud..**
+
+3. Click **Sync Now**.
+
+
+
+### 14. How to deregister the staff email to access the E Leave?
+
+1. Remove the staff email from Maintain Employee.
+
+
+
+2. Access to menu : Cloud | Sync Cloud..
+
+3. Click Sync Now to update.
+
+
diff --git a/docs/integration/hrms/e-leave/payroll-setup.md b/docs/integration/hrms/e-leave/payroll-setup.md
index a4c721f..601c438 100644
--- a/docs/integration/hrms/e-leave/payroll-setup.md
+++ b/docs/integration/hrms/e-leave/payroll-setup.md
@@ -2,6 +2,7 @@
sidebar_position: 1
title: Payroll Setup
description: An E Leave setup guide in SQL Payroll
+slug: /integration/hrms/e-leave/payroll-setup
---
## Multi-Level Leave Approval & Notification Settings
diff --git a/docs/integration/hrms/e-leave/sync-cloud.md b/docs/integration/hrms/e-leave/sync-cloud.md
index a4f7194..6d1a320 100644
--- a/docs/integration/hrms/e-leave/sync-cloud.md
+++ b/docs/integration/hrms/e-leave/sync-cloud.md
@@ -2,6 +2,7 @@
sidebar_position: 3
title: Sync Cloud
description: An E Leave sync cloud guide in SQL Payroll
+slug: /integration/hrms/e-leave/sync-cloud
---
**Step 1:** Cloud Icon | Sync Cloud… | Leave App | Sync All
@@ -15,12 +16,12 @@ description: An E Leave sync cloud guide in SQL Payroll
- **Red Highlight:** Rejected leave
- Editable columns:
- Comment
- - Action:
+ - Action:
- Approved
- Reject
- Unapprove
- - Unreject
+ - Unreject
-**Step 2:** Update Payroll / Update E Leave (if only want update leave application to server)
\ No newline at end of file
+**Step 2:** Update Payroll / Update E Leave (if only want update leave application to server)
diff --git a/docs/integration/hrms/e-payroll/app-usage.md b/docs/integration/hrms/e-payroll/app-usage.md
index fd3bb5b..5e3e725 100644
--- a/docs/integration/hrms/e-payroll/app-usage.md
+++ b/docs/integration/hrms/e-payroll/app-usage.md
@@ -9,7 +9,7 @@ description: An E Payroll features in SQL HRMS app guide
- **Latest Payslip:** Download payslip of user’s latest payroll
-- **Latest Payroll:** Summary break down of user’s latest payroll
+- **Latest Payroll:** Summary break down of user’s latest payroll
- Eye icon: Set the visibility of payslip amount
- Right Arrow icon: Direct to detailed payroll information
- **Monthly Payroll:** Payroll summary of employee’s past 6 months payroll including current month
@@ -17,14 +17,14 @@ description: An E Payroll features in SQL HRMS app guide
## Monthly Payroll
-User can view his monthly net pay and total net income
-
+User can view his monthly net pay and total net income
+
### Monthly Payroll Details
-**Step:** Select a month
-
+**Step:** Select a month
+
- Payslip can be downloaded by tapping on the ***Download icon*** (top right corner)
@@ -39,8 +39,8 @@ User can view his monthly net pay and total net income
## Activity Center
-**Step:** Dashboard | Bell Icon (top left corner)
-
+**Step:** Dashboard | Bell Icon (top left corner)
+
- Show employee’s latest payroll
@@ -48,40 +48,40 @@ User can view his monthly net pay and total net income
## Side Drawer
-**Step:** Dashboard | Person Icon (top right corner)
-
+**Step:** Dashboard | Person Icon (top right corner)
+
- **Logout:** Logout from SQL HRMS app
### Personal Information
-User can view his personal information
-
+User can view his personal information
+
### Payroll Information
-User can view his payroll information
-
+User can view his payroll information
+
### Manager List
User can view his managers and access their contacts by swiping/tapping on the manager card
-
+
### Team List
-User can view his team members’ general personal information
-
+User can view his team members’ general personal information
+
### Announcement
-User can view his company announcement
-
+User can view his company announcement
+
- Announcements will be visible for 3 months
@@ -89,8 +89,8 @@ User can view his company announcement
- Time of Announcement Notification:
- If post date is today, the employee will be notified almost immediately
- If post date is in future, the employee will be notified at 9am of the specified date
-- Eg:
-
+- Eg:
+
:::info
@@ -99,14 +99,14 @@ Enable **Autostart** for SQL HRMS to ensure Announcement features work according
### Company Profile
-User can view his company information
-
+User can view his company information
+
### Switch Company
-User can switch to different company which are linked to the login email
-
+User can switch to different company which are linked to the login email
+
- **Green checked icon:** Current selected company
@@ -115,8 +115,8 @@ User can switch to different company which are linked to the login email
-- **Language:** User can switch to different language based on preferences
-- **Total Space Used:** User can press the button at the right to delete cache files created by SQL HRMS
+- **Language:** User can switch to different language based on preferences
+- **Total Space Used:** User can press the button at the right to delete cache files created by SQL HRMS
### Help Center
@@ -125,18 +125,18 @@ User can switch to different company which are linked to the login email
- **Rate Us:** User will be directed to Play Store (Android) / App Store (iOS) to rate SQL HRMS
- **About SQL HRMS:** User will be directed to [SQL HRMS documentation](https://docs.sql.com.my/sqlpay/category/hrms/) where user can learn more about SQL HRMS features
- **Help Videos:** User will be directed to [SQL HRMS playlists](https://www.youtube.com/playlist?list=PLBfrhZPWZd1Vxv3lYf174a3EW7Pdw8Cth) on YouTube where user can learn more about SQL HRMS features
-- **SQL Privacy Policy:** User will be directed to [SQL Privacy Policy](https://www.sql.com.my/pdpa/) where user can learn how their information is used without violating user's privacy
+- **SQL Privacy Policy:** User will be directed to [SQL Privacy Policy](https://www.sql.com.my/pdpa/) where user can learn how their information is used without violating user's privacy
#### User Feedback
-User can submit feedback on problems that they are facing or suggestions on how we can further improve SQL HRMS
-
+User can submit feedback on problems that they are facing or suggestions on how we can further improve SQL HRMS
+
## Birthday Calendar
-User can view his team members’ and his own birthday dates in calendar view
-
+User can view his team members’ and his own birthday dates in calendar view
+
- **Pink dot:** There are birthdays on that date
diff --git a/docs/integration/hrms/e-payroll/payroll-setup.md b/docs/integration/hrms/e-payroll/payroll-setup.md
index 817aca8..86da645 100644
--- a/docs/integration/hrms/e-payroll/payroll-setup.md
+++ b/docs/integration/hrms/e-payroll/payroll-setup.md
@@ -6,30 +6,31 @@ description: An E Payroll setup guide in SQL Payroll
## Maintain Announcement
-**Step 1:** Human Resource | Maintain Announcement… | Create New
+**Step 1:** Human Resource | Maintain Announcement… | Create New
**Step 2:** Enter Title and Remark
+
- Remark is optional and visible in maintenance view only
-
-**Step 3:** Select a Category and Date for when the Announcement will be visible to the employees
-
+**Step 3:** Select a Category and Date for when the Announcement will be visible to the employees
+
-**Step 4:** Edit Note | Enter Note | Close Form | Yes
-
+**Step 4:** Edit Note | Enter Note | Close Form | Yes
+
-**Step 5:** Add Attachments
+**Step 5:** Add Attachments
+
- Maximum of 2 attachments are allowed
- Attachment extensions that are allowed: .jpg, .jpeg, .png, .pdf
-**Step 6:** Save
+**Step 6:** Save
## Sync Cloud
### Payroll
-**Step 1:** Cloud Icon | Sync Cloud… | Payroll
-
+**Step 1:** Cloud Icon | Sync Cloud… | Payroll
+
- To sync payroll and payslip
@@ -37,7 +38,7 @@ description: An E Payroll setup guide in SQL Payroll
- Select Year and Month
- Check ***'Upload Payslip'***
- Select Report format
-
+
- To Sync EA form
- Check ***'Include EA Form Info'***
- Check ***'Upload Payslip'***
@@ -47,7 +48,7 @@ description: An E Payroll setup guide in SQL Payroll
### Announcement
-**Step:** Cloud Icon | Sync Cloud… | Sync All
+**Step:** Cloud Icon | Sync Cloud… | Sync All
:::info
Make sure to always ***'Sync Cloud'*** when new Announcement is added or if there are any changes to the existing Announcement to ensure both Payroll and SQL HRMS app are in sync with one another
diff --git a/docs/integration/hrms/e-tms/app-usage.md b/docs/integration/hrms/e-tms/app-usage.md
index 4e824d0..6c866f0 100644
--- a/docs/integration/hrms/e-tms/app-usage.md
+++ b/docs/integration/hrms/e-tms/app-usage.md
@@ -10,67 +10,67 @@ Enable **Autostart** for SQL HRMS to ensure E TMS features work accordingly (ref
## Dashboard
- 
+ 
- **Upcoming Holiday:** User's upcoming public holidays
- **Session Card:** User's work session shift time
- - User can tap on the card to direct to Work Session Calendar
- - User can tap on the ***'Clock In' button*** to direct to Clock In / Clock Out page
- - If no work session is assigned, the button will be disabled
+ - User can tap on the card to direct to Work Session Calendar
+ - User can tap on the ***'Clock In' button*** to direct to Clock In / Clock Out page
+ - If no work session is assigned, the button will be disabled
## Clock In / Clock Out
-**Clock In**
-
- 
+### Clock In
+
+ 
- User who is a traveller will show a **'Traveller'** with green check
-- **'Location Matched' / 'Location Unmatched'** will only visible for:
- - Normal employee (not traveller)
- - Traveller that is only allowed to clock in / out at specific places (assigned Work Location)
+- **'Location Matched' / 'Location Unmatched'** will only visible for:
+ - Normal employee (not traveller)
+ - Traveller that is only allowed to clock in / out at specific places (assigned Work Location)
- The button will only enabled if the user turns on their Location Service (refer [Android Permission](../permission.md#android) and [iOS Permission](../permission.md#ios)) and their location is within their designated work location(s)
:::info
-If user forget to clock out, after a certain period of time, the app will reset the time tracking
-
+If user forget to clock out, after a certain period of time, the app will reset the time tracking
+
:::
| **Day Type** | **Reset Period** | **Example** |
| :----------- | :--------------- | :---------- |
-| Work Day with Session | 12 hours (720 mins) after Session Work End time | Session Work End: 31/05/2024 6pm
Reset time: 01/06/2024 6am |
+| Work Day with Session | 12 hours (720 mins) after Session Work End time | Session Work End: 31/05/2024 6pm
Reset time: 01/06/2024 6am |
| Rest Day
Public Holiday
Work Day with No Session
| 16 hours (960 mins) after last Clock In time | Last Clock In: 31/05/2024 9am
Reset time: 01/06/2024 1am |
-**Clock Out**
-
- 
+- **Clock Out**
+
+ 
- If ***'Claim OT' switch*** is turned on
- - The **'OT Break Time (min)'** will be visible
-
- 
+ - The **'OT Break Time (min)'** will be visible
- - When employee tap the ***'Clock Out' button***, a few different dialog may be shown, as explained below
+ 
+
+ - When employee tap the ***'Clock Out' button***, a few different dialog may be shown, as explained below
| **Dialog** | **Explanation** |
| :--------- | :-------------- |
- |  | If [OT Rules](#work-ot) are fulfilled, an **'Overtime Confirmation'** dialog will be prompt that allows the employee to adjust their OT time and OT break time |
- |  | If no [OT Rules](#work-ot) is found, an **'Overtime Confirmation'** dialog (with *'No OT entitlement found'* stated at the bottom) will be prompt that allows the employee to adjust their OT time and OT break time |
- |  | If not within OT Period, employee will be given option to continue Clock Out without claiming OT |
+ |  | If [OT Rules](#work-ot) are fulfilled, an **'Overtime Confirmation'** dialog will be prompt that allows the employee to adjust their OT time and OT break time |
+ |  | If no [OT Rules](#work-ot) is found, an **'Overtime Confirmation'** dialog (with *'No OT entitlement found'* stated at the bottom) will be prompt that allows the employee to adjust their OT time and OT break time |
+ |  | If not within OT Period, employee will be given option to continue Clock Out without claiming OT |
|  | If minimum OT set in [OT Rules](#work-ot) is not fulfilled, employee will be given option to continue Clock Out without claiming OT |
- ***'Claim As Leave' switch*** will only be visible on Rest Day and Public Holiday
- If ***'Claim As Leave' switch*** is turned on
- - An earn replacement leave application will be posted when employee clocked out
- - When employee tap the ***'Clock Out' button***, a **'Claim As Leave'** dialog will be prompt that allows the employee to pick the leave type that they want to claim
+ - An earn replacement leave application will be posted when employee clocked out
+ - When employee tap the ***'Clock Out' button***, a **'Claim As Leave'** dialog will be prompt that allows the employee to pick the leave type that they want to claim
### Work Location
-**Step:** Tap ***'View Work Location' label button***
-
- 
+**Step:** Tap ***'View Work Location' label button***
+
+ 
- **Green Check icon:** Location that the employee is currently in
@@ -78,9 +78,9 @@ If user forget to clock out, after a certain period of time, the app will reset
### My Work Session
-User can view his own work session in calendar view
-
- 
+User can view his own work session in calendar view
+
+ 
- **Red font with purple box:** Public Holiday
- **Purple box:** Rest Day
@@ -88,61 +88,62 @@ User can view his own work session in calendar view
### Team Work Session
-User can view employee's team member's work session and work session of the employees that the manager is managing
-
- 
+User can view employee's team member's work session and work session of the employees that the manager is managing
+
+ 
## Log
### Processed Log
- 
+ 
- The bar chart shows employee summary of a week
- - **Blue bar (480 minutes):** Employee fulfilled expected work duration
- - **Purple bar (397 minutes):** Employee did not fulfill expected work duration
+ - **Blue bar (480 minutes):** Employee fulfilled expected work duration
+ - **Purple bar (397 minutes):** Employee did not fulfill expected work duration
- On Behalf indicates the log is clock by whom
- - **Admin:** Log filled in from SQL Payroll
- - **Manager:** Manager clock on behalf through SQL HRMS app
- - **'-' symbol:** Employee clock by themselves through SQL HRMS app
+ - **Admin:** Log filled in from SQL Payroll
+ - **Manager:** Manager clock on behalf through SQL HRMS app
+ - **'-' symbol:** Employee clock by themselves through SQL HRMS app
- Tap on the bar or date to view the summary and attendance logs
-- ***'Leave Status' button*** is to view all leave applications applied on that date
-
- 
+- ***'Leave Status' button*** is to view all leave applications applied on that date
+
+ 
+
+- ***'Timeline' button*** will direct to Attendance Timeline to view user's locations (refer [Timeline](#timeline) for more details)
-- ***'Timeline' button*** will direct to Attendance Timeline to view user's locations (refer [Timeline](#timeline) for more details)
-
- 
+ 
### Unprocessed Log
- 
+ 
- Rough calculation on late in, early out and overtime will be calculated on those log that are not synced and processed in SQL Payroll
- User are encouraged to process the logs on SQL Payroll in order to obtain a more accurate results on late in, early out and overtime
## Timeline
- 
+ 
- **Employee List** will only be visible to managers, employees will be directed into their own timeline
- Timeline plots the user's clock in, clock out and status update locations on a map
- User can view the remark and attachments of each log if available
- - Paper Clip icon will only appear if there's attachment for that log
- - If there are more than one attachment attached, tapping on the Paper Clip icon a pop up will appear with a list of attachments
+ - Paper Clip icon will only appear if there's attachment for that log
+ - If there are more than one attachment attached, tapping on the Paper Clip icon a pop up will appear with a list of attachments
- User can tap on each log card to focus on the log's location in the map
-- Icon identifiers:
+- Icon identifiers:
+
| | **Log Icon** | **Map Icon** |
|:--| :----------- | :----------- |
- | Clock In |  |  |
- | Status Update |  |  |
- | Clock Out |  |  |
+ | Clock In |  |  |
+ | Status Update |  |  |
+ | Clock Out |  |  |
## Work OT
-Shows the employee's OT entitlement
-
- 
+Shows the employee's OT entitlement
+
+ 
## Team Log
@@ -157,95 +158,95 @@ Shows the employee's OT entitlement
-- User can view his team member's time attendance summary
+- User can view his team member's time attendance summary
- User can tap on the card to direct to [**Attendance Log**](#log) to view detailed summary
- ***'Clock on Behalf' button*** will be visible only to manager on current date and previous dates where time attendance summaries have not been process
-- Filtering chips can be used to filter the summary:
- - Late In
- - Early Out
- - Absence
- - Outside
- - OT
- - Leave
-
+- Filtering chips can be used to filter the summary:
+ - Late In
+ - Early Out
+ - Absence
+ - Outside
+ - OT
+ - Leave
+
### Clock On Behalf (Manager only)
-Managers are allowed to clock in on behalf for his team by tapping on the ***'Clock on Behalf' button***
-
- 
+Managers are allowed to clock in on behalf for his team by tapping on the ***'Clock on Behalf' button***
+
+ 
- After choosing an employee, the manager is directed to the [**Attendance Log**](#log) where a Right Arrow icon on each log and a ***'Clock In' button*** is visible
-- Tap on the Right Arrow icon to direct to Attendance Log Detail
+- Tap on the Right Arrow icon to direct to Attendance Log Detail
+
+- **Clock On Behalf**
-**Clock On Behalf**
-
- 
+ 
- Manager's location will be captured when help to clock on behalf
- ***'Clock In/Clock Out' button*** will be enabled only if the manager's Location Service is enabled (refer [Android Permission](../permission.md#android) and [iOS Permission](../permission.md#ios))
- Manager can adjust the employee's clocking time and checked ***'Claim OT'*** if needed
- Manager are not allowed to clock out on behalf if employee already clocked out on the next day
-**View Attendance Log Detail (Right Arrow Icon)**
-
- 
+- **View Attendance Log Detail (Right Arrow Icon)**
+
+
-- A Pencil icon will be visible next to the time if the log is allowed to be adjusted
+- A Pencil icon will be visible next to the time if the log is allowed to be adjusted
## Notification
### Geofence Service
-The notification will appear after employee clocked in and has ***'GPS Monitoring'*** enable for their [Work Session](payroll-setup.md#maintain-work-session)
+The notification will appear after employee clocked in and has ***'GPS Monitoring'*** enable for their [Work Session](payroll-setup.md#maintain-work-session)
- 
+ 
### Clock In / Out Reminder
-1. Remind user to clock in when he is within work location
-
+1. Remind user to clock in when he is within work location
+
-2. Remind employee to clock out when he leaves his work location
-
+2. Remind employee to clock out when he leaves his work location
+
### Clock Status Update
-- There are three types of status update:
- - Location service off
- - Employee outside work location
- - Mock / Fake location
-- Eg:
-
+- There are three types of status update:
+ - Location service off
+ - Employee outside work location
+ - Mock / Fake location
+- Eg:
+
### Clock On Behalf
-Managers managing the same employee will receive the following notifications once a manager help his team to clock on behalf
+Managers managing the same employee will receive the following notifications once a manager help his team to clock on behalf
+
+1. App Notification
-1. App Notification
-
-2. Email Notification
-
+2. Email Notification
+
### Edited Attendance Log
-Managers managing the same employee will receive the following notifications once a manager edited an employee attendance log
+Managers managing the same employee will receive the following notifications once a manager edited an employee attendance log
+
+1. App Notification
-1. App Notification
-
- 
+ 
-2. Email Notification
-
- 
+2. Email Notification
+
+ 
### Employee login from a different device
-Managers will receive an email notification once his team using a different device to login to the app
-
+Managers will receive an email notification once his team using a different device to login to the app
+
diff --git a/docs/integration/hrms/e-tms/license-control.md b/docs/integration/hrms/e-tms/license-control.md
index 308146a..b8457ed 100644
--- a/docs/integration/hrms/e-tms/license-control.md
+++ b/docs/integration/hrms/e-tms/license-control.md
@@ -4,23 +4,27 @@ title: License Control
description: An E TMS license control guide
---
-**Affecting reports:**
+**Affecting reports:**
+
- [Sync Cloud Time Attendance](sync-cloud.md)
- [Time Attendance Unassigned Listing](payroll-report.md#time-attendance-unassigned-listing)
- [Time Attendance Unassigned Listing](payroll-report.md#time-attendance-unassigned-listing)
-User can check company’s Time Attendance License at Cloud Icon | Sync Cloud… | Time Attendance
-
- 
- 
+User can check company’s Time Attendance License at Cloud Icon | Sync Cloud… | Time Attendance
+
+
+
+
+## Unregistered License
-**Unregistered License**
- Only records for 3 employees will be displayed
-- Full access to all features
+- Full access to all features
+
+## Registered License
-**Registered License**
- Displayed employees’ records based of the number of employee purchased
-- Full access to all features
+- Full access to all features
+
+## Expired License
-**Expired License**
-- Records after the expired date will not be shown
\ No newline at end of file
+- Records after the expired date will not be shown
diff --git a/docs/integration/hrms/e-tms/payroll-report.md b/docs/integration/hrms/e-tms/payroll-report.md
index 6d2709c..f6b6785 100644
--- a/docs/integration/hrms/e-tms/payroll-report.md
+++ b/docs/integration/hrms/e-tms/payroll-report.md
@@ -6,8 +6,8 @@ description: An E TMS report guide in SQL Payroll
## Work Schedule Summary
-**Step:** Time Attendance | Print Work Schedule Summary…
-
+**Step:** Time Attendance | Print Work Schedule Summary…
+
- Types of views:
@@ -23,8 +23,8 @@ description: An E TMS report guide in SQL Payroll
## Time Attendance Summary
-**Step:** Time Attendance | Print Time Attendance Summary…
-
+**Step:** Time Attendance | Print Time Attendance Summary…
+
- Shows all log pairs processed in Sync Cloud
@@ -35,15 +35,15 @@ description: An E TMS report guide in SQL Payroll
### Attendance Reward
-**Step 1:** Click on Attendance Reward (Make sure all Clock Status are checked)
+**Step 1:** Click on Attendance Reward (Make sure all Clock Status are checked)
- Employee who are entitled to **Attendance Reward** (set in [Maintain Employee](payroll-setup.md#maintain-employee)) and fulfilled the conditions will be listed
- Once **'Save'**, the reward will be posted to Pending Allowance
-**Step 2:** Select an Allowance Code | Save
-**Step 3:** Payroll | Open Pending Payroll… | Allowance
-
+**Step 2:** Select an Allowance Code | Save
+**Step 3:** Payroll | Open Pending Payroll… | Allowance
+
:::info
@@ -52,14 +52,14 @@ By default, Meal Allowance is RM20, may contact SQL Support for customization
## Time Attendance Unassigned Listing
-**Step:** Time Attendance | Print Time Attendance Unassigned Listing…
-
+**Step:** Time Attendance | Print Time Attendance Unassigned Listing…
+
-- Shows all OT and Leave records processed in Sync Cloud
+- Shows all OT and Leave records processed in Sync Cloud
:::info
-If there are log pairs with missing Clock In / Clock Out time which are within the date range, user is not allow to view [Time Attendance Summary](#time-attendance-summary) report and [Time Attendance Unassigned Listing](#time-attendance-unassigned-listing) report until those log pairs are fix in [Sync Cloud](sync-cloud.md)
-
+If there are log pairs with missing Clock In / Clock Out time which are within the date range, user is not allow to view [Time Attendance Summary](#time-attendance-summary) report and [Time Attendance Unassigned Listing](#time-attendance-unassigned-listing) report until those log pairs are fix in [Sync Cloud](sync-cloud.md)
+
:::
diff --git a/docs/integration/hrms/e-tms/payroll-setup.md b/docs/integration/hrms/e-tms/payroll-setup.md
index 5537e97..689c022 100644
--- a/docs/integration/hrms/e-tms/payroll-setup.md
+++ b/docs/integration/hrms/e-tms/payroll-setup.md
@@ -6,87 +6,93 @@ description: An E TMS setup guide in SQL Payroll
## Maintain Branch
-**Step 1:** Human Resource | Maintain Branch… | Select a Branch / Create New
-
+**Step 1:** Human Resource | Maintain Branch… | Select a Branch / Create New
+
-**Step 2:** Map | Enter Branch address | Search | Confirm
-
+**Step 2:** Map | Enter Branch address | Search | Confirm
+
:::tip
User may click on the map to get a more accurate position
:::
-**Step 3:** Enter radius (by default is 60m) | Save
-
+**Step 3:** Enter radius (by default is 60m) | Save
+
## Maintain Public Holiday
-**Step 1:** Leave | Maintain Public Holiday Calendar… | Select a Public Holiday Calendar / Create New
-
+**Step 1:** Leave | Maintain Public Holiday Calendar… | Select a Public Holiday Calendar / Create New
+
-**Step 2: Set public holidays**
-User may import default Malaysia public holiday calendar or set manually
+**Step 2: Set public holidays**
+User may import default Malaysia public holiday calendar or set manually
+
+Option 1: Global Icon | Select a State | OK
-Option 1: Global Icon | Select a State | OK
-
:::info
User may check or uncheck the dates
:::
-Option 2: Click on ***'P' button*** | Select date
-
+Option 2: Click on ***'P' button*** | Select date
+
-**Step 3:** Save
+**Step 3:** Save
## Maintain Work Session
-**Step 1:** Time Attendance | Maintain Work Session… | Select a Work Session / Create New
-
+**Step 1:** Time Attendance | Maintain Work Session… | Select a Work Session / Create New
+
-**Step 2:** Enter Work Start, Work End and Buffer (by default is 0 min)
+**Step 2:** Enter Work Start, Work End and Buffer (by default is 0 min)
+
- ***'Late In Buffer':*** Can be late by how many minutes
- ***'Early Out Buffer':*** Can leave early by how many minutes
**Step 3:** Enter Break Time
+
- May add up to 3 break times
-**Step 4:** Select Rules
+**Step 4:** Select Rules
+
- ***'Clock In / Clock Out' checkbox:*** Requires to clock in / out in SQL HRMS app
- ***'GPS Monitoring' checkbox:*** Post status update if employee left work location
- ***'Site Photo' checkbox:*** Requires to take photo before clock in / out (User cannot upload picture from album)
**Step 5:** Save
-**Optional**
+:::info[Optional]
+
- User may select ***'Leave Rules'*** if applicable
+:::
+
## Maintain Work OT
-**Step 1:** Time Attendance | Maintain Work OT… | Select a Work OT / Create New
-
+**Step 1:** Time Attendance | Maintain Work OT… | Select a Work OT / Create New
+
-**Step 2:** Click on ***'+' button*** | Select Day Type
-**Step 3:** Select OT Period
-**Step 4:** Select Work Session
- | **Day Type** | **OT Period** | **Work Session** |
- | :----------- | :------------ | :--------------- |
- | Rest Day
Rest Day (Special Rate 1)
Rest Day (Special Rate 2)
Rest Day (Special Rate 3)
Public Holiday | All Day | |
+**Step 2:** Click on ***'+' button*** | Select Day Type
+**Step 3:** Select OT Period
+**Step 4:** Select Work Session
+ | **Day Type** | **OT Period** | **Work Session** |
+ | :----------- | :------------ | :--------------- |
+ | Rest Day
Rest Day (Special Rate 1)
Rest Day (Special Rate 2)
Rest Day (Special Rate 3)
Public Holiday | All Day | |
| Work Day | Before Work
Break Time
After Work | *Select a Work Session* |
**Step 5:** Set OT Rule by clicking on the ***'…' button***
-**Standard Rule - Clock Time**
-
- 
+### Standard Rule - Clock Time
+
+
- **'Min OT':** Require to have at least 30 minutes of OT to be eligible for this rule
- **'Max OT':** Maximum claimable OT minutes is 180 minutes (3 hours)
@@ -95,19 +101,19 @@ Option 2: Click on ***'P' button*** | Select date
| **Period** | **OT Start** | **OT** | **Explanation** |
| :--------- | :----------- | :----- | :-------------- |
| 1 | 6:00pm | ---- | 6:00pm - 7:00pm, Entitled to OT Code ---- |
-| 2 | 7:00pm | HW15 | From 7:00pm onwards, Entitled to OT Code HW15 |
+| 2 | 7:00pm | HW15 | From 7:00pm onwards, Entitled to OT Code HW15 |
-**Explanation:** If employee start OT at 7:00pm, employee is entitled to OT Code HW15 and can claim up to 180 minutes
+**Explanation:** If employee start OT at 7:00pm, employee is entitled to OT Code HW15 and can claim up to 180 minutes
+
+### Standard Rule - Tier
-**Standard Rule - Tier**
-
- ***'OT Start':*** Allow to start OT at 9:00am
- ***'Min OT':*** Require to have at least 60 minutes of OT to be eligible for rule
- ***'Allow AdHoc OT':*** Any OT before 9:00am will also be calculated
-| **Tier** | **Max OT** | **OT** | **Explanation** | **Example** |
+| **Tier** | **Max OT** | **OT** | **Explanation** | **Example** |
| :------- | :--------- | :----- | :-------------- | :---------- |
| 1 | 120 | DR15 | First 120 minutes, Eligible to OT Code DR15 | 9:00am - 11:00am |
| 2 | 240 | DR20 | Next 240 minutes, Eligible to OT Code DR20 | 11:00am - 3:00pm |
@@ -119,67 +125,69 @@ For Custom Rule, may contact SQL Support for customization
**Step 6:** Save
-## Maintain Calendar
+## Maintain Calendar
+
+**Step:** Time Attendance | Maintain Calendar…
-**Step:** Time Attendance | Maintain Calendar…
-
-### View Schedule
+### View Schedule
+
+**Step:** Click ***'View Schedule' button***
-**Step:** Click ***'View Schedule' button***
-
-**Work Session Calendar**
-- **Red box:** Public Holiday assigned from Maintain Public Holiday Calendar
-- **Orange font:** Rest Day
-- **Black font:** Work Day with Session
-- **Grey font:** No schedule is assigned
+#### Work Session Calendar
+
+- **Red box:** Public Holiday assigned from Maintain Public Holiday Calendar
+- **Orange font:** Rest Day
+- **Black font:** Work Day with Session
+- **Grey font:** No schedule is assigned
+
+#### Set Work Session
-**Set Work Session**
- User may click on ***'R' button*** or ***'W' button*** | Select date from calendar
- ***'C' button*** to clear Work Session / Rest Day
- - Alternatively, user may use ***'Clear All' button*** to clear all Rest Day and Work Session within the date range
-- User cannot assign work sessions or change work sessions on past dates
+ - Alternatively, user may use ***'Clear All' button*** to clear all Rest Day and Work Session within the date range
+- User cannot assign work sessions or change work sessions on past dates
+
+#### Wizard for Work Session
-### Wizard
+**Step 1:** Select Employee(s) | Wizard
-**Step 1:** Select Employee(s) | Wizard
-
-- ***'Delete & Replace Schedule' checkbox:*** Any previously assigned Work Session will be deleted and replace
- - Only apply to assigned work session on future dates
+- ***'Delete & Replace Schedule' checkbox:*** Any previously assigned Work Session will be deleted and replace
+ - Only apply to assigned work session on future dates
- Hover **'Rest Day'** for more rest day options:
- - Special Rate 1
- - Special Rate 2
- - Special Rate 3
-
-**Step 2:** Select a schedule
+ - Special Rate 1
+ - Special Rate 2
+ - Special Rate 3
+
+**Step 2:** Select a schedule
| **Schedule** | **Explanation** |
| :----------- | :-------------- |
| By Months | Assign to every selected day of every selected week of every selected month |
| Custom | Assign to selected dates |
-**Step 3:** Next | Select a Session
-
+**Step 3:** Next | Select a Session
+
- ***'Skip Rest Day' checkbox:*** Previously assigned Rest Day will not be replaced with Work Session
- - Only apply to assigned work session on future dates
+ - Only apply to assigned work session on future dates
- ***'Delete & Replace Schedule' checkbox:*** Any previously assigned schedule will be deleted and replace
- - Only apply to assigned work session on future dates
+ - Only apply to assigned work session on future dates
-**Step 4:** Select schedule type
- | **Schedule** | **Explanation** |
- | :----------- | :-------------- |
+**Step 4:** Select schedule type
+ | **Schedule** | **Explanation** |
+ | :----------- | :-------------- |
| By Months | Assign to every selected day of every selected week of every selected month |
| By Days of Month | Assign to every selected day of every selected month |
| By Weeks | Assign to every selected day of every selected weeks of the year |
- | Custom | Assign to selected dates |
+ | Custom | Assign to selected dates |
-**Step 5:** Process
+**Step 5:** Process
:::warning
User cannot assign work sessions or change work sessions on past dates
@@ -187,12 +195,12 @@ User cannot assign work sessions or change work sessions on past dates
### Copy Calendar from Employee
-**Step 1:** Select employee(s) | Wizard dropdown | Copy From
-**Step 2:** Select date range and employee to copy from | OK
-
+**Step 1:** Select employee(s) | Wizard dropdown | Copy From
+**Step 2:** Select date range and employee to copy from | OK
+
-**Explanation:** Copy Employee 00005 schedule (Work Session and Rest Day) from 20/5/2024 to 31/12/2024 to Employee 00006
+**Explanation:** Copy Employee 00005 schedule (Work Session and Rest Day) from 20/5/2024 to 31/12/2024 to Employee 00006
:::info
Date From need to be current date to future dates (past dates are not allowed to copy)
@@ -200,12 +208,12 @@ Date From need to be current date to future dates (past dates are not allowed to
### Clear All Schedule
-**Step 1:** Select employee(s) | Wizard dropdown | Clear All
-**Step 2:** Select date range to delete | OK
-
+**Step 1:** Select employee(s) | Wizard dropdown | Clear All
+**Step 2:** Select date range to delete | OK
+
-**Explanation:** Delete all schedule (Work Session and Rest Day) of Employee 00006 from 20/5/2024 to 31/12/2024
+**Explanation:** Delete all schedule (Work Session and Rest Day) of Employee 00006 from 20/5/2024 to 31/12/2024
:::info
Date From need to be current date to future dates (past dates are not allowed to delete)
@@ -213,8 +221,8 @@ Date From need to be current date to future dates (past dates are not allowed to
## Maintain Traveller Location
-**Step:** Time Attendance | Maintain Traveller Location…
-
+**Step:** Time Attendance | Maintain Traveller Location…
+
:::info
@@ -223,9 +231,9 @@ Only employees who is a **'Traveller'** will be listed (refer [Maintain Employee
### View Location
-**Step:** Click View Location
-
- 
+**Step:** Click View Location
+
+
- **Red box:** Public Holiday assigned from Maintain Public Holiday Calendar
- **Orange font:** Rest Day
@@ -233,28 +241,28 @@ Only employees who is a **'Traveller'** will be listed (refer [Maintain Employee
- **Grey font:** No schedule is assigned
- **Purple box:** Work locations allocated
- To clear a work location, focus a record on the grid and click ***'-' button***
- - User may click on ***'Clear All' button*** to clear all work locations within the date range
+ - User may click on ***'Clear All' button*** to clear all work locations within the date range
+
+#### Wizard for Traveller Location
-### Wizard
+**Step 1:** Select Employee(s) | Wizard
-**Step 1:** Select Employee(s) | Wizard
-
-**Step 2:** Select a Schedule
- | **Schedule** | **Explanation** |
- | :----------- | :-------------- |
- | By Months | Assign to every selected day of every selected week of every selected month |
- | By Days of Month | Assign to every selected day of every selected month |
- | By Weeks | Assign to every selected day of every selected week of the year |
- | Custom | Assign to selected dates |
-
-**Step 3:** Click on ***'+' button*** | Map
-**Step 4:** Select a GPS Type | Enter radius (by default, 60m) and description | Confirm
- | **GPS Type** | **Explanation** |
+**Step 2:** Select a Schedule
+ | **Schedule** | **Explanation** |
| :----------- | :-------------- |
- | Branch | Select from a list of branches created in Maintain Branch |
- | Custom | Search by address |
+ | By Months | Assign to every selected day of every selected week of every selected month |
+ | By Days of Month | Assign to every selected day of every selected month |
+ | By Weeks | Assign to every selected day of every selected week of the year |
+ | Custom | Assign to selected dates |
+
+**Step 3:** Click on ***'+' button*** | Map
+**Step 4:** Select a GPS Type | Enter radius (by default, 60m) and description | Confirm
+ | **GPS Type** | **Explanation** |
+ | :----------- | :-------------- |
+ | Branch | Select from a list of branches created in Maintain Branch |
+ | Custom | Search by address |
@@ -262,15 +270,15 @@ Only employees who is a **'Traveller'** will be listed (refer [Maintain Employee
User may pin on the map to get a more accurate position
:::
-**Step 6:** Process
-
+**Step 6:** Process
+
### Copy Work Location from Employee
-**Step 1:** Select Employee(s) | Wizard dropdown | Copy From
-**Step 2:** Select date range and employee to copy from | OK
-
+**Step 1:** Select Employee(s) | Wizard dropdown | Copy From
+**Step 2:** Select date range and employee to copy from | OK
+
**Explanation:** Copy Employee 00012 locations from 20/5/2024 to 31/12/2024 to Employee 00007
@@ -281,12 +289,12 @@ Date From need to be current date to future dates (past dates are not allowed to
### Clear All Work Locations
-**Step 1:** Select Employee(s) | Wizard Dropdown button | Clear All
-
+**Step 1:** Select Employee(s) | Wizard Dropdown button | Clear All
+
-**Step 2:** Select Date Range | OK
-**Explanation:** Delete all locations of Employee 00007 from 20/5/2024 to 31/12/2024
+**Step 2:** Select Date Range | OK
+**Explanation:** Delete all locations of Employee 00007 from 20/5/2024 to 31/12/2024
:::info
Date From need to be current date to future dates (past dates are not allowed to delete)
@@ -294,24 +302,26 @@ Date From need to be current date to future dates (past dates are not allowed to
## Maintain Employee
-**Step 1:** Human Resource | Maintain Employee… | Select an Employee / Create New | Personal tab | Enter email
-
+**Step 1:** Human Resource | Maintain Employee… | Select an Employee / Create New | Personal tab | Enter email
+
-**Step 2:** Grouping | Select a Branch
-**Step 3:** Select a Public Holiday Calendar
-**Step 4:** Select a Work OT
-**Step 5:** Save
-
- 
+**Step 2:** Grouping | Select a Branch
+**Step 3:** Select a Public Holiday Calendar
+**Step 4:** Select a Work OT
+**Step 5:** Save
+
+
+:::info[Optional]
-**Optional**
- Employees who are entitled to Attendance Reward, may select an **'Attendance Reward'**
- Employees who are travellers (Eg. Salesperson / Delivery Person / Doctor), may check the ***'Traveller' checkbox***
-## Sync Cloud
+:::
+
+## Sync Cloud
-**Step:** Cloud Icon | Sync Cloud… | Sync All
+**Step:** Cloud Icon | Sync Cloud… | Sync All
:::info
Make sure to always **'Sync Cloud'** after all maintenance are done or if there are any changes to the Time Attendance Setup to ensure settings on both Payroll and SQL HRMS app are in sync with one another
diff --git a/docs/integration/hrms/e-tms/sync-cloud.md b/docs/integration/hrms/e-tms/sync-cloud.md
index 6c62e85..2e72302 100644
--- a/docs/integration/hrms/e-tms/sync-cloud.md
+++ b/docs/integration/hrms/e-tms/sync-cloud.md
@@ -4,71 +4,74 @@ title: Sync Cloud
description: An E TMS sync cloud guide in SQL Payroll
---
-**Step 1:** Cloud Icon | Sync Cloud… | Time Attendance | Sync All
-
+**Step 1:** Cloud Icon | Sync Cloud… | Time Attendance | Sync All
+
**Step 2:** After all necessary adjustments are made | Update Payroll
+
- Alternatively, user may click on the ***'Update TMS' button*** under ***'Update Payroll' dropdown*** to only update TMS data to server
- After ***'Update Payroll'***, all OT / Leave trans that has been assigned action will no longer appear on the grid. User may view it under [Time Attendance Unassigned Listing report](payroll-report.md#time-attendance-unassigned-listing)
:::info
The **'ETMS updated to dd/mm/yyyy'** is the date of the latest TMS summary processed. Any attendance logs before the updated date will no longer allowed to be adjusted from SQL HRMS app.
-If user sync before 9am, Time Attendance Log will only sync up to two days before.
-
- 
+If user sync before 9am, Time Attendance Log will only sync up to two days before.
+
+ 
| **Scenario** | **Sync Up To** | **Days Before** |
-| :----------- | :------------- | :-------------- |
-| Before 9am on 31/05/2024 | 29/05/2024 | 2 days |
-| After 9am on 31/05/2024 | 30/05/2024 | 1 day |
+| :----------- | :------------- | :-------------- |
+| Before 9am on 31/05/2024 | 29/05/2024 | 2 days |
+| After 9am on 31/05/2024 | 30/05/2024 | 1 day |
+
:::
### Attendance Log Error
-This dialog box will only prompt if there are any incomplete log pairs (missing clock in / clock out) that requires attention
-
- 
+This dialog box will only prompt if there are any incomplete log pairs (missing clock in / clock out) that requires attention
+
+ 
-- **Purple cells:** Missing time which needs to be filled in
+- **Purple cells:** Missing time which needs to be filled in
- Editable columns:
- - Clock In
- - Clock Out
- - Is OT
- - Break Time
+ - Clock In
+ - Clock Out
+ - Is OT
+ - Break Time
- ***'Recalculate' button*** will enabled once changes are made to perform recalculation on the attendance logs
### Log
-This tab shows the processed TMS summary with employees' log details after processed
-
- 
+This tab shows the processed TMS summary with employees' log details after processed
+
+ 
#### Location Map
-User can click on the ***'Map' button*** in tab to show the employee's log location (Clock In, Clock Out, Status Update) on a map
-
- 
+User can click on the ***'Map' button*** in tab to show the employee's log location (Clock In, Clock Out, Status Update) on a map
+
+ 
- Map icon identifier:
+
| **Icon** | **Description** |
| :------- | :-------------- |
|  | Clock In |
|  | Status Update |
|  | Clock Out |
-#### Edit Mode
+#### Edit Mode for Location Map
+
+**Step:** Right-click on the grid | Edit
-**Step:** Right-click on the grid | Edit
-
- Editable columns:
- - Clock In
- - Clock Out
- - Is OT
- - Break Time
+ - Clock In
+ - Clock Out
+ - Is OT
+ - Break Time
- ***'Recalculate' button*** will enabled once changes are made to perform recalculation on the attendance logs
### OT
@@ -76,41 +79,41 @@ User can click on the ***'Map' button*** in tab to show the employee's log locat
- Editable columns:
- - Post Date
- - Action:
- - Unassigned
- - Overtime: Record will be posted to Pending Overtime
- - Cancelled: Record will be ignored
+ - Post Date
+ - Action:
+ - Unassigned
+ - Overtime: Record will be posted to Pending Overtime
+ - Cancelled: Record will be ignored
- **Red highlight:** Not all the nested records are assigned with an OT code (won't be posted to pending)
- **Green highlight:** All the nested records are assigned with an OT code
- ***'Show Log' button*** is to show all employee's attendance logs on that date
-#### Edit Mode
+#### Edit Mode for OT
+
+**Step:** Right-click on the grid | Edit
-**Step:** Right-click on the grid | Edit
-
- Editable columns:
- - Remark
- - Claimable
- - Break Time
- - OT Code
+ - Remark
+ - Claimable
+ - Break Time
+ - OT Code
- ***'Save' button*** will enabled once changes are made
### Leave
-- Editable columns:
- - Post Date
- - Remark
- - Deductible
- - Action:
- - Unassigned
- - Leave: Records will be posted to Leave Application
- - Unpaid Leave: Record will be posted to Leave Application
- - Cancelled: Record will be ignored
- - Leave Type: Value changes based on chosen action
+- Editable columns:
+ - Post Date
+ - Remark
+ - Deductible
+ - Action:
+ - Unassigned
+ - Leave: Records will be posted to Leave Application
+ - Unpaid Leave: Record will be posted to Leave Application
+ - Cancelled: Record will be ignored
+ - Leave Type: Value changes based on chosen action
- User need to assign a leave code in order to post it to Leave Application
- ***'Show Log' button:*** Show all employee's logs on that date
diff --git a/docs/integration/hrms/login.md b/docs/integration/hrms/login.md
index afeacc9..a89f189 100644
--- a/docs/integration/hrms/login.md
+++ b/docs/integration/hrms/login.md
@@ -4,26 +4,24 @@ title: Login
description: A login guide for SQL HRMS
---
-## Login
+**Step 1:** Enter email | Next
-**Step 1:** Enter email | Next
-
-**Step 2:** Enter OTP sent to your email | Login
-
+**Step 2:** Enter OTP sent to your email | Login
+
## Try Live Demo
User may try out all the modules (E-TMS, E-Leave, E-Claim, E-Payroll) as manager
-**Step 1:** Try Live Demo
-
- 
+**Step 1:** Try Live Demo
+
+ 
**Step 2:** Testing Company (Demo Data)
-
- 
-
+
+ 
+
- Logout icon (top right): Logout from SQL HRMS app
diff --git a/docs/integration/hrms/payroll-setup.md b/docs/integration/hrms/payroll-setup.md
index eccbfa2..4d01f5c 100644
--- a/docs/integration/hrms/payroll-setup.md
+++ b/docs/integration/hrms/payroll-setup.md
@@ -12,77 +12,79 @@ May contact SQL support to register an email address
Make sure you are login into an ADMIN user before proceed with the steps below
:::
-**Step 1:** File | Company Profile... | Cloud Icon
-
+**Step 1:** File | Company Profile... | Cloud Icon
+
-**Step 2:** Turn on Drive
-
+**Step 2:** Turn on Drive
+
-**Step 3:** Log in | Log in with Google | Enter Gmail account + password | Grant access
-
+**Step 3:** Log in | Log in with Google | Enter Gmail account + password | Grant access
+
**Step 4:** Save
## SMTP
-Before entering the SMTP settings, the user needs to create an app password using his company email address. This app password will be used for authentication when sending email using external program. If user do not have a company address, user can choose to get the app password using a Gmail or a Microsoft account.
+Before entering the SMTP settings, the user needs to create an app password using his company email address. This app password will be used for authentication when sending email using external program. If user do not have a company address, user can choose to get the app password using a Gmail or a Microsoft account.
+
+**Step 1:** Company Profile | General tab
+**Step 2:** Enter email that will be used to generate app password
-**Step 1:** Company Profile | General tab
-**Step 2:** Enter email that will be used to generate app password
-
-**Step 3:** Go to Email Settings tab and fill in the required fields
+**Step 3:** Go to Email Settings tab and fill in the required fields
+
- **Host**
- **Gmail**: smtp.gmail.com
- **Microsoft Account**: smtp.office365.com
- **Port No**: 587
- **User**: Email used to generate the app password
- **Password**: The 16-character password generated in the email setup
- - **Sender Name**: Name of the sender
+ - **Sender Name**: Name of the sender
**Step 4:** Click Test Email
+
- User will receive an email under the email address used to generate the password upon successful
-
+
## Email Setup
### Google Account
-**Step 1:** Login to Google account
-**Step 2:** Turn on two-step verification
-
+**Step 1:** Login to Google account
+**Step 2:** Turn on two-step verification
+
-**Step 3:** In the search bar, enter ***'app passwords'*** and choose ***'App passwords'*** under ***'Security'***
-
+**Step 3:** In the search bar, enter ***'app passwords'*** and choose ***'App passwords'*** under ***'Security'***
+
-**Step 4:** Enter a name for the App and click the ***'Create'*** button
-
+**Step 4:** Enter a name for the App and click the ***'Create'*** button
+
-**Step 5:** A 16-charactor password will be generated and follow the instructions under the ***'How to use it'*** section
-
+**Step 5:** A 16-charactor password will be generated and follow the instructions under the ***'How to use it'*** section
+
### Microsoft Account
-**Step 1:** Login to user Microsoft account
-**Step 2:** Direct to ***'Security'*** tab and click on ***'Manage how I sign in'***
-
- 
+**Step 1:** Login to user Microsoft account
+**Step 2:** Direct to ***'Security'*** tab and click on ***'Manage how I sign in'***
+
+ 
+
+**Step 3:** Turn on ***'Two-step verification'***
+
+ 
-**Step 3:** Turn on ***'Two-step verification'***
-
- 
+**Step 4:** Still in the ***'Security'*** page, scroll down to ***'App passwords'*** and click on ***'Create a new app password'***
-**Step 4:** Still in the ***'Security'*** page, scroll down to ***'App passwords'*** and click on ***'Create a new app password'***
-
**Step 5:** A 16-charactor password is generated
diff --git a/docs/integration/hrms/permission.md b/docs/integration/hrms/permission.md
index c20a4b7..b2ee74e 100644
--- a/docs/integration/hrms/permission.md
+++ b/docs/integration/hrms/permission.md
@@ -5,54 +5,59 @@ description: A guide for permission required in SQL HRMS
---
## Location
+
Modules that require this permission:
+
- E TMS
### Android
-**From SQL HRMS app**
-**Step 1:** Turn on Location Service
+#### From SQL HRMS app
+
+**Step 1:** Turn on Location Service
-**Step 2:** Allow Location Permission. When prompted, select ***'While using the app'***
+**Step 2:** Allow Location Permission. When prompted, select ***'While using the app'***
-**Step 3:** Select ***'Update settings'*** and choose ***'Allow all the time'*** when the app prompts the following dialog box
+**Step 3:** Select ***'Update settings'*** and choose ***'Allow all the time'*** when the app prompts the following dialog box
-**From Device Settings**
-User can manually allow the permission through device settings page
+**From Device Settings**
+User can manually allow the permission through device settings page
-**Step:** App Info | App permissions | Location
+**Step:** App Info | App permissions | Location
### iOS
-**From SQL HRMS app**
-**Step 1:** Settings | Privacy & Security | Location Service
+#### From SQL HRMS app
+
+**Step 1:** Settings | Privacy & Security | Location Service
-**Step 2:** Allow Location Permission. When prompted, select ***'Allow While Using App'***
+**Step 2:** Allow Location Permission. When prompted, select ***'Allow While Using App'***
-**Step 3:** Select ***'Change to Always Allow'***
+**Step 3:** Select ***'Change to Always Allow'***
-**From Device Settings**
-**Step:** Settings | Search 'SQL HRMS' | Location
+**From Device Settings**
+**Step:** Settings | Search 'SQL HRMS' | Location
## Notification
### Android
+
**Step 1:** Direct to App Info | Permissions | Notifications
**Step 2:** Choose ***'All SQL HRMS notifications'***
@@ -60,6 +65,7 @@ User can manually allow the permission through device settings page
### iOS
+
**Step 1:** Direct to Settings | Search 'SQL HRMS'
**Step 2:** Turn on Notifications permission
@@ -67,22 +73,25 @@ User can manually allow the permission through device settings page
## Camera
-Modules that require this permission:
+
+Modules that require this permission:
+
- E TMS
- E Leave
- E Claim
### Android
-**Step 1:** Direct to App Info | Permissions | Camera
+**Step 1:** Direct to App Info | Permissions | Camera
**Step 2:** Choose ***'Allow only while using the app'***
### iOS
+
**Step 1:** Direct to Settings | Search 'SQL HRMS'
**Step 2:** Turn on Camera permission
-
\ No newline at end of file
+
diff --git a/docs/integration/vision/gift/manager.md b/docs/integration/vision/gift/manager.md
index b0a692d..a994b30 100644
--- a/docs/integration/vision/gift/manager.md
+++ b/docs/integration/vision/gift/manager.md
@@ -6,7 +6,7 @@ sidebar_position: 2
:::info[Note]
-These features are only available to **manager**.
+These features are only available to **manager**.
:::
@@ -18,21 +18,21 @@ After manager creates a gift, users will receive notification regarding the new
1. To add a new gift, managers can go to **More icon> Add Gift**.
-
+ 
2. Gift Redemption Details
-
+ 
-| Properties | Description | Note |
-|:-----------------------------|:-----------------------------------------------------------------------------------|:--------:|
-| **Name** | The name of the gift. | Required |
-| **Description** | A detailed description of the gift. | Required |
-| **Terms & Conditions** | To specify the rules, requirements, guidelines, and limitations that the user must agree to in order to redeem the gift. | Required |
-| **Redemption Validity Start Date** | The first date when the gift can be redeemed. | Required |
-| **Redemption Validity End Date** | The last date when the gift can be redeemed. | Required |
-| **Clear** | Clears all content on the current page. | - |
-| **Next** | Navigates to the next page. | - |
+ | Properties | Description | Note |
+ |:-----------------------------|:-----------------------------------------------------------------------------------|:--------:|
+ | **Name** | The name of the gift. | Required |
+ | **Description** | A detailed description of the gift. | Required |
+ | **Terms & Conditions** | To specify the rules, requirements, guidelines, and limitations that the user must agree to in order to redeem the gift. | Required |
+ | **Redemption Validity Start Date** | The first date when the gift can be redeemed. | Required |
+ | **Redemption Validity End Date** | The last date when the gift can be redeemed. | Required |
+ | **Clear** | Clears all content on the current page. | - |
+ | **Next** | Navigates to the next page. | - |
3. Gift Redemption Criteria
@@ -53,8 +53,8 @@ After manager creates a gift, users will receive notification regarding the new
1. To update a gift, the manager can go to **More icon > Manage Gift** and select the gift to be updated.
-|| |
-|:------------------------------------|:-----------------------------------------------------|
+ || |
+ |:------------------------------------|:-----------------------------------------------------|
2. Update Gift Details - In step 2 of edit mode, the user can update the gift's status using the **"Set as Active"** field.
@@ -91,6 +91,7 @@ To check completed issuances, **toggle on Issued Gifts** to display the latest i
|:------------------------------------|:-----------------------------------------------------|
## Manage Gift
+
### Gift Status
|Active Gifts|Inactive Gifts |
diff --git a/docs/integration/vision/gift/user.md b/docs/integration/vision/gift/user.md
index 207c2bb..46c75c8 100644
--- a/docs/integration/vision/gift/user.md
+++ b/docs/integration/vision/gift/user.md
@@ -6,13 +6,13 @@ sidebar_position: 3
:::info[Note]
-These feature are available to both **manager** and **employee**.
+These feature are available to both **manager** and **employee**.
:::
## Gift Redemption
-**1. Gift Filter Type**
+**1. Gift Filter Type**:
|Gift Category Filter Chip|Filter Drawer|
|:--------------------------------|:--------------------------------|
@@ -33,7 +33,7 @@ These feature are available to both **manager** and **employee**.
:::info[Note]
-Once the gift has expired, it will no longer be displayed for redemption. The manager will need to [**update**](../gift/manager.md#gift-update) the redemption validity end date to reactivate the gift for future redemptions.
+Once the gift has expired, it will no longer be displayed for redemption. The manager will need to [**update**](../gift/manager.md#gift-update) the redemption validity end date to reactivate the gift for future redemptions.
:::
@@ -65,6 +65,7 @@ Users must wait for manager approval or issuance before the gift can be used.
|:-----------------------------------|:-----------------------------------|
## Redemption Log
+
The redemption log allows users to view the history of redeemed rewards, including who redeemed each reward and when it was redeemed.
To view the redemption log, users can go to **More icon> Redemption Log**.
diff --git a/docs/integration/vision/group.md b/docs/integration/vision/group.md
index a28282c..101add9 100644
--- a/docs/integration/vision/group.md
+++ b/docs/integration/vision/group.md
@@ -36,8 +36,8 @@ Manager can view all the created groups in **Main Dashboard | Manage Group**. In
|:---:|---|:---:|
1. Tap on the **group card** that you want to edit. You will see the previously saved *Group Name*, *Admin*, *Group Leader*, and *Group Members*.
-3. Edit by changing either the **Group Name**, **Admin**, **Group Leader** and **Group Members**.
-4. Tap **Save** to save the changes, or **Cancel** to discard the changes.
+2. Edit by changing either the **Group Name**, **Admin**, **Group Leader** and **Group Members**.
+3. Tap **Save** to save the changes, or **Cancel** to discard the changes.
### Delete Group
@@ -57,7 +57,6 @@ Group can be applied when creating a [**Target**](task/manager_view/task_creatio
2. Select the group that you want to apply. You can select multiple groups.
3. Tap **Apply**. You will see the selected groups members appear in the list.
-
:::info[Note 1]
When multiple groups are selected, the Roles of duplicated Group Members will be applied according to the **last selected group**.
@@ -76,4 +75,4 @@ Example:
When a group is applied to an **assignment, upskill, or individual target**, the **Group Leader** role of any member in that group will be **automatically removed**.
-:::
\ No newline at end of file
+:::
diff --git a/docs/integration/vision/linking-to-account.md b/docs/integration/vision/linking-to-account.md
index 576e088..8fdeb63 100644
--- a/docs/integration/vision/linking-to-account.md
+++ b/docs/integration/vision/linking-to-account.md
@@ -23,39 +23,39 @@ SQL Vision is linked to SQL Account to get the amount of sales target achieved b
3. Click **Finish**
-## Connect SQL Account and SQL Vision with SQL Vision Sync
+## Connect SQL Account and SQL Vision with SQL Vision Sync
1. Insert the SQL accounting DFC file into the corresponding field of SQL Vision Sync. You can find the SQL account DFC file in the path specified within the SQL Account Database of the SQL Accounting Software.
-
-
-2. Open the dropdown and select the database from the dropdown list.
+ 
-3. Insert the user name and password fields with the SQL Accounting Software user name and password.
+2. Open the dropdown and select the database from the dropdown list.
+
+3. Insert the user name and password fields with the SQL Accounting Software user name and password.
4. Click **Test Connection**.
-:::info[Hint]
-The SQL Accounting Software must be open and logged in during the connection process.
+ :::info[Hint]
-:::
+ The SQL Accounting Software must be open and logged in during the connection process.
-5. Click **Next** to continue the following steps.
+ :::
+5. Click **Next** to continue the following steps.
-
+ 
-6. Insert the company ID.
+6. Insert the company ID.
7. Click **Get OTP** .
-8. Insert the OTP obtained from the Step 7 into the OTP field.
+8. Insert the OTP obtained from the Step 7 into the OTP field.
9. Click **Get Token**.
10. Click **Next** to continue the following steps.
-
+ 
-11. Select the last export date
+11. Select the last export date
12. Click **Export Data**.
13. Once the data is exported, the SQL Vision mobile app will sync and display the data retrieved from the SQL Accounting Software.
@@ -67,7 +67,7 @@ The SQL Accounting Software must be open and logged in during the connection pro
## Strategy
-The **Strategy** is a formula that helps managers and the application categorize specific targets for each mission. This setup allows the application to accurately retrieve the target amounts associated with a mission from the SQL Account system.
+The **Strategy** is a formula that helps managers and the application categorize specific targets for each mission. This setup allows the application to accurately retrieve the target amounts associated with a mission from the SQL Account system.
To view the strategy, go to **Main Dashboard | Side Bar | Company Configuration**
@@ -115,4 +115,3 @@ To edit an existing strategy, follow these steps:
3. Click the **Edit** button.
4. Click **Save** to apply changes.
5. Click **Cancel** to discard the changes.
-
diff --git a/docs/integration/vision/linking-to-payroll.md b/docs/integration/vision/linking-to-payroll.md
index d489330..5cccade 100644
--- a/docs/integration/vision/linking-to-payroll.md
+++ b/docs/integration/vision/linking-to-payroll.md
@@ -18,15 +18,15 @@ SQL Vision is linked with SQL Payroll to process all cash rewards earned by empl
1. Click **Payroll** | **New Payroll**.
-
+ 
2. By default, the software will select the current month and all employees for processing. Confirm the configuration and click **Process**.
-
+ 
3. A list of employees with their entitled cash will be displayed for confirmation. Press **OK** to complete the process.
-
+ 
:::info[note]
@@ -38,7 +38,7 @@ All rewards will be classified as **Commission** by default. You can change the
:::warning[Warning]
-- You are **allowed** to process the reward for specific employees if the expected payout month is **within or before** the payroll process month.
+- You are **allowed** to process the reward for specific employees if the expected payout month is **within or before** the payroll process month.
- If you **choose not to process** particular reward, update the expected payout date for the employee in SQL Vision through **[Wallet | Manage Payout](wallet#manage-payoutentitlement)**.
:::
diff --git a/docs/integration/vision/login.md b/docs/integration/vision/login.md
index 47e65ae..0853794 100644
--- a/docs/integration/vision/login.md
+++ b/docs/integration/vision/login.md
@@ -4,11 +4,9 @@ description: A brief guide on logging into the SQL VISION mobile application
sidebar_position: 1
---
-# Login
-
1. Enter the user company email address
-
+ 
2. Submit email
@@ -19,7 +17,7 @@ sidebar_position: 1
3. **Resend OTP** allows user to request again an One-Time Password(OTP)
-
+ 
4. Verification
1. Enter the received OTP
diff --git a/docs/integration/vision/main-dashboard.md b/docs/integration/vision/main-dashboard.md
index 94922fc..9e039de 100644
--- a/docs/integration/vision/main-dashboard.md
+++ b/docs/integration/vision/main-dashboard.md
@@ -5,56 +5,71 @@ sidebar_position: 2
# Main Dashboard
## Quick Action Buttons
+
### Task
+
- Displays all available quests and tasks assigned to the user.
### Upskill
+
- Displays all available courses and courses in which the user is currently enrolled.
### Gantt Chart
+
- Displays a visual timeline of tasks and deadlines, allowing the user to track progress across project.
### Wallet
+
- Displays earned cash and coins, transaction history, and available rewards for redemption.
### Manage Task
+
- Allows user to create, edit and update tasks, track task progress and review completed tasks.
### Manage Upskill
+
- Allows user to create, edit and update courses, track course progress and review completed course.
### Manage Group
+
- Allows user to view, create, edit and delete groups.
## Status Card
+
- Displays the total number of tasks categorized by their current status:
- - Green: Completed tasks
- - Blue: Undue tasks
- - Red: Overdue tasks
+ - Green: Completed tasks
+ - Blue: Undue tasks
+ - Red: Overdue tasks
- **Navigation**: Selecting a status card redirects the user to the task list, with the tasks automatically filtered according to the selected status.
## Overdue Tasks
+
- Displays up to three tasks that have exceeded their deadlines, providing the user with a clear overview of the most urgent overdue items.
## Undue Tasks
+
- Displays up to three tasks that are currently in progress and have not yet reached their deadlines, providing the user with a quick view of ongoing responsibilities.
## Earned Card
+
+
- Displays the cash and coin rewards earned by the user for the current or previous month, allowing easy tracking of monthly earnings.
## Account Setting
+
### Profile
+
- Displays the user's basic information.
- **Statistics**: Shows the total cash and coin rewards earned by the user, along with the number of quests joined and courses registered.
- **Completion**: Provides progress indicators for targets, assignments, and courses, displaying both numeric counts and percentage completion.
@@ -72,6 +87,7 @@ Details are **view-only** and **cannot be edited** or **modified** from the mobi
:::
### Company Configuration (Manager)
+
- Enables managers to view and modify company settings, including the closing period (days), estimated payout day, and payment strategies.
- Managers can switch between Default and Customize strategies and use the search bar to quickly locate specific strategies.
- For more details about strategy, refer to [**Linking to SQL Account | Strategy**](./linking-to-account.md#strategy).
@@ -82,16 +98,21 @@ Details are **view-only** and **cannot be edited** or **modified** from the mobi
:::
### Switch Company
+
- Shows all companies the user is associated with, allowing seamless switching between different company accounts.
### Help
+
- Directs users to SQL Vision’s documentation page for support resources and user guides.
### Logout
+
- Ends the current session, logging the user out of the application and returning them to the login screen.
## Log File Review
+
-- Allows the user to view and manage pending and approved log files for assignments that have not been finalised yet.
\ No newline at end of file
+
+- Allows the user to view and manage pending and approved log files for assignments that have not been finalised yet.
diff --git a/docs/integration/vision/task/introduction.md b/docs/integration/vision/task/introduction.md
index 07c30c3..802ec54 100644
--- a/docs/integration/vision/task/introduction.md
+++ b/docs/integration/vision/task/introduction.md
@@ -6,15 +6,15 @@ sidebar_position: 1
There are 3 types of missions in task module: **Assignment**, **Target** and **Quest**.
-- **Assignment:**
+- **Assignment:**
An Assignment mission focuses on qualitative outcomes that require creativity and strategic thinking. These missions emphasize the quality of work and the process rather than measurable results.
-
+
*Example: Marketing Strategy Planning, Company Logo design.*
-- **Target:**
- A Target mission centers on quantitative outcomes with specific, measurable goals. The focus is on achieving clear, countable results.
-
+- **Target:**
+ A Target mission centers on quantitative outcomes with specific, measurable goals. The focus is on achieving clear, countable results.
+
*Example: Sales Target, Input Data.*
-- **Quest:**
+- **Quest:**
A Quest is ideal when the participant is not predetermined or when you want to invite all employees to participate.
diff --git a/docs/integration/vision/task/manager_view/assignment.md b/docs/integration/vision/task/manager_view/assignment.md
index 5e882ce..147b59e 100644
--- a/docs/integration/vision/task/manager_view/assignment.md
+++ b/docs/integration/vision/task/manager_view/assignment.md
@@ -23,15 +23,15 @@ Managers can view the assignment details that are created such as *title, descri
1. Navigate to: **Progress** > **Employee Progress Card** (highlighted in red)
-
+ 
-:::info Info
+ :::info Info
-**Progress** tab: Shows employees who have not yet reached **100%** of the milestone.
+ **Progress** tab: Shows employees who have not yet reached **100%** of the milestone.
-**Completed** tab: Shows employees who have achieved **100%** of the milestone.
+ **Completed** tab: Shows employees who have achieved **100%** of the milestone.
-:::
+ :::
2. Display employee's assignment details:
- Total cash and coin(s) earned (**Highlighted in red**)
@@ -45,9 +45,9 @@ Managers can view the assignment details that are created such as *title, descri
1. Navigate to: **Log File** > **Log File Card** (highlighted in red)
- Manager can view all unapproved log files submitted by the employees.
-
+ 
-2. Manager can view the log file details as shown below.
+2. Manager can view the log file details as shown below.
- **Actions:**
- Override
- Approve
@@ -128,7 +128,7 @@ Finalising assignment is an **irreversible** action.
1. Press **Info Icon** (highlighted in red)
-
+ 
2. User can view the milestone and bonus rewards
@@ -140,7 +140,7 @@ The code will match with the code in the summary table.
### Employee Progress
-1. Press **Employee Name** (highlighted in red)
+1. Press **Employee Name** (highlighted in red)
diff --git a/docs/integration/vision/task/manager_view/quest.md b/docs/integration/vision/task/manager_view/quest.md
index 527f747..3bf8214 100644
--- a/docs/integration/vision/task/manager_view/quest.md
+++ b/docs/integration/vision/task/manager_view/quest.md
@@ -7,28 +7,32 @@ sidebar_position: 4
Quest details are the same as the Assignment or Target details, depending on whether the Quest is an *Assignment-type* or *Target-type* mission.
For more information, refer below:
+
- [**Target**](target.md)
- [**Assignment**](assignment.md)
-| Approval Required | No Approval Required |
+| Approval Required | No Approval Required |
|---------------------------------------------------------------------------|----------------------------------------------------------------|
-|  | |
+|  | |
### Manage Participant
+
1. Press **Add People Icon** (highlighted in red)
-
+ 
-2. Filter menu on right top allows the manager to filter employees by Branch, Department, and HR group.
+2. Filter menu on right top allows the manager to filter employees by Branch, Department, and HR group.
-| View | Filter |
+| View | Filter |
|---------------------------------------------------------------------------|--------------------------------------------------------|
-|  | |
+|  | |
### Delete Employee Request
-1. Press **Delete**
+
+1. Press **Delete**
- Allows the manager to delete employee requests to join the Quest
### Approve Employee Request
-1. Press **Approve**
- - Allows the manager to approve employee requests to join the Quest.
\ No newline at end of file
+
+1. Press **Approve**
+ - Allows the manager to approve employee requests to join the Quest.
diff --git a/docs/integration/vision/task/manager_view/task_creation/assignment.md b/docs/integration/vision/task/manager_view/task_creation/assignment.md
index fa2c28c..0cbb07b 100644
--- a/docs/integration/vision/task/manager_view/task_creation/assignment.md
+++ b/docs/integration/vision/task/manager_view/task_creation/assignment.md
@@ -16,7 +16,6 @@ This feature is only available to **manager**.
-
| Properties | Description | Note |
|:-------------------------|:-----------------------------------------------------------------------------------|:--------:|
| **Title** | The title of the mission. | Required |
@@ -51,7 +50,6 @@ Select a **Project**, **Job**, and **Task** from the dropdown menus. If any fiel
-
| Properties | Description |
|---------------------|-----------------------------------------------------------------------|
| **Milestone (%)** | Text field to input the percentage of the milestone *(e.g., 20%)*. |
@@ -108,25 +106,28 @@ There are two types of payment methods:
### Participant Role
#### Admin
- - **Admin** is authorized to **manage and edit** the task.
- - Admin does not perform the task and therefore **is not entitled to any rewards**.
- - By default, the creator will be added as Admin and cannot be removed by anyone. *(Employee with yellow crown, as shown in image below, is the creator.)*
+
+- **Admin** is authorized to **manage and edit** the task.
+- Admin does not perform the task and therefore **is not entitled to any rewards**.
+- By default, the creator will be added as Admin and cannot be removed by anyone. *(Employee with yellow crown, as shown in image below, is the creator.)*
#### Participant
- - **Participant** is the employee responsible for performing the mission.
- - They are eligible to receive the reward.
+
+- **Participant** is the employee responsible for performing the mission.
+- They are eligible to receive the reward.
#### Consultant
- - **Consultant** provide **guidance or advice** on the mission but do not perform the task.
- - They are assigned in **[Step 2 - Rewards Information, Consultant Rewards section](#consultant-rewards)**.
+
+- **Consultant** provide **guidance or advice** on the mission but do not perform the task.
+- They are assigned in **[Step 2 - Rewards Information, Consultant Rewards section](#consultant-rewards)**.
### Features
-| Properties | Description |
+| Properties | Description |
|:------------------------|:-------------------------------------------------------------------------|
-| **Apply Group** | Allow you to apply group. See more in [**group**](../../../group#apply-group). |
+| **Apply Group** | Allow you to apply group. See more in [**group**](../../../group#apply-group). |
| **Clear** | Clears all content on the current page. |
| **Make Quest** | Converts your mission into a Quest. See more in [**quest**](quest). |
| **Add Person Icon** | Add employees as the participant type. |
@@ -145,14 +146,14 @@ There are two types of payment methods:
#### Side functions
-| Properties | Description |
+| Properties | Description |
|:------------------------|:-------------------------------------------------------------------------|
-| **Search** | Allows you to search for employees by their names. |
-| **[Filter](assignment#filter)** | Allow you to filter and sort the employee list. |
+| **Search** | Allows you to search for employees by their names. |
+| **[Filter](assignment#filter)** | Allow you to filter and sort the employee list. |
| **Select All** | Allow you to select all employees at once. |
#### Filter
A filter is available in the Employee List when selecting participants. The list can be filtered and sorted by **Branch**, **Department**, and **HR Group**, as shown in the image below.
-
\ No newline at end of file
+
diff --git a/docs/integration/vision/task/manager_view/task_creation/duplication.md b/docs/integration/vision/task/manager_view/task_creation/duplication.md
index b57d6e3..f882354 100644
--- a/docs/integration/vision/task/manager_view/task_creation/duplication.md
+++ b/docs/integration/vision/task/manager_view/task_creation/duplication.md
@@ -27,9 +27,10 @@ The mission card displays key details of the mission, including the Title, Creat
The Filter button allows you to filter your recent missions. Duplicated missions can be filtered by **Type**:
**Type:**
-- Assignment
-- Target
-- Quest Assignment
-- Quest Target
-
\ No newline at end of file
+- Assignment
+- Target
+- Quest Assignment
+- Quest Target
+
+
diff --git a/docs/integration/vision/task/manager_view/task_creation/quest.md b/docs/integration/vision/task/manager_view/task_creation/quest.md
index dc3d120..fe617a6 100644
--- a/docs/integration/vision/task/manager_view/task_creation/quest.md
+++ b/docs/integration/vision/task/manager_view/task_creation/quest.md
@@ -14,10 +14,10 @@ This feature is only available to **manager**.
-| Properties | Description |
+| Properties | Description |
|:--------------------------|:----------------------------------------------------------------------------|
-| **Join Permission** | Sets whether the quest requires manager approval to join. |
-| **Maximum Pax** | The maximum number of people allowed to join the quest. |
+| **Join Permission** | Sets whether the quest requires manager approval to join. |
+| **Maximum Pax** | The maximum number of people allowed to join the quest. |
| **Quest Visible By** | Specifies which Branch, Department, or HR Group can view and join the quest. |
| **Back** | Navigates to the previous page. |
| **Create** | Creates the quest. |
diff --git a/docs/integration/vision/task/manager_view/task_creation/target.md b/docs/integration/vision/task/manager_view/task_creation/target.md
index 1908e0d..196becd 100644
--- a/docs/integration/vision/task/manager_view/task_creation/target.md
+++ b/docs/integration/vision/task/manager_view/task_creation/target.md
@@ -29,17 +29,16 @@ This feature is only available to **manager**.
-
-| Properties | Description | Note |
-|:------------------------------------|:-----------------------------------------------------------------------------------------|:------------:|
-| **[Grouping Type](#grouping-type)** | Section to select the target grouping type, either *Individual* or *Team*. | Required |
-| **[Strategy](#strategy)** | Section to select the target strategy, with options predefined in **Company Configuration**. | Required |
-| **[Condition](#condition)** | Section to select the target condition. *(e.g., Between, More than)* | Required |
-| **[Target and Rewards](#target-and-rewards)**| Section to enter details about the targets and their associated rewards. | At least one |
-| **[Payment By](#payment-by)** | Section to select the payment method and specify the payout month. | Required |
-| **Clear** | Clears all content on the current page. | - |
-| **Back** | Navigates to the previous page. | - |
-| **Next** | Navigates to the next page. | - |
+| Properties | Description | Note |
+|:------------------------------------|:-----------------------------------------------------------------------------------------|:------------:|
+| **[Grouping Type](#grouping-type)** | Section to select the target grouping type, either *Individual* or *Team*. | Required |
+| **[Strategy](#strategy)** | Section to select the target strategy, with options predefined in **Company Configuration**. | Required |
+| **[Condition](#condition)** | Section to select the target condition. *(e.g., Between, More than)* | Required |
+| **[Target and Rewards](#target-and-rewards)**| Section to enter details about the targets and their associated rewards. | At least one |
+| **[Payment By](#payment-by)** | Section to select the payment method and specify the payout month. | Required |
+| **Clear** | Clears all content on the current page. | - |
+| **Back** | Navigates to the previous page. | - |
+| **Next** | Navigates to the next page. | - |
### Grouping Type
@@ -94,7 +93,7 @@ Suppose you’re managing a Sales Department and want to track Q1 sales targets:
**Condition** specifies the criteria for calculating target rewards.
-#### A. Between
+#### A. Between
The "Between" condition is designed to allocate rewards based on an employee’s achievement falling within a defined range. Specifically, rewards are granted when an employee's achievement meets the following criteria:
@@ -160,7 +159,6 @@ The "Less Than and Equal" condition is applied to reward employees who achieve r
-
| Properties | Description |
|-------------|----------------------------------------------------------------------------------------------------------|
| **Target** | Text field to input the target amount. (Note: Only the **Between** condition will have two text fields.) |
@@ -193,26 +191,31 @@ There are two types of payment methods:
## Step 3 - Participants Information
### Participant Role
+
The participant role in **Team and Individual Target** are different and works differently:
#### Admin
- - **Admin** is authorized to **manage and edit** the task.
- - Admin does not perform the task and therefore **is not entitled to any rewards**.
- - By default, the creator will be added as Admin and cannot be removed by anyone. *(Employee with yellow crown, as shown in image below, is the creator.)*
+
+- **Admin** is authorized to **manage and edit** the task.
+- Admin does not perform the task and therefore **is not entitled to any rewards**.
+- By default, the creator will be added as Admin and cannot be removed by anyone. *(Employee with yellow crown, as shown in image below, is the creator.)*
#### Team Leader *(Team only)*
- - The **Team Leader** is responsible for **leading the mission**.
- - A **leader is required** in a team target.
- - The leader does not contribute to the target directly, but is **entitled to rewards based on the combined performance of the Team Members**, as defined in **[Step 2 - Rewards Information](#step-2---rewards-information)**. See **[Grouping Type](#grouping-type)** for more details.
+
+- The **Team Leader** is responsible for **leading the mission**.
+- A **leader is required** in a team target.
+- The leader does not contribute to the target directly, but is **entitled to rewards based on the combined performance of the Team Members**, as defined in **[Step 2 - Rewards Information](#step-2---rewards-information)**. See **[Grouping Type](#grouping-type)** for more details.
#### Team Members *(Team only)*
- - **Team Members** are employees who **contribute their target achievements** toward the team goal.
- - The **combined performance of all team memebers** determines whether the Team Leader qualifies for a reward.
- - Rewards are **given only to Team Leader** if the total achievements meet the target set in **[Step 2 - Rewards Information](#step-2---rewards-information)**. See **[Grouping Type](#grouping-type)** for more details.
+
+- **Team Members** are employees who **contribute their target achievements** toward the team goal.
+- The **combined performance of all team memebers** determines whether the Team Leader qualifies for a reward.
+- Rewards are **given only to Team Leader** if the total achievements meet the target set in **[Step 2 - Rewards Information](#step-2---rewards-information)**. See **[Grouping Type](#grouping-type)** for more details.
#### Participant
- - **Participant** is the employee responsible for performing the mission.
- - They are eligible to receive the reward.
+
+- **Participant** is the employee responsible for performing the mission.
+- They are eligible to receive the reward.
### Features
@@ -220,9 +223,9 @@ The participant role in **Team and Individual Target** are different and works d
|:-----------:|:-----------------:|
|  |  |
-| Properties | Description |
+| Properties | Description |
|:------------------------|:-------------------------------------------------------------------------|
-| **Apply Group** | Allow you to apply group. See more in [**group**](../../../group#apply-group). |
+| **Apply Group** | Allow you to apply group. See more in [**group**](../../../group#apply-group). |
| **Clear** | Clears all content on the current page. |
| **Make Quest** | Converts your mission into a Quest. See more in [**quest**](quest). |
| **Add Person Icon** | Add employees as the participant type. |
@@ -241,8 +244,8 @@ The participant role in **Team and Individual Target** are different and works d
#### Side functions
-| Properties | Description |
+| Properties | Description |
|:------------------------|:-------------------------------------------------------------------------|
-| **Search** | Allows you to search for employees by their names. |
-| **[Filter](assignment#filter)** | Allow you to filter and sort the employee list. |
-| **Select All** | Allow you to select all employees at once. |
\ No newline at end of file
+| **Search** | Allows you to search for employees by their names. |
+| **[Filter](assignment#filter)** | Allow you to filter and sort the employee list. |
+| **Select All** | Allow you to select all employees at once. |
diff --git a/docs/integration/vision/task/manager_view/task_creation/task-creation.md b/docs/integration/vision/task/manager_view/task_creation/task-creation.md
index e0b7627..9d17641 100644
--- a/docs/integration/vision/task/manager_view/task_creation/task-creation.md
+++ b/docs/integration/vision/task/manager_view/task_creation/task-creation.md
@@ -13,13 +13,13 @@ To create a new mission, navigate to **Main Dashboard | Manage Task**. Click the
-### Duplicate Existing
+## Duplicate Existing
This section allows you to view and create a copy of an existing mission.
- [**Duplication**](duplication)
-### Create New
+## Create New
This section allows you to create a new mission from scratch, choosing between Assignment and Target types.
@@ -27,4 +27,3 @@ This section allows you to create a new mission from scratch, choosing between A
- [**Target**](target)
-
diff --git a/docs/integration/vision/task/manager_view/task_creation/task-edit.md b/docs/integration/vision/task/manager_view/task_creation/task-edit.md
index 63aa082..ccdc6b4 100644
--- a/docs/integration/vision/task/manager_view/task_creation/task-edit.md
+++ b/docs/integration/vision/task/manager_view/task_creation/task-edit.md
@@ -10,7 +10,7 @@ This feature is only available to **manager** and **admin**.
:::
-To edit a mission, go to **Main Dashboard | Manage Task | press on a mission card | press Edit Button**.
+To edit a mission, go to **Main Dashboard | Manage Task | press on a mission card | press Edit Button**.
@@ -26,8 +26,8 @@ There are certain conditions for editing a mission, as stated in the table below
| **Bonus** | Assignment | Ongoing | Once a member achieves 100% of a milestone, the associated bonus cannot be changed. You can add a new bonus, but it will also become unchangeable once applied. |
| **Grouping Type, Strategy and Condition**| Target | Ongoing | Grouping type, strategy and condition cannot be changed after mission is ongoing. |
-#### Non-editable Field
+### Non-editable Field
The non-editable fields will be greyed out as shown in the picture below.
-
\ No newline at end of file
+
diff --git a/docs/integration/vision/upskill/manager_view/upskill-creation.md b/docs/integration/vision/upskill/manager_view/upskill-creation.md
index 30f8bcf..6bffe3b 100644
--- a/docs/integration/vision/upskill/manager_view/upskill-creation.md
+++ b/docs/integration/vision/upskill/manager_view/upskill-creation.md
@@ -3,16 +3,13 @@ title: Upskill Creation
description: A brief guide on upskill creation
sidebar_position: 1
---
-
-# Upskill Creation
-
## Creation Steps
### Step 1 - Course Information
-| Properties
| Description
| Required | Note
|
+| Properties | Description | Required | Note |
| :----------------------------------- | :------------------------------------------------- | :------: | :-------------------------------------------------------------------------------------------------------------------------------------- |
| **Title** | The title of the course. | ✓ | - |
| **Description** | A detailed description of the course. | ✗ | - |
@@ -21,38 +18,39 @@ sidebar_position: 1
| **Clear** | Clears all course information on the current page. | - | **Manager:**
Clears all course information.
**Tutor Assistants:**
Clears all excepts tutor and assistants information. |
| **Next** | Navigate to the next page. | - | - |
-
#### Tutor
-- **Tutor** is the employee responsible for giving lessons and providing guidance throughout the learning process in the course.
+
+- **Tutor** is the employee responsible for giving lessons and providing guidance throughout the learning process in the course.
- There will be only **one** lead tutor in every course.
-
-#### Assistant Tutor
-- **Assistant Tutor** plays a role in supporting the lead tutor in completing the course smoothly.
+#### Assistant Tutor
+
+- **Assistant Tutor** plays a role in supporting the lead tutor in completing the course smoothly.
- There can be **multiple** assistant tutors in every course.
-
-
### Step 2 - Sessions Information
+
-| Properties
| Description
| Note
|
+
+| Properties | Description | Note |
|:-------------------------------------|:--------------------------------------| :----------------------------- |
| **Date Range** | Display the start date and end date of the course which is determined by first and last session's date. | -
-| **Rewards By Session / Completion** | Determine whether the reward is calculated **by session** or **by completion**.
**By Completion**
- Rewards are issued when participants achieve full attendance across all sessions *(100% attendance)*.
**By Session**
- Rewards are issued once participants attend any session. | **On:**
Rewards calculate by session.
**Off:**
Rewards calculate by completion.
To know more about rewards type, [click here](../introduction#rewards-type)|
+| **Rewards By Session / Completion** | Determine whether the reward is calculated **by session** or **by completion**.
**By Completion**
- Rewards are issued when participants achieve full attendance across all sessions *(100% attendance)*.
**By Session**
- Rewards are issued once participants attend any session. | **On:**
Rewards calculate by session.
**Off:**
Rewards calculate by completion.
To know more about rewards type, [click here](../introduction#rewards-type)|
| **Session (Dropdown)**| The details of each session of the course. | - |
| **Add** | Add more sessions to the course. | - |
| **Back** | Navigate back to the previous page. | - |
| **Next** | Navigate to the next page. | - |
-
#### Session Details
+
-| Properties
| Description
| Required
| Note
|
+
+| Properties | Description| Required| Note |
|:--------------------------|:--------------------------------------|:-:|:------------------------------------|
| **Title** | The title of the session. | ✓ | - |
| **Description** | A detailed description of the session.| ✗ | - |
@@ -61,42 +59,39 @@ sidebar_position: 1
| **End Time** | The end time of the session. | ✓ | Cannot be earlier than start time |
| **Venue** | The venue of the session. | ✗ | - |
-
-
### Step 3 - Rewards Information
-| Properties
| Description
| Required | Note
|
+| Properties | Description | Required | Note |
| :----------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Session Rewards** | **Completion-based course:** There is only **one** completion reward for the entire course.
**Session-based course:** There are **multiple** session rewards. Each session will have their respective session rewards. | ✗ | Default reward is "0". |
-| **Payment by** | Type of payment method for this course.
This payment method only applicable for cash only, coins will be paid immediately upon entitlement. | ✓ | Same concept as in task creation's payment by, [click here](../../task/manager_view/task_creation/assignment#payment-by) |
-| **Bonus Rewards** | Extra criterias that employee can achieve to earn more rewards. | ✗ | Default reward is "0".
If a value is specified in cash or coins, the bonus criteria must be provided.
Same concept as in task creation's bonus, [click here](../../task/manager_view/task_creation/assignment#bonus) |
+| **Payment by** | Type of payment method for this course.
This payment method only applicable for cash only, coins will be paid immediately upon entitlement. | ✓ | Same concept as in task creation's payment by, [click here](../../task/manager_view/task_creation/assignment#payment-by) |
+| **Bonus Rewards** | Extra criterias that employee can achieve to earn more rewards. | ✗ | Default reward is "0".
If a value is specified in cash or coins, the bonus criteria must be provided.
Same concept as in task creation's bonus, [click here](../../task/manager_view/task_creation/assignment#bonus) |
| **Clear** | Clears all rewards on the current page. | - | **Manager:**
Clears all rewards.
**Tutor Assistants:**
No clear button as they cannot edit rewards. |
| **Back** | Navigate to the previous page. | - | - |
| **Next** | Navigate to the next page. | - | - |
-
#### Session rewards
+
- **Completion-based course:** There is only **one** completion reward for the entire course.
- **Session-based course:** There are **multiple** session rewards. Each session will have their respective session rewards.
-
-
### Step 4 - Participants Information
+
-| Properties
| Description
| Note
|
+| Properties | Description | Note |
|:-----------------------------|:-----------------------------------------------------------------------------------|:---------|
-| **Apply Group** | Apply groups with preset roles for both admin and participant. | To know more about group, [click here](../../group/#apply-group).
+| **Apply Group** | Apply groups with preset roles for both admin and participant. | To know more about group, [click here](../../group/#apply-group).
| **Clear** | Clears all admin and participants on the current page. | Uneditable participants will not be cleared.
| **Creator** | Creator of course will be the first admin and cannot be removed. | - |
-| **Add Admin** | Lead you to the select admin page. | To know more about admin, [ click here](../introduction#course-role).
+| **Add Admin** | Lead you to the select admin page. | To know more about admin, [click here](../introduction#course-role).
| **Remove Admin** | Remove selected admin. | The first admin (creator) cannot be removed.
-| **Is Public** | Determine whether this course is public or private. | **On:**
Public course.
**Off:**
Private course.
To know more about public and private course, [ click here](../introduction#course-privacy).
+| **Is Public** | Determine whether this course is public or private. | **On:**
Public course.
**Off:**
Private course.
To know more about public and private course, [click here](../introduction#course-privacy).
| **Available Slots** | The available slots left for this course *(number of selected participants / maximum pax)*. |As this is **private** course, so there is **no maximum pax**, hence the maximum pax is "-".|
-| **Add Participants** | Lead you to the select participants page. | To know more about participants, [ click here](../introduction#course-role).
+| **Add Participants** | Lead you to the select participants page. | To know more about participants, [click here](../introduction#course-role).
| **Editable Employees** | Currently selected employees that **participate** in this course. | - |
| **Remove Participant** | Remove selected participant. | - |
| **Uneditable Employees** | Previously selected participants that cannot be removed. | Only will have this section once the course has started (ongoing).
Once the course has started, only newly added employees is editable.|
@@ -106,16 +101,16 @@ sidebar_position: 1
## Edit Course
- The diagram below illustrates the **admin's** and **tutor assistants'** edit permissions based on the different course statuses.
-- To know more about course status, [click here](../introduction#course-status).
+- To know more about course status, [click here](../introduction#course-status).
:::info[Note]
Tutor and assistants cannot edit any rewards-related field.
:::
-#### **Manager:**
+**Manager**:
-#### **Tutor & Assistants:**
+**Tutor & Assistants:**
diff --git a/docs/integration/vision/wallet.md b/docs/integration/vision/wallet.md
index 67b74ba..de1c5f6 100644
--- a/docs/integration/vision/wallet.md
+++ b/docs/integration/vision/wallet.md
@@ -3,8 +3,11 @@ sidebar_position: 7
---
# Wallet
+
## User View
+
### Wallet Home Page
+
- Displays a card showing the amount of the upcoming payout.
- Shows a leaderboard highlighting the top-earning employee.
- Provides a quest list for employees to join.
@@ -24,13 +27,14 @@ sidebar_position: 7
|:---:|---|:---:|
### Payout (Based on Expected Payout Date)
+
- Switch between Upcoming and History tabs to filter data.
- View a bar chart visualising earnings.
- See a monthly payout grid, with each month tappable to display a detailed pop-up.
- In the History tab, an exclamation mark will appear for any unpaid payouts.
- 
-
+
+
- If a payout has been officially paid, the **payment date** will be shown instead of the **entitled date**.
- For payouts past the expected payout date, a **Paid** or **Unpaid** status will indicate whether the payment has been made.
@@ -39,6 +43,7 @@ sidebar_position: 7
|:---:|---|:-------------------------------------------------------------------------------:|
### Entitlement (Based On Achieved Date)
+
- View a bar chart visualising earnings.
- See a monthly entitlement grid, with each month tappable to display a detailed pop-up.
@@ -46,6 +51,7 @@ sidebar_position: 7
|:---:|---|:---:|
### Coin Transactions
+
- View a line chart visualising coin earnings and spendings.
- Browse a list of coin transaction logs.
- Use segmented buttons to filter the displayed data.
@@ -56,22 +62,22 @@ sidebar_position: 7
- Use the dropdown button to sort the transaction list\
-
## Manager View
+
### Manage Payout/Entitlement
+
Both **Payout** and **Entitlement** views share a similar layout and functionality.
- - Tap the icon (highlighted in red) to navigate to **Manage Payout**, which displays the company’s total payout or entitlement.
-
+- Tap the icon (highlighted in red) to navigate to **Manage Payout**, which displays the company’s total payout or entitlement.
+
|  | ➜ |  |
|:---:|---|:---:|
- - Tapping an **Upcoming Payout card** in the grid will now display a list of employees.
+- Tapping an **Upcoming Payout card** in the grid will now display a list of employees.
- In the **History Payout** tab, a red exclamation mark will appear next to an employee’s avatar if their payout remains unpaid past the expected payout date.\
-
- - Tapping an employee’s name will display their payout or entitlement details.\
+- Tapping an employee’s name will display their payout or entitlement details.\
(*This view will differ depending on whether you are in the Payout History or Entitlement view, compared to the Upcoming Payout view.*)\
**A. Payout History/Entitlement** \
@@ -87,20 +93,19 @@ Both **Payout** and **Entitlement** views share a similar layout and functionali
| **4) After selecting, tap on submit to save changes** |||||
|  |||||
- - Use the **Search Employee** button to find the payout or entitlement information of a specific employee.
+- Use the **Search Employee** button to find the payout or entitlement information of a specific employee.
|  | ➜ |  | ➜ | |
|:---:|---|:---:|---|:---:|
- - Use the **Stats icon** to compare the payout or entitlement history of up to three employees.
+- Use the **Stats icon** to compare the payout or entitlement history of up to three employees.
|  | ➜ |  | ➜ | |
|:---:|---|:---:|---|:---:|
- ### Manage Coin Transactions
- - Tap the **top-right icon**, select an employee from the list, and view that employee’s coin transactions.
+### Manage Coin Transactions
+
+- Tap the **top-right icon**, select an employee from the list, and view that employee’s coin transactions.
|  | ➜ |  | ➜ | |
|:---:|---|:---:|---|:---:|
-
-
diff --git a/docs/miscellaneous/epf/overview.md b/docs/miscellaneous/epf/overview.md
index f339c76..940f7f6 100644
--- a/docs/miscellaneous/epf/overview.md
+++ b/docs/miscellaneous/epf/overview.md
@@ -22,6 +22,20 @@ tags: ["SQL Payroll", "EPF"]
+## EPF Table
+
+This function is to show a list of EPF Amount which is need to be pay/deduct from the Salary by Employee & Employer.
+
+1. User can manually change the Rate by Amount or by percentage.
+2. Just Click Rebuild after the changes.
+3. Any changes here will not affect the Process of Payroll.
+
+
+
+:::info[Government Official Portal]
+ [Kumpulan Wang Simpanan Pekerja](http://www.kwsp.gov.my/)
+:::
+
## Frequently Asked Questions (FAQs)
### How Does SQL Payroll manage EPF contributions?
@@ -43,6 +57,8 @@ You can set the EPF rate at 19% for employees In the management level. The emplo
- If employee is above 60 years old, the employee’s EPF contribution rate will be 0% while the employer’s contribution will be 4%
+
+
### Are employees above the age of 75 required to contribute for EPF?
- No. No contributions are required from both parties.
diff --git a/docs/miscellaneous/pcb.md b/docs/miscellaneous/pcb.md
index 0093f4d..f3f397c 100644
--- a/docs/miscellaneous/pcb.md
+++ b/docs/miscellaneous/pcb.md
@@ -15,6 +15,21 @@ tags: ["SQL Payroll", "PCB"]
+## PCB Table
+
+This function is to show a list of PCB Amount which is need to be pay/deduct from the Salary by Employee & Employer.
+
+This Table is for employer who does not use computerised payroll software or proses payroll manually.
+
+
+
+:::info[Government Official Portal]
+ - [Inland Revenue Board Of Malaysia (LHDN)](http://www.hasil.gov.my/)
+ - [For PCB Calculation Checking](http://ekl.hasil.gov.my/pcbcalc/index.php?&lang=may)
+:::
+
## Fun Facts
+
+## PCB & CP38 Receipt No & Date
diff --git a/docs/miscellaneous/socso.md b/docs/miscellaneous/socso.md
index e5f6565..b52be34 100644
--- a/docs/miscellaneous/socso.md
+++ b/docs/miscellaneous/socso.md
@@ -17,3 +17,19 @@ tags: ["SQL Payroll", "SOCSO"]
## SOCSO First Category and Second Category
+
+## Socso Table
+
+- **View | View Socso Table**
+
+This function is to show a list of Socso Amount which is need to be pay/deduct from the Salary by Employee & Employer.
+
+User can change the option by untick the Option Uses Standard Socso Table.
+
+Any changes here will not affect the Process of Payroll.
+
+
+
+:::info[Government Official Portal]
+ [Pertubuhan Keselamatan Sosial](http://www.perkeso.gov.my/)
+:::
diff --git a/docs/usage/File/_category_.json b/docs/usage/File/_category_.json
new file mode 100644
index 0000000..28f6fd2
--- /dev/null
+++ b/docs/usage/File/_category_.json
@@ -0,0 +1,8 @@
+{
+ "label": "File",
+ "position": 1,
+ "link": {
+ "type": "generated-index",
+ "description": "File guide"
+ }
+}
\ No newline at end of file
diff --git a/docs/usage/File/company-profile.md b/docs/usage/File/company-profile.md
new file mode 100644
index 0000000..2402dd2
--- /dev/null
+++ b/docs/usage/File/company-profile.md
@@ -0,0 +1,51 @@
+---
+sidebar_position: 1
+title: Company Profile
+description: File Guide
+slug: /usage/file/company-profile
+tags: ["SQL Payroll", "Usage"]
+---
+
+A guide to Maintain Company Profile in SQL Payroll
+
+## Setup
+
+1. Navigate to File > Company Profile
+
+ 
+
+2. Fill up "General" section
+
+ 
+
+3. Fill up "EPF" Section
+
+ 
+
+ 
+
+4. Fill up "Tax" Section
+
+ 
+
+ 
+
+5. Fill up "SOCSO" Section
+
+ 
+
+ 
+
+6. Fill up "Zakat" Section
+
+ 
+
+7. Fill up " Officer" Section
+
+ 
+
+ 
+
+8. Fill up "Dealer" Section
+
+ 
diff --git a/docs/usage/File/import-data.md b/docs/usage/File/import-data.md
new file mode 100644
index 0000000..7b80c47
--- /dev/null
+++ b/docs/usage/File/import-data.md
@@ -0,0 +1,166 @@
+---
+sidebar_position: 2
+title: Import Data
+description: Import Data Guide
+slug: /usage/file/import-data
+tags: ["SQL Payroll", "Usage"]
+---
+
+## UBS Payroll
+
+### Type Information/Data Import (UBS)
+
+1. Maintain Branch (branch.dbf)
+2. Maintain Category (category.dbf)
+3. Maintain Department (dept.dbf)
+4. Maintain Project (project.dbf)
+5. Maintain Race (race.dbf)
+6. Maintain Allowance (awtable.dbf)
+7. Maintain Deduction (dedtable.dbf)
+8. Maintain Employee (pmast.dbf)
+
+### Requirement (UBS)
+
+1. UBS Payroll Version 9 and above
+2. UBS Payroll Data (after restore)
+3. SQL Payroll Application
+4. Empty Database of SQL Payroll
+
+### Steps (UBS)
+
+If your pc do not install UBS Payroll follow step 1 , if you had install UBS Payroll in your pc IGNORE step 1
+
+1. Extract your UBS Payroll file by using 7zip.
+
+ 
+
+ - Download 7 Zip to extract UBS Payroll Backup file.
+ Download Path for 7 Zip : [Window 32 Bits](https://www.7-zip.org/a/7z2501.msi) ,[Window 64 Bits](https://www.7-zip.org/a/7z2501-x64.msi)
+
+2. Create a Empty Database in SQL Payroll
+
+ 
+
+ 
+
+ 
+
+3. Login the Empty Database of SQL Payroll
+
+ 
+
+4. Click File | Import Data | UBS Payroll
+
+ 
+
+5. Select the the extracted backup folder or UBS Payroll Directory Folder & Click Ok to Start Import
+
+ 
+
+ If failed to connect and prompt message "Provider cannot be found. It may not be properly install".
+ You need to download and install the file [VFPOLEDBSetup.msi](https://www.microsoft.com/en-my/download/details.aspx?id=14839)
+
+6. Click Close to finish import.
+ 
+
+7. Go Human Resources | Maintain Employee to check all your Employee List imported successfully from UBS Payroll.
+
+ 
+
+ 
+
+### FAQ (UBS)
+
+1. Get message "Provider cannot be found ....it may not be properly installed" when try to import the UBS backup folder.
+Answer: The computer need to add Microsoft Visual FocPro Driver in ODBC Data Source Adminstrator (control panel)
+
+## AutoCount Payroll (AutoCount)
+
+### Type Information/Data Import (AutoCount)
+
+1. Company Profile (PROFILE)
+2. Maintain Payment Method (BANK)
+3. Maintain Department (DEPT)
+4. Maintain Race (RACE)
+5. Maintain Allowance (ALLOWANCE)
+6. Maintain Deduction (DEDUCTION)
+7. Maintain Employee (EMPLOYEE)
+
+### Requirement (AutoCount)
+
+1. Backup of Autocount Payroll File which normally the file extention is P01 (Eg. SAMPLE COMPANY SDN BHD [2012] - 20120606.P01)
+2. SQL Payroll Application
+3. Empty Database of SQL Payroll
+
+### Steps (AutoCount)
+
+If your pc do not install UBS Payroll follow step 1 , if you had install UBS Payroll in your pc IGNORE step 1
+
+1. Login the Empty Database of SQL Payroll
+2. Click File | Import Data | AutoCount Payroll
+
+ 
+
+3. Select the Autocount Backup File & Click Open
+
+ 
+
+4. Click Ok To Start Import
+
+ 
+
+5. Click Close to Finish import.
+
+## Others
+
+### Type Information/Data Import
+
+1. Pending Overtime
+2. Pending Deduction
+3. Leave Application
+4. Pending Wages
+5. Pending Unpaid Leave
+
+### Steps
+
+Below example is import Pending Overtime & is applicable for other Attendance System
+
+1. Click File | Import Data | [Select the Time Attendance] (eg ELID, SynGlobal Time Attendance, etc)
+
+ 
+
+2. Click the 3 Dot Button to Open
+
+ 
+
+ | Field | Properties |
+ |---|---|
+ |Data From|Is the path for the CSV file to be import.|
+ |New Setting...|Create New Setting for New Import.|
+ |Load Setting...|Use the saved Setting created/saved on last import from Database.|
+ |Load From File...|Use the saved Setting created/saved on last import from External XML File.|
+ |Manage Setting Button|For Delete the saved Setting created/saved on last import from Database (See below picture).|
+
+ 
+
+3. Click Next
+
+ 
+
+ 
+
+ |Field|Properties|
+ |---|---|
+ |Description|Setting Name.|
+ |Save button|Save the current setting for future use.|
+ |From row|From which row number in the CSV file start to import.|
+ |Separator Options|Type of separator in the CSV file.|
+ |Field|Which Column To Map and Import.|
+
+4. Click Finish button after finish select & Map all the fields.
+
+ 
+
+5. Click Ok
+
+ 
diff --git a/docs/usage/general/_category_.json b/docs/usage/general/_category_.json
new file mode 100644
index 0000000..9ad3948
--- /dev/null
+++ b/docs/usage/general/_category_.json
@@ -0,0 +1,9 @@
+{
+ "label": "General",
+ "position": 7,
+ "link": {
+ "type": "generated-index",
+ "description": "General guide of SQL Payroll",
+ "slug": "/usage/general"
+ }
+}
\ No newline at end of file
diff --git a/docs/usage/batch-email.md b/docs/usage/general/batch-email.md
similarity index 59%
rename from docs/usage/batch-email.md
rename to docs/usage/general/batch-email.md
index 8a8af58..8abe266 100644
--- a/docs/usage/batch-email.md
+++ b/docs/usage/general/batch-email.md
@@ -1,7 +1,7 @@
---
title: Batch Email
description: A guide to do batch email (Email Client Batch & SMTP Batch)
-slug: /usage/batch-email
+slug: /usage/general/batch-email
tags: ["SQL Payroll", "Batch Email", "Email Client Batch", "SMTP Batch"]
---
@@ -11,37 +11,37 @@ Make sure you had done setting the template in Maintain Employee.
## Setting in Maintain Employee
-You can [CLICK HERE]() to go Batch Email Link
+You can open the Batch Email guide for Fast Report (E-Mail Client Batch / E-Mail Native): [Batch Email guide](https://docs.sql.com.my/sqlacc/usage/tools/fast-report/guide#fast-report---e-mail-client-batch--e-mail-native)
1. Click on 3.2.2 Version 1.2021.196.166 & above
- 
+ 
2. Scroll down until see this Sample E-Mail Template (Version 1.2021.196.166 & above) > Click on Expand
- 
+ 
3. Copy all
- 
+ 
4. Open your SQL Payroll System
5. Navigate to **Human Resource** > **Maintain Employee** and click New
- 
+ 
6. Click 🔽 beside **More**
- 
+ 
7. Click on Paste Employee
- 
+ 
8. After Paste Employee you will see Employee Code as **EMAIL** and the PDF Password Setting at **Note**
- 
+ 
## Setting PDF Password
@@ -65,13 +65,13 @@ Only available in Version 1.2021.2066.174 & above
[PrivatePassword]
```
- 
+ 
2. Under Employee profile set the password at **Name 2**
> For Example : **_testing_** is the PDF Password
- 
+ 
### Scenario 2 : Setting Global PDF Password by UseName and ICPass
@@ -107,7 +107,7 @@ Only available in Version 1.2021.2066.174 & above
>
> The password is : **L@014321**
- 
+ 
### Scenario 3 : Setting Global PDF Password
@@ -137,7 +137,7 @@ This settings configures **all employees** to have the same password
> The PDF Password is **_‘BatchEmail’_**
- 
+ 
### Scenario 4 : Setting Private/ Individual Password
@@ -179,7 +179,7 @@ Must set for all Employees
```
- 
+ 
## Send Payslip by Batch Email
@@ -191,38 +191,38 @@ Make sure your pc had install window email (Ex : Outlook or Thunderbird)
1. Go to Payroll > Print Pay Slip ...
- 
+ 
2. Filter your process you wish to batch email > Apply
- 
+ 
3. Click 🔽 Beside Printer icon
4. Click on Export to E-Mail Client (Batch)
- 
+ 
5. Select your payslip format > OK
- 
+ 
6. After click ok will prompt window and show has been sent to recipient email, mean success send out
- 
+ 
### E-Mail SMTP (Batch)
:::info[note]
Make Sure you had create App Password
-- If you’re using Gmail , you can [CLICK HERE](https://support.google.com/accounts/answer/185833?hl=en) to create your App Password
+- If you’re using Gmail, see Google’s guide to create an App Password: [Create an App Password](https://support.google.com/accounts/answer/185833?hl=en)
:::
1. Go to **File** > **Company Profile**
- 
+ 
2. Select Email Setting from the tabs
@@ -230,26 +230,26 @@ Make Sure you had create App Password
> \*\*Password : Is your App Password
- 
+ 
4. Go to **Payroll**, click **Print Pay Slip**
- 
+ 
5. Filter your process you wish to batch email > Apply
- 
+ 
6. Click 🔽 Beside Printer icon
7. Click on Export to E-Mail SMTP (Batch)
- 
+ 
8. Select your payslip format > OK
- 
+ 
9. After click ok will prompt window and show has been sent to recipient email, mean success send out
- 
+ 
diff --git a/docs/usage/change-payroll-description.md b/docs/usage/general/change-payroll-description.md
similarity index 55%
rename from docs/usage/change-payroll-description.md
rename to docs/usage/general/change-payroll-description.md
index 2cdb497..d858130 100644
--- a/docs/usage/change-payroll-description.md
+++ b/docs/usage/general/change-payroll-description.md
@@ -1,7 +1,7 @@
---
title: Change Payroll Description
description: A guide on how to change the payroll description
-slug: /usage/change-payroll-description
+slug: /usage/general/change-payroll-description
tags: ["SQL Payroll", "Description"]
---
@@ -9,7 +9,7 @@ tags: ["SQL Payroll", "Description"]
Picture below shows a default payroll description
:::
-
+
## Setup
@@ -17,20 +17,20 @@ Picture below shows a default payroll description
2. Select the month, and key in the description that you want in “Description 1”.
- 
+ 
3. Press Process
- 
+ 
4. You will see the description on the top of the month end.
5. If you click on “Past Payroll” icon and you will see the month end description that you created.
- 
+ 
To change the payroll description AFTER processed,
6. At Open Payroll, press F2 key and amend the description directly.
- 
+ 
diff --git a/docs/usage/daily-pay-method.md b/docs/usage/general/daily-pay-method.md
similarity index 76%
rename from docs/usage/daily-pay-method.md
rename to docs/usage/general/daily-pay-method.md
index 9eb7c1d..aef2a34 100644
--- a/docs/usage/daily-pay-method.md
+++ b/docs/usage/general/daily-pay-method.md
@@ -1,7 +1,7 @@
---
title: Daily Pay Method
description: A guide to process daily pay method for employee
-slug: /usage/daily-pay-method
+slug: /usage/general/daily-pay-method
tags: ["SQL Payroll", "Daily Pay"]
---
@@ -23,7 +23,7 @@ This guide explains how to set daily payment for your employees. Given the below
- Working Day Per Month = 1
- Working Hour Per Day = 8
- 
+ 
2. Input the daily rate in maintain employee
@@ -31,7 +31,7 @@ This guide explains how to set daily payment for your employees. Given the below
2. Input the daily rate (RM16.00 per day) in the Wages field.
3. Set the contribution to “DAILY”.
- 
+ 
3. Open pending payroll – Wages
@@ -41,7 +41,7 @@ This guide explains how to set daily payment for your employees. Given the below
- Work unit = 1 day
- Rate = RM16.00 per day
- 
+ 
4. Open pending payroll – Overtime
@@ -52,21 +52,21 @@ This guide explains how to set daily payment for your employees. Given the below
- Work Unit = No.of hours (OT)
- Rate = 1.5 rate per hour (OT)
- 
+ 
5. Final payroll process
1. Navigate to **Payroll** > **New Payroll**
2. Click on Final followed by Process button.
- 
+ 
6. Check the wages records
1. Click on the Wages to retrieve the detailed wages records.
2. You will see the records are posted from wages pending for the month.
- 
+ 
7. Check the overtime records
@@ -82,9 +82,10 @@ This guide explains how to set daily payment for your employees. Given the below
- Hourly Pay Rate = RM16.00 / 8 hrs = RM2.00 per hour
Therefore, the overtime calculation is
+
|Code|Work Unit|Rate|Pay Rate|OT Pay Rate|Amount|
|:--:| :-----: |:--:|:------:|:---------:|:----:|
|HW15|4hrs|1.5|2.00|RM2.00 x 1.5 = RM3.00|RM3.00 x 4 hrs = RM12.00|
|HW15|4hrs|1.5|2.00|RM2.00 x 1.5 = RM3.00|RM3.00 x 3 hrs = RM9.00|
- 
+ 
diff --git a/docs/usage/final-payroll.md b/docs/usage/general/final-payroll.md
similarity index 68%
rename from docs/usage/final-payroll.md
rename to docs/usage/general/final-payroll.md
index d2a1e0b..12cde43 100644
--- a/docs/usage/final-payroll.md
+++ b/docs/usage/general/final-payroll.md
@@ -1,7 +1,7 @@
---
title: Final Payroll
description: A guide to do final payroll to process the net pay amount based on computerized calculation
-slug: /usage/final-payroll
+slug: /usage/general/final-payroll
tags: ["SQL Payroll", "Final"]
---
@@ -9,13 +9,13 @@ tags: ["SQL Payroll", "Final"]
1. On top of your screen, look for **Human Resource** > **Maintain Employee** > double click any one of the employee and go into this screen
- 
+ 
:::info[note]
Make sure you have selected the correct wages type and key in the wages amount
:::
- 
+ 
- This screen is to set your employees monthly fixed allowance
- Click on the ‘+’ button where the red arrow pointed, then select the type of allowance that you maintained in allowance maintenance
@@ -23,22 +23,22 @@ tags: ["SQL Payroll", "Final"]
2. On top of your screen, look for **Human Resource** > **Maintain Employee** > double click any one of the employee and go into this screen
- 
+ 
- Select the correct year and month , for those that are not cut off at month end you can click on the ‘…’ button at where the red arrow pointed to select the cut off day.
- Description2, ref1 and ref2, you can key in as reference purpose.
1. Click on the process to proceed, then you will see the screen below
- 
+ 
2. Click on the print payslip to check on the amount that calculated from system
- 
+ 
You can scroll to the right to check completely
- 
+ 
3. Assume it is all correct amount, just click on the preview to check on how it will be printed out with 5 kinds of designs
@@ -46,17 +46,17 @@ tags: ["SQL Payroll", "Final"]
- Refer image below to export to other documents, for printing jiust click on the printer icon at the most left
- 
+ 
- The image below is a sample of pdf file after exported
- 
+ 
5. Follow the steps below:
1. Back to step **2.ii**
- 
+ 
- This is print payroll summary (a quick summary to check on all those wages, allowance, gross pay, epf , socso etc… of all employees)
@@ -64,9 +64,9 @@ tags: ["SQL Payroll", "Final"]
2. **Payment summary**
- 
+ 
- 
+ 
Click on the Blue coirage report, then you will go to a screen that show you how the cash notes is being paid to the employees.
@@ -76,8 +76,8 @@ tags: ["SQL Payroll", "Final"]
- It will display the employee epf, socso / employer epf, socso correspondingly.
- 
+ 
- You can double click your employee name to check on its individual’s amount
- 
+ 
diff --git a/docs/usage/online-mobile-approval.md b/docs/usage/general/online-mobile-approval.md
similarity index 71%
rename from docs/usage/online-mobile-approval.md
rename to docs/usage/general/online-mobile-approval.md
index 4666c4f..01ea8d6 100644
--- a/docs/usage/online-mobile-approval.md
+++ b/docs/usage/general/online-mobile-approval.md
@@ -1,7 +1,7 @@
---
title: Online Mobile Approval
description: A guide to carry out online mobile approval
-slug: /usage/online-mobile-approval
+slug: /usage/general/online-mobile-approval
tags: ["SQL Payroll", "Online Mobile Approval"]
---
@@ -27,13 +27,13 @@ These **ALL** can use Online Approval for user :
2. Click process > prompt a dialog box to override > click **_Online Approval_**
- 
+ 
1. Tick the ID that you choose to get approval
2. You can choose to send by **Whatsapp**, **Send by Email** or **Send by Whatsapp & Email**
- 
+ 
3. You will received a message at whatsapp or email send by system
@@ -41,13 +41,13 @@ These **ALL** can use Online Approval for user :
> You will received a message > Click that link
- 
+ 
- **Senario 2 : Send By Email**
> You will received an email > Click **_‘CLICK HERE FOR MORE ACTIONS’_**
- 
+ 
4. Login **Gmail Address** that you setting in maintain user **Open ID (Google)**
@@ -58,15 +58,15 @@ These **ALL** can use Online Approval for user :
:::
- 
+ 
5. Enter your **Gmail Password**
- 
+ 
6. After Login **Gmail** you will see this window
- 
+ 
7. You can click on **_Doc Detail_** and **_ScreenShot_** to see the detail
@@ -76,7 +76,7 @@ These **ALL** can use Online Approval for user :
3. **Reply** : You can left a message and click Approve or Reject
- 
+ 
:::info[note]
After Approve or Reject you can go back SQL Payroll, you will see below screen
@@ -90,7 +90,7 @@ These **ALL** can use Online Approval for user :
>
> c. Click **OK** to save that transaction
- 
+ 
- **Senario 2 : Reject Override**
@@ -100,25 +100,25 @@ These **ALL** can use Online Approval for user :
>
> c. The OK button is disabled after reject, click Cancel
- 
+ 
After Click Cancel System will Prompt back to this dialog box
- 
+ 
## Setup
### Step 1 : Navigate to Tools > Maintain User
- 
+ 
### Step 2 : Edit User
1. Double click the user will be set for Approval > Edit
- 
+ 
- 
+ 
### Step 3 : Set Approval Person
@@ -134,7 +134,7 @@ These **ALL** can use Online Approval for user :
If receive notification email and approve email is Gmail, do setting only at **3. OPEN ID (Google)** and leave **2.Email** column blank
:::
- 
+ 
For Example :
@@ -145,7 +145,7 @@ These **ALL** can use Online Approval for user :
1. Open ID (Google) : `XXXXXX@gmail.com`
2. Email : **Left as blank**
- 
+ 
- **Senario 2 : Use Different email to received notification and give approval**
@@ -155,7 +155,7 @@ These **ALL** can use Online Approval for user :
1. Open ID (Google) : Put your gmail address `XXXXXX@gmail.com`
2. Email : `XXXXXX@estream.com`
- 
+ 
### Step 4 : Setting SMTP
@@ -168,7 +168,7 @@ These **ALL** can use Online Approval for user :
1. Make Sure you had create App Password
- - If you’re using Gmail , you can [CLICK HERE](https://support.google.com/accounts/answer/185833?hl=en) to follow the steps to create your App Password
+ - If you’re using Gmail, see Google’s guide to create an App Password: [Create an App Password](https://support.google.com/accounts/answer/185833?hl=en)
- After get App Password, return to your SQL Payroll
2. Click on Email Setting
@@ -187,4 +187,4 @@ These **ALL** can use Online Approval for user :
9. After done setting click Save
- 
+ 
diff --git a/docs/usage/pcb-cp38-receipt-no-date.md b/docs/usage/general/pcb-cp38-receipt-no-date.md
similarity index 55%
rename from docs/usage/pcb-cp38-receipt-no-date.md
rename to docs/usage/general/pcb-cp38-receipt-no-date.md
index 18bc9cf..3966267 100644
--- a/docs/usage/pcb-cp38-receipt-no-date.md
+++ b/docs/usage/general/pcb-cp38-receipt-no-date.md
@@ -1,7 +1,7 @@
---
title: PCB & CP38 Receipt No & Date
description: A guide to maintain payroll frequency method
-slug: /usage/pcb-cp38-receipt-no-date
+slug: /usage/general/pcb-cp38-receipt-no-date
tags: ["SQL Payroll", "PCB", "CP38", "Receipt"]
---
@@ -10,17 +10,17 @@ tags: ["SQL Payroll", "PCB", "CP38", "Receipt"]
Given an example with this Month (June) with **PCB amount** of **RM1444.90**.
:::
-
+
## Setup
1. Right click on the particular Month End process and click **PCB Receipt**
- 
+ 
2. The Following screen will be seen
- 
+ 
>1 Enter the Receipt Date.
>
@@ -28,14 +28,14 @@ Given an example with this Month (June) with **PCB amount** of **RM1444.90**.
>
>3 Press calculate amount to show the total amount of PCB u paid that month.
- 
+ 
The **TOTAL** PCB Normal amount of the employees which is **RM 1444.90**.
3. Go to **Payroll** > **Government Reports** > **Print Income Tax PCB 2(II)**
- 
+ 
4. Preview the employees Tax PCB 2(II). The following result will show in the report:
- 
+ 
diff --git a/docs/usage/zakat-tabung-haji.md b/docs/usage/general/zakat-tabung-haji.md
similarity index 51%
rename from docs/usage/zakat-tabung-haji.md
rename to docs/usage/general/zakat-tabung-haji.md
index ef40ed9..a62a0a1 100644
--- a/docs/usage/zakat-tabung-haji.md
+++ b/docs/usage/general/zakat-tabung-haji.md
@@ -1,7 +1,7 @@
---
title: Zakat and Tabung Haji
description: A guide to apply Zakat and Tabung Haji deduction for employee
-slug: /usage/zakat-tabung-haji
+slug: /usage/general/zakat-tabung-haji
tags: ["SQL Payroll", "Zakat", "Tabung Haji"]
---
@@ -9,43 +9,43 @@ tags: ["SQL Payroll", "Zakat", "Tabung Haji"]
1. Go to **File** > **Company Profile**
- 
+ 
2. Click **Zakat** and key in Zakat Employer Number :
- 
+ 
3. Click **Tabung Haji** and key in your company's Tabung Haji Number. Press SAVE once you have keyed in.
- 
+ 
4. Go to **Payroll** > **Maintenance** > **Maintain Deduction** :
- 
+ 
5. Create a new **Deduction** by clicking the **NEW** button.
- 
+ 
6. Create **ZAKAT** deduction following these steps, remeber to press SAVE.
- 
+ 
7. Create **Tabung Haji** deduction by Pressing the **NEW** button and follow the image. Remember to press **SAVE**.
- 
+ 
8. Once you have created the 2 new deduction, please go to Payroll -> Open pending payroll and key in your deduction.
- 
+ 
9. Select the employee name, and key in the deduction amount for **Zakat** and **Tabung Haji**. Press **Save**
- 
+ 
10. When you process your month end, you will see the **Deduction** amount as well as the gross **Zakat** that you keyed in **Pending Payroll**
- 
+ 
## Print Zakat Report
@@ -53,17 +53,17 @@ tags: ["SQL Payroll", "Zakat", "Tabung Haji"]
2. Select the **Year** and **Month**, press the **Apply** button. Once you see the employee name, press the word **"Submission.."**:
- 
+ 
3. Select the payment format:
- 
+ 
4. If you selected Lembaga Zakat Selangor, you have to key in the Bank account and the cheque number. Once that is done, You can save the text file to your desktop.
- 
+ 
- 
+ 
## Print Tabung Haji Report
@@ -71,8 +71,8 @@ tags: ["SQL Payroll", "Zakat", "Tabung Haji"]
2. Select the **Year** and **Month**, press **Apply**. Press the **Preview** button.
- 
+ 
3. You will see this report. You may print it out or export it as a PDF file :
- 
+ 
diff --git a/docs/usage/human-resource/_category_.json b/docs/usage/human-resource/_category_.json
index c1f83fb..f1ef8f8 100644
--- a/docs/usage/human-resource/_category_.json
+++ b/docs/usage/human-resource/_category_.json
@@ -1,10 +1,8 @@
{
- "label": "Human Resource",
- "position": 1,
+ "label": "Human Resources",
+ "position": 2,
"link": {
"type": "generated-index",
- "description": "A series of Guide to Human Resource module in SQL Payroll",
- "slug": "/usage/human-resource"
-
+ "description": "Human Resource guide"
}
}
\ No newline at end of file
diff --git a/docs/usage/human-resource/bulk-email.md b/docs/usage/human-resource/bulk-email.md
deleted file mode 100644
index a93aeee..0000000
--- a/docs/usage/human-resource/bulk-email.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-id: bulk-email
-title: Bulk Email with Password
-description: A guide to payroll bulk email module for SQL Payroll
-slug: /usage/human-resource/bulk-email
-tags: ["SQL Payroll", "Bulk Email"]
----
-
-:::note
-
-- Not applicable for Export Email Client or Export to PDF
-- For Email Client, 10 records in one PDF, email to 1 recipient, system unable to generate password due to not sure which password should get
-
-:::
-
-## Prerequisites
-
-:::info
-In order to use this, user’s computer must configure with window email first
-:::
-
-## Setup
-
-1. Navigate to **Human Resource** > **Maintain Employee**
-
-2. Key in the PDF password and enter the email address
-
- 
-
-3. Next, go to **Payroll** > **Print Payslip**. Choose the month End Payslip, Apply and Preview
-
-4. Click on the 🔽 beside the excel export, click on **Export to Email Client (Batch)**
-
- 
-
- :::tip
- For Testing purpose, you may activate the module at File > Customize Payroll Module and ticked **Batch Email**
- :::
-
- 
-
- :::warning Error
- If you haven't configure your window email, you will see an error message as below. Make sure yo have configure your window email before doing these steps.
- :::
-
- 
-
-## Simple Steps To use IC as PDF Password
-
-1. Navigate to **Human Resource** > **Maintain Employee**
-
-2. Click on one employee record, hold the `Shift` key in the keyboard and click on the last record to highlight all
-
-3. Click on 🔽 button beside More, select Batch Edit
-
-4. From the columns, click on field Chooser and select **Name2**, **New IC**
-
-5. Save the structure, copy and paste the New IC value to Name2 column
-
-
-
-
-
-
-
-
diff --git a/docs/usage/human-resource/employee-login.md b/docs/usage/human-resource/employee-login.md
deleted file mode 100644
index f915122..0000000
--- a/docs/usage/human-resource/employee-login.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: Employee Login
-description: A guide to setup employee login and allow employee to view their details
-slug: /usage/human-resource/employee-login
-tags: ["SQL Payroll", "Login", "Personal Info"]
----
-
-:::info
-This guide explains how to configure and create an account for the employee in SQL Payroll which allow the employee to view their details
-:::
-
-## Setup
-
-1. In SQL Payroll, go to **Human Resource** > **Maintain Employee**
-
-2. Click on **Change Password**
-
- 
-
-3. Enter a new password for the employee
-
- 
-
-4. Next, ask the employee to open SQL Payroll, login into it by using the **Employee Code** and **Password** configured previously. That's it! 🥳
-
- 
-
-5. Finally, here's an example of employee view
-
- 
diff --git a/docs/usage/human-resource/human-resources-faq.md b/docs/usage/human-resource/human-resources-faq.md
new file mode 100644
index 0000000..e051fa7
--- /dev/null
+++ b/docs/usage/human-resource/human-resources-faq.md
@@ -0,0 +1,31 @@
+---
+sidebar_position: 3
+title: FAQ
+description: FAQ
+slug: /usage/human-resource/faq
+tags: ["SQL Account", "HR", "FAQ"]
+---
+
+## 1. Where I can get/modify the appointment letter?
+
+**Issue:**
+
+Where to get the appointment letters
+
+**Solution:**
+
+1. Go to **Human Resource | Maintain Employee**..., you can found the following common use employee letters:
+
+ - Acceptance of Resignation Letter
+ - Appointment Letter
+ - Confirmation Letter
+ - Employment Application Form
+ - Increment Letter
+ - Interview Assessment Form
+ - and more...
+
+2. **Highlight** the employee.
+3. Click **preview**.
+4. Select the **HR.Employee Appointment Report**.
+
+
diff --git a/docs/usage/human-resource/human-resources-setup.md b/docs/usage/human-resource/human-resources-setup.md
new file mode 100644
index 0000000..3f35ee8
--- /dev/null
+++ b/docs/usage/human-resource/human-resources-setup.md
@@ -0,0 +1,371 @@
+---
+sidebar_position: 1
+title: Setup
+description: Setup
+slug: /usage/human-resource/setup
+tags: ["SQL Payroll", "HR"]
+---
+
+## Maintain Employee
+
+Whenever a new staff/worker/person/crew enter the company, Maintain Employee is the place where user needs to key in the details
+
+1. Navigate yourself to the Maintain Employee panel
+
+ 
+
+ \*OR Click on the home page "Maintain Employee"\*\*
+
+ 
+
+2. Click new to create new employee
+
+ 
+
+3. Key in the employee’s personal details
+
+ 
+
+### Personal
+
+Click the *Change Password* button & enter the password if you wanted to allow the Employee to login to see his/her own payroll data & report
+Remember to untick the *Active* for any employee had resign before process the payroll.
+
+
+
+| Field Name | Properties |
+|-----------------|------------|
+| Code | Definition: Employee code |
+| | Field Type: Alphanumerical |
+| | Length: 30 |
+| Job Title | Definition: Employee Job Title |
+| | Field Type: Alphanumerical |
+| | Length: 60 |
+| Name | Definition: Full Employee Name |
+| | Field Type: Alphanumerical |
+| | Length: 160 |
+| Active | Definition: Unchecked if the selected employee is resigned. |
+| | Field Type: Boolean |
+| Gender | Definition: The employee Sex |
+| | Data Options: Male or Female |
+| D.O.B | Definition: The employee Date of Birth |
+| | Field Type: Date (dd/MM/YYYY) |
+| Address | Definition: Employee Correspondence Address |
+| | Field Type: Alphanumerical |
+| | Length: 60 (for Each Line) |
+| Phone | Definition: Employee Correspondence Phone Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 (for Each Line) |
+| Mobile | Definition: Employee Handphone Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+| Email | Definition: Employee E-Mail Address |
+| | Field Type: Alphanumerical |
+| | Length: 60 |
+| New IC | Definition: Employee New Identity Card Number |
+| | Field Type: Numerical |
+| | Length: 20 (XXXXXX-XX-XXXX) |
+| Old IC | Definition: Employee Old Identity Card Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+| Passport | Definition: Employee Passport Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+| Immigration No | Definition: Employee Immigration Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+| Change Password | Definition: A password for Employee so he/she can self login to print his/her report (Eg EA, payslip, etc) |
+| | Field Type: Alphanumerical |
+
+### Grouping
+
+In this tab is use for report grouping for the selected employee. It can be either by
+
+- [Branch](../../usage/human-resource/human-resources-setup.md#maintain-branch)
+- [Department](../../usage/human-resource/human-resources-setup.md#maintain-department)
+- [Group](../../usage/human-resource/human-resources-setup.md#maintain-group)
+- [Category](../../usage/human-resource/human-resources-setup.md#maintain-category)
+- [Project](../../usage/human-resource/human-resources-setup.md#maintain-project)
+- [Job](../../usage/human-resource/human-resources-setup.md#maintain-job)
+- [Task](../../usage/human-resource/human-resources-setup.md#maintain-task)
+- [Race](../../usage/human-resource/human-resources-setup.md#maintain-race)
+- [History Type](../../usage/human-resource/human-resources-setup.md#maintain-history-type)
+- [Announcement](../../usage/human-resource/human-resources-setup.md#maintain-announcement)
+
+
+
+### Family
+
+In this tab is use to keep the his/her spouse/family information.
+It is useful in case anything happen to the employee we able to inform/contact his/her spouse/family
+
+
+
+| Field Name | Properties |
+|----------------|------------|
+| Spouse Name | Definition: Employee husband/wife full name |
+| | Field Type: Alphanumerical |
+| | Length: 160 |
+| Spouse Address | Definition: Employee husband/wife Correspondence Address |
+| | Field Type: Alphanumerical |
+| | Length: 60 (for Each Line) |
+| Spouse Phone | Definition: Employee husband/wife Correspondence Phone Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 (for Each Line) |
+| Spouse Mobile | Definition: Employee husband/wife Handphone Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+| Tax Branch | Definition: Employee husband/wife Tax Branch |
+| | Field Type: Alphanumerical |
+| | Length: 40 |
+| Tax No | Definition: Employee husband/wife Tax Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+| Spouse IC No | Definition: Employee husband/wife New Identity Card Number |
+| | Field Type: Alphanumerical |
+| | Length: 20 |
+
+### Payroll Info
+
+
+
+| Field Name | Properties | Field Name | Properties |
+|------------------|------------|------------------|------------|
+| Wages Type | Definition: Employee [Wages](/usage/payroll/setup#maintain-wages) Category Type | SOCSO No | Definition: Employee SOCSO Number |
+| | | | Field Type: Alphanumerical |
+| | | | Length: 20 |
+| Wages | Definition: Employee wages amount | SOCSO Type | Definition: Employee SOCSO Category |
+| | Field Type: Numerical | | Data Options: First Category, Second Category or No SOCSO |
+| Contribution | Definition: Employee [Contribution](/usage/payroll/setup#maintain-contribution) Type | Tax Branch | Definition: Employee Tax Branch |
+| | | | Field Type: Alphanumerical |
+| | | | Length: 40 |
+| Frequency | Definition: Employee payment [Frequency](/usage/payroll/setup#maintain-frequency) | Tax No | Definition: Employee Tax Number |
+| | | | Field Type: Alphanumerical |
+| | | | Length: 20 |
+| Payment Method | Definition: Employer [Payment Method](/usage/payroll/setup#maintain-payment-method) | Marital Status | Definition: Employee marriage status |
+| | | | Data Options: Single, Married, Divorced or Widow |
+| Bank | Definition: Employee Bank | Spouse Working | Definition: Tick if the Employee husband/wife is working |
+| | | | Field Type: Boolean |
+| Bank Account No | Definition: Employee Bank Account Number | Spouse Disabled | Definition: Tick if the Employee husband/wife is disable person |
+| | Field Type: Alphanumerical | | Field Type: Boolean |
+| | Length: 20 | | |
+| Self Disabled | Definition: Tick if the Employee is disable person | Tax Category | Definition: Employee Tax Category. Only can select if Override Tax Category is Tick. |
+| | Field Type: Boolean | | |
+| Resident | Definition: Untick if the Employee Foreigner | Override Tax Category | Definition: Tick if don't wanted System Automatic Calculate the Employee Tax Category |
+| | Field Type: Boolean | | Field Type: Boolean |
+| | Non-Resident requirement and tax rate, refer to [Non-Resident](https://www.hasil.gov.my/en/individual/individual-life-cycle/how-to-declare-income/non-resident/) | | |
+| EPF No | Definition: Employee EPF(KWSP) Number | EA Serial No | Definition: Employee EA Serial Number (Given by LHDN Department) |
+| | Field Type: Alphanumerical | | Field Type: Alphanumerical |
+| | Length: 20 | | Length: 8 |
+| NK | Definition: Employee NK Code (can be seen on EPF Borang A) | Join Date | Definition: Employee Join the Company Date |
+| | Field Type: Alphanumerical | | Field Type: Date (dd/MM/yyyy) |
+| | Length: 1 | | |
+| Initial | Definition: Employee Initial Code (Given by EPF Department) | Confirm Date | Definition: Employee Confirmation Date |
+| | Field Type: Alphanumerical | | Field Type: Date (dd/MM/yyyy) |
+| | Length: 3 | | |
+| | | Resign Date |Definition: Employee Resign Date |
+| | | | Field Type: Date (dd/MM/yyyy) |
+
+### Allowance
+
+In this Tab is to enter the Fixed [Allowance](/usage/payroll/setup#maintain-allowance) entitled for each month for selected Employee.
+
+
+
+### Deduction
+
+In this Tab is to enter the Fixed [Deduction](/usage/payroll/setup#maintain-deduction) entitled for each month for selected Employee.
+
+
+
+### Note
+
+In this Tab user can load the Photo & other Information for the selected Employee.
+For Photo please try
+
+ 1. Save in Jpeg file.
+ 2. The Jpeg file size limit as 200KB
+
+
+
+### History
+
+In this tab is to show the list of history changes in this selected Employee.
+Select the Increment at the type column in order to print the Increment Letter (HR.Employee.Increment.Report).
+
+
+
+| Field Name | Properties |
+|--------------|-------------------------------------|
+| Post Date | Definition: Date of the data changes |
+| | Field Type: Date |
+| Type | Definition: Changes [History Type](../../usage/human-resource/setup#maintain-history-type) |
+| Description | Definition: Detail of Data changes |
+
+### Child
+
+In this tab is to list out all taxable children(s).
+
+
+
+| Field Name | Properties |
+|--------------------|------------------------------------------------------------------------------------------------------|
+| Name | Definition: Employee Tax Deductable Children full name |
+| | Field Type: Alphanumerical |
+| | Length: 160 |
+| D.O.B. | Definition: Employee Tax Deductable Children date of birth. |
+| | Field Type: Date (dd/MM/yyyy) |
+| | Data Option: Optional (i.e. may leave it empty if don't wanted system calculate the Children Age) |
+| Tax Code | Definition: Tax Deductable Children code. |
+| Rate | Definition: Rate for Tax Deductable |
+| | Field Type: Numerical |
+| | Data Options: 1 or 0.5 |
+| Number of Children | Definition: Number of Children is use for Tax Calculation. (Auto Calculate) |
+
+### Attachments
+
+Here user can attach the file to selected employee (eg Letter of Offer).
+Make sure the file is keep in the server as the system only keep the file link/path only.
+
+
+
+## Maintain Branch
+
+This is useful for user had many branch company but the salary is paid from HQ.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Branch Code (Max 20 Character) |
+| Description | A Full Description for Branch (Max 160 Character) |
+| Active | Untick it if the selected branch code is unavailable |
+| Set as Default | Click This button if wanted the selected Branch Code to be Auto Assign this Branch Code on New at [Maintain Employee](/usage/human-resource/setup#maintain-employee) |
+
+## Maintain Department
+
+A division of a large organization such as Account, Marketing & etc.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Department Code (Max 20 Character) |
+| Description | A Full Description for Department (Max 160 Character) |
+| Active | Untick it if the selected Department code is unavailable |
+| Set as Default | Click This button if wanted the selected Department Code to be Auto Assign this Department Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Group
+
+This is another type of report grouping by Group type.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Group Code (Max 20 Character) |
+| Description | A Full Description for Group (Max 160 Character) |
+| Active | Untick it if the selected Group code is unavailable |
+| Set as Default | Click This button if wanted the selected Group Code to be Auto Assign this Group Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Category
+
+User also can divide the employee by class or division.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Category Code (Max 20 Character) |
+| Description | A Full Description for Category (Max 160 Character) |
+| Active | Untick it if the selected Category Code is unavailable |
+| Set as Default | Click This button if wanted the selected Category Code to be Auto Assign this Category Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Project
+
+User also can Group the employee by Project which the employee work at.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Project Code (Max 20 Character) |
+| Description | A Full Description for Project (Max 160 Character) |
+| Active | Untick it if the selected Project Code is unavailable |
+| Set as Default | Click This button if wanted the selected Project Code to be Auto Assign this Project Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Job
+
+User also can Group the employee by Job Type in report.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Job Code (Max 20 Character) |
+| Description | A Full Description for Job (Max 160 Character) |
+| Active | Untick it if the selected Job Code is unavailable |
+| Set as Default | Click This button if wanted the selected Job Code to be Auto Assign this Job Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Task
+
+User also can divide the employee by piece of work to be done or undertaken.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Project Code (Max 20 Character) |
+| Description | A Full Description for Task (Max 160 Character) |
+| Active | Untick it if the selected Task Code is unavailable |
+| Set as Default | Click This button if wanted the selected Task Code to be Auto Assign this Task Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Race
+
+User also can Group the employee by Race Type in report.
+
+
+
+| Field Name | Properties |
+|----------------|----------------------------------------------------------------------------|
+| Code | A Race Code (Max 20 Character) |
+| Description | A Full Description for Race (Max 160 Character) |
+| Active | Untick it if the selected Race Code is unavailable |
+| Set as Default | Click This button if wanted the selected Race Code to be Auto Assign this Race Code on New at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain History Type
+
+This is to use to allow user to Group the Changes in the Maintain Employee
+
+
+
+| Field Name | Properties |
+|----------------|------------------------------------------------------------------------------------------------|
+| Code | A History Type Code (Max 20 Character) |
+| Description | A Full Description for History Type (Max 160 Character) |
+| Active | Untick it if the selected History Type Code is unavailable |
+| Set as Default | Click This button if wanted the selected History Type Code to be Auto Assign this History Type Code on New Changes at [Maintain Employee](../../usage/human-resource/setup#maintain-employee) |
+
+## Maintain Announcement
+
+This is to used to create, manage, and distribute company-wide or employee-specific announcements within the payroll and HR system, allowing users to share information, updates, or important reminders with their team
+
+
+
+| Field Name | Properties |
+|-------------|-------------|
+| Title | The title or subject of the announcement. |
+| Date From | The start date when the announcement becomes active. |
+| Date To | The end date when the announcement expires or becomes inactive. |
+| Category | The classification or type of announcement (e.g., General, System Update, Event). |
+| Remark | Additional notes or comments related to the announcement. |
+
+## Print History Lisitng
+
+This provides a comprehensive record of all past history types for employees, and is able to furthur and filter, sort and group the employees witth the fields below
+
+
+
+This is how the report generated will look like
+
+
diff --git a/docs/usage/human-resource/human-resourrces-additional-functions.md b/docs/usage/human-resource/human-resourrces-additional-functions.md
new file mode 100644
index 0000000..040cc68
--- /dev/null
+++ b/docs/usage/human-resource/human-resourrces-additional-functions.md
@@ -0,0 +1,270 @@
+---
+sidebar_position: 2
+title: Guide
+description: Guide
+slug: /usage/human-resource/guide
+tags: ["SQL Payroll", "HR", "Functions"]
+---
+
+## Bulk Email With Password
+
+:::note
+
+- Not applicable for Export Email Client or Export to PDF
+- For Email Client, 10 records in one PDF, email to 1 recipient, system unable to generate password due to not sure which password should get
+
+:::
+
+### Prerequisites
+
+:::info
+In order to use this, user’s computer must configure with window email first
+:::
+
+### Setup
+
+1. Navigate to **Human Resource** > **Maintain Employee**
+
+2. Key in the PDF password and enter the email address
+
+ 
+
+3. Next, go to **Payroll** > **Print Payslip**. Choose the month End Payslip, Apply and Preview
+
+4. Click on the 🔽 beside the excel export, click on **Export to Email Client (Batch)**
+
+ 
+
+ :::tip
+ For Testing purpose, you may activate the module at File > Customize Payroll Module and ticked **Batch Email**
+ :::
+
+ 
+
+ :::warning Error
+ If you haven't configure your window email, you will see an error message as below. Make sure yo have configure your window email before doing these steps.
+ :::
+
+ 
+
+### Simple Steps To use IC as PDF Password
+
+1. Navigate to **Human Resource** > **Maintain Employee**
+
+2. Click on one employee record, hold the `Shift` key in the keyboard and click on the last record to highlight all
+
+3. Click on 🔽 button beside More, select Batch Edit
+
+4. From the columns, click on field Chooser and select **Name2**, **New IC**
+
+5. Save the structure, copy and paste the New IC value to Name2 column
+
+
+
+
+
+
+
+
+
+## Employee Login
+
+:::info
+This guide explains how to configure and create an account for the employee in SQL Payroll which allow the employee to view their details
+:::
+
+### Employee Login Setup
+
+1. In SQL Payroll, go to **Human Resource** > **Maintain Employee**
+
+2. Click on **Change Password**
+
+ 
+
+3. Enter a new password for the employee
+
+ 
+
+4. Next, ask the employee to open SQL Payroll, login into it by using the **Employee Code** and **Password** configured previously. That's it! 🥳
+
+ 
+
+5. Finally, here's an example of employee view
+
+ 
+
+## Print Letter
+
+:::info
+This guide explains how to print Appointment, Confirmation, Increment letter
+:::
+
+### Print Letter Setup
+
+1. Navigate to the **Maintain Employee** panel
+
+ 
+
+2. Select the employee
+
+ 
+
+3. Click preview reports
+
+ 
+
+4. Select the report you want by double clicking it
+
+ 
+
+5. This is the example of the appointment letter
+
+ 
+
+#### Increment Letter
+
+:::note
+For increment letter, make sure increment is set in **history** in order for the report to work
+:::
+
+1. Navigate to **Human Resource** > **Maintain Employee**
+
+ 
+
+2. Alternatively, you can click on the **Maintain Employee** available in the homepage
+
+ 
+
+3. Go to the employee details, click on History from the tab view
+
+ 
+
+4. Click preview reports
+
+ 
+
+5. Select the report you want to print
+
+ 
+
+#### Increment letter setup in history
+
+
+
+## Maintain Employee with MyKad Reader
+
+### MyKad Reader Setup
+
+1. Link your Smart Card Reader to your computer
+
+2. Reader will turn red light when you success link to your computer
+
+ 
+
+3. Put MyKard into reader
+
+4. Reader will show blue light when success read your MyKad
+
+ 
+
+5. Open your SQL Payroll New Employee Profile > **Read MyKad**
+
+ 
+
+6. Select **Reader Devices** > **Click Read Card**
+
+ 
+
+7. Click **Read MyKad**
+
+ 
+
+8. Inside System will auto fill up MyKard Detail
+
+ - **(NAME , ADDRESS , ID Number, D.O.B, GENDER)**
+
+ 
+
+## Recurring Zakat
+
+### Recurring Zakat Setup
+
+1. Go to **Maintain Employee**:
+
+ 
+
+2. Select the respective employee and go to Deduction
+
+ 
+
+3. Enter a deduction and tick Zakat check box. You will notice that the other contribution checkbox will be unticked
+
+ 
+
+4. Key in Rate and set the period of contribution in the Date From and Date To column.
+
+ 
+
+5. Save and process your month end. You will see the amount in your Gross Zakat
+
+ 
+
+ 
+
+## Loan
+
+:::note NOTE:
+This is a **Paid Module**
+:::
+
+For company which also provide a loan for their employee(s) that is expected to be paid back by deduct from the salary with interest.
+
+## Maintain Loan
+
+At here allow the user to setting up the loan for the Selected Employee...
+
+### Maintain Loan Setup
+
+Assuming we had the following scenario:
+
+| Field Name | Properties |
+|-----------------------------|-------------------|
+| Employee Code | 0010 |
+| Loan Amount | 50,000 |
+| Loan Interest | 2,000 |
+| Number of Repayment (Months)| 60 |
+| First Repayment Date | 01 Mar 2013 |
+
+#### Loan Amount & Interest Amount
+
+1. Click **New** & Enter As Following.
+
+ 
+
+2. Click **Schedule | Generate**... Button.
+
+ 
+
+3. Click **Ok** button to confirm.
+
+4. Click **Save**.
+
+#### Auto Repayment
+
+1. Go to process as normal at [New Payroll](/usage/payroll/general#create-payroll).
+
+2. At the Selected Employee Paysheet Click **Loan**.
+
+ 
+
+#### Advanced Repayments
+
+1. At **Transaction** Tab
+
+ 
+
+## Print Loan Repayment History
+
+This is to generate/print the Ledger/History of Loan given by company for the selected/All Employees Report...
+
+
diff --git a/docs/usage/human-resource/maintain-employee.md b/docs/usage/human-resource/maintain-employee.md
deleted file mode 100644
index 153dc1c..0000000
--- a/docs/usage/human-resource/maintain-employee.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-title: Maintain Employee
-description: A guide to maintain employee for SQL Payroll
-slug: /usage/human-resource/maintain-employee
-tags: ["SQL Payroll", "Employee", "Maintain Employee"]
----
-
-:::tip
-Whenever a new staff/worker/person/crew enter the company, Maintain Employee is the place where user needs to key in the details
-:::
-
-## Setup
-
-1. Navigate yourself to the Maintain Employee panel
-
- 
-
- \*OR Click on the home page "Maintain Employee"\*\*
-
- 
-
-2. Click new to create new employee
-
- 
-
-3. Key in the employee’s personal details
-
- 
-
- | Symbol | Description |
- | ------ | ---------------------------------------------------------------------------------------------- |
- | 3.(a) | A unique code for the employee, it also act as a username for the employee to login. |
- | 3.(b) | The name of the position the employee will hold. (eg: chairman, secretary, auditor) |
- | 3.(c) | To be untick when an employee resigns. (if resign date is not set in payroll info.) |
- | 3.(d) | The name of the employee. |
- | 3.(e) | The gender/sex of the employee. |
- | 3.(f) | The date of birth of the employee (recommended to set so that can capture the age) |
- | 3.(g) | The housing address of the employee. |
- | 3.(h) | The house number of the employee. |
- | 3.(i) | The handphone number of the employee. |
- | 3.(j) | The email of the employee. |
- | 3.(k) | The Identification Card number of the employee. |
- | 3.(l) | The OLD Identification Card number of the employee. (only some very senior people will have) |
- | 3.(m) | The password for the employee to login his account. (need to set/change once in order to work) |
- | 3.(n) | The passport number of the employee (usually only recorded for foreign worker) |
- | 3.(o) | The immigration number of the employee |
-
-4. Key in the employee’s grouping details
-
- 
-
- | Symbol | Description |
- | ------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
- | 4.(a) | Key in the branch/department/category of the employee in the company. (if the company doesn’t have so much grouping, just remain everything as default “----“) |
- | 4.(b) | Select the type of calendar for the employee. |
- | 4.(c) | Select the leave group for the employee. (please visit Maintain Leave guide for more info) |
-
- :::tip
-
- The Purpose of Grouping setting is :
-
- - For Reference purpose.
-
- - For Report representation method by Group.
-
- :::
-
- 1. To Create new Branch / HRGroup / Department/ Category / Country/ Race
-
- 
- 
-
-5. Key in the employee’s family details
-
- 
-
-6. Key in the employee’s payroll information
-
- 
-
- 
-
-7. Key in the employee’s monthly fix allowances/deductions
-
- 
-
- - Create a new allowance/deduction
-
- 
-
-8. Add notes/remark and photo for the employee
-
- 
-
-9. History report of the employee
-
- 
-
- :::tip
- You can manually update the history by clicking on ➕ button or click on ➖ button to remove unncessary history records
- :::
-
-10. Add the employee’s children information (will affect tax category)
-
- 
-
-11. Add any attachment related to the employee
-
- :::tip
- For Example: resume, curriculum vitae, contract agreement, receipt claims etc
- :::
-
- :::info
- To avoid System with speed issue due on database size huge, system will only create shortcut link for the "attach" item instead of save it in the system.
-
- If the file been removed from locally, then the shortcut link will not function anymore.
- :::
-
- 
diff --git a/docs/usage/human-resource/print-letter.md b/docs/usage/human-resource/print-letter.md
deleted file mode 100644
index 1f22807..0000000
--- a/docs/usage/human-resource/print-letter.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-title: Print Letter
-description: A guide to print Appointment/Confirmation/Increment letter
-slug: /usage/human-resource/print-letter
-tags: ["SQL Payroll", "Letter", "Appointment Letter", "Comfirmation Letter", "Increment Letter"]
----
-
-## Introduction
-
-:::info
-This guide explains how to print Appointment, Confirmation, Increment letter
-:::
-
-## Setup
-
-1. Navigate to the **Maintain Employee** panel
-
- 
-
-2. Select the employee
-
- 
-
-3. Click preview reports
-
- 
-
-4. Select the report you want by double clicking it
-
- 
-
-5. This is the example of the appointment letter
-
- 
-
-### Increment Letter
-
-:::note
-For increment letter, make sure increment is set in **history** in order for the report to work
-:::
-
-1. Navigate to **Human Resource** > **Maintain Employee**
-
- 
-
-2. Alternatively, you can click on the **Maintain Employee** available in the homepage
-
- 
-
-3. Go to the employee details, click on History from the tab view
-
- 
-
-4. Click preview reports
-
- 
-
-5. Select the report you want to print
-
- 
-
-#### Increment letter setup in history
-
-
diff --git a/docs/usage/human-resource/read-mykad.md b/docs/usage/human-resource/read-mykad.md
deleted file mode 100644
index 49f11d8..0000000
--- a/docs/usage/human-resource/read-mykad.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Maintain Employee with MyKad Reader
-description: A guide to maintain employee using MyKad reader
-slug: /usage/human-resource/read-mykad
-tags: ["SQL Payroll", "Employee", "Maintain Employee", "MyKad"]
----
-
-## Setup
-
-1. Link your Smart Card Reader to your computer
-
-2. Reader will turn red light when you success link to your computer
-
- 
-
-3. Put MyKard into reader
-
-4. Reader will show blue light when success read your MyKad
-
- 
-
-5. Open your SQL Payroll New Employee Profile > **Read MyKad**
-
- 
-
-6. Select **Reader Devices** > **Click Read Card**
-
- 
-
-7. Click **Read MyKad**
-
- 
-
-8. Inside System will auto fill up MyKard Detail
-
- - **(NAME , ADDRESS , ID Number, D.O.B, GENDER)**
-
- 
diff --git a/docs/usage/human-resource/recurring-zakat.md b/docs/usage/human-resource/recurring-zakat.md
deleted file mode 100644
index 8c42277..0000000
--- a/docs/usage/human-resource/recurring-zakat.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: Recurring Zakat
-description: A guide to process recurring zakat in Maintain Employee
-slug: /usage/human-resource/recurring-zakat
-tags: ["SQL Payroll", "Recurring Zakat", "Zakat", "Maintain Employee"]
----
-
-## Setup
-
-1. Go to **Maintain Employee**:
-
- 
-
-2. Select the respective employee and go to Deduction
-
- 
-
-3. Enter a deduction and tick Zakat check box. You will notice that the other contribution checkbox will be unticked
-
- 
-
-4. Key in Rate and set the period of contribution in the Date From and Date To column.
-
- 
-
-5. Save and process your month end. You will see the amount in your Gross Zakat
-
- 
-
- 
diff --git a/docs/usage/leave/_category_.json b/docs/usage/leave/_category_.json
new file mode 100644
index 0000000..1b2412d
--- /dev/null
+++ b/docs/usage/leave/_category_.json
@@ -0,0 +1,9 @@
+{
+ "label": "Leave",
+ "position": 4,
+ "link": {
+ "type": "generated-index",
+ "description": "A guide of leave for SQL Payroll",
+ "slug": "/usage/leave"
+ }
+}
\ No newline at end of file
diff --git a/docs/usage/leave/faq.md b/docs/usage/leave/faq.md
new file mode 100644
index 0000000..0017c42
--- /dev/null
+++ b/docs/usage/leave/faq.md
@@ -0,0 +1,26 @@
+---
+title: FAQ
+sidebar_position: 2
+description: A guide about approve same leave request
+slug: /usage/leave/faq
+tags: ["SQL Payroll", "FAQ", "Leave"]
+---
+## Leave Count for Approved by Both Managers
+
+### 1. Both managers have approved the same leave submitted from same employee. How many leave will be taken?
+
+- **Example**
+
+Let said
+
+1. Manager A (approve Acc dept)
+2. Manager B (approve Acc Dept)
+3. Staff C (under Acc Dept) has submitted the e-leave.
+
+If Manager A approve the leave while Manager B also approve the same leave for staff C.
+
+**How many actual leave will be deducted?**
+
+- **Answer**
+
+1 day leave will be deducted.
diff --git a/docs/usage/leave.md b/docs/usage/leave/guide.md
similarity index 57%
rename from docs/usage/leave.md
rename to docs/usage/leave/guide.md
index 127af8b..989d8b6 100644
--- a/docs/usage/leave.md
+++ b/docs/usage/leave/guide.md
@@ -1,7 +1,8 @@
---
-title: Leave
+title: Guide
+sidebar_position: 1
description: A guide of leave for SQL Payroll
-slug: /usage/leave
+slug: /usage/leave/guide
tags:
[
"SQL Payroll",
@@ -40,11 +41,11 @@ Before assigning leave group to your employee, you need to make sure that you ha
1. Firstly, point to **Leave** tab and select **Maintain Leave Type**
- 
+ 
2. Click on **New** button on the upper right corner to create new leave type
- 
+ 
3. Assign code for your leave type.
@@ -55,11 +56,11 @@ Before assigning leave group to your employee, you need to make sure that you ha
- Click "Save"
:::
- 
+ 
4. You have your new leave type created.
- 
+ 
## Maintain Leave Group
@@ -72,11 +73,11 @@ Before assigning leave group to your employee, you need to make sure that you ha
1. Firstly, point to **Leave** tab and select **Maintain Leave Group**
- 
+ 
2. Click on **New** button on the upper right corner to create new leave group.
- 
+ 
3. Assign code for your new leave group.
@@ -86,7 +87,7 @@ Before assigning leave group to your employee, you need to make sure that you ha
Click on the ➕ button to select the entitled leave type for this particular leave group.
:::
- 
+ 
4. Taking **Annual Leave (AL)** as an example.
@@ -98,17 +99,17 @@ Before assigning leave group to your employee, you need to make sure that you ha
| 3 to 4 | 12 |
| >4 | 16 |
- 
+ 
If your company’s annual leave policy follows this default setting, you can point to the **Entitle** tab and select **Annual Leave Entitlement Policy**. With that, the calculation will follow the default setting.
- 
+ 
Click **Save**.
5. If your company does not follow the default annual leave setting, you can always customise your own calculation by clicking on **Edit**, and then the 3 dots beside the **entitle** column
- 
+ 
6. For example, your company complies to the calculation as below.
@@ -126,23 +127,45 @@ Before assigning leave group to your employee, you need to make sure that you ha
| 3 | 5 | 12 |
| 1 | 99 | 18 |
- 
+ 
7. Click **OK** and you are done 🥳
+## Maintain Public Holiday
+
+**Step 1:** Leave | Maintain Public Holiday Calendar… | Select a Public Holiday Calendar / Create New
+
+ 
+
+**Step 2: Set public holidays**
+User may import default Malaysia public holiday calendar or set manually
+
+Option 1: Global Icon | Select a State | OK
+
+ 
+
+:::info
+User may check or uncheck the dates
+:::
+
+Option 2: Click on ***'P' button*** | Select date
+ 
+
+**Step 3:** Save
+
## Employee Leave Group Assignment
1. Firstly, point to **Human Resource** tab and select **Maintain Employee**
- 
+ 
2. Select relevant employee. eg: Nicole. Click **Edit**
- 
+ 
3. Click on **Grouping** tab, and you will see **Leave Group** at the last panel.
- 
+ 
4. Assign relevant leave group.
@@ -151,8 +174,8 @@ Before assigning leave group to your employee, you need to make sure that you ha
Click **Save** afterwards
:::
- 
- 
+ 
+ 
## Leave Application
@@ -162,7 +185,13 @@ Before assigning leave group to your employee, you need to make sure that you ha
- **You can set the calendar into individual employee in Maintain Employee. It will loaded the employee leave aplication.**
- It able to monitor the leave apply based on the up-to-date number of leaves entitlement.
- For example, 1. **_Annual Leave Entitlement = 12 days_** 2. **_Average Annual Leave Entitlement = 1 day per month_** 3. **_Annual Leave applied for a month_** 1. **_January = 0 day_** 2. **_February = 1 day_** 3. **_March = 0 day_**
+ For example,
+ 1. **Annual Leave Entitlement = 12 days**
+ 2. **Average Annual Leave Entitlement = 1 day per month**
+ 3. **Annual Leave applied for a month**
+ - **January = 0 day**
+ - **February = 1 day**
+ - **March = 0 day**
From the above scenario, total annual leaves entitled up to month of April are 4 days (including month of April).
@@ -175,28 +204,28 @@ Before assigning leave group to your employee, you need to make sure that you ha
1. First, point to **Leave** and click on **Leave Application**
- 
+ 
2. Select the year. eg: Year 2015
- 
+ 
3. Point to the name of employee and click into it. eg: Lee Chong Wai
- 
+ 
4. Click on the ➕ button. A row will appear in the display box where you can select the date, type of leave and number of day as how your employee applied. Click “Save once the application is done.
- 
- 
+ 
+ 
5. If your employee applies for half day leave or leave calculated in hours, call out **Day As Time** column. 1 working day has 8 working hours.
- 
+ 
6. Select the duration of the leave. eg: 3 hours. Then system will automatically calculate the number of day as 0.38 day.
- 
+ 
## Leave Entitlement Processor
@@ -206,19 +235,19 @@ Before assigning leave group to your employee, you need to make sure that you ha
1. Leave entitlement process can be done once a year. First, point to **Leave** and click on **Leave Entitlement Processor**.
- 
+ 
2. Select the Transaction Posting Year. eg: 2015. And click “Process”
- 
+ 
3. You will see a table clearly stating the number of leave each and every employee entitled in the year 2015.
- 
+ 
4. System allows you to edit the number of day. Click **Save** when the setting is done.
- 
+ 
## Leave Report
@@ -229,27 +258,43 @@ Before assigning leave group to your employee, you need to make sure that you ha
| Leave Balance Report | Analyse the number of days taken for annual leaves, medical leaves,etc |
| Yearly Leave Report | Generate 12 months total leaves taken for a leave type like annual leave, unpaid leave, medical leave, etc |
+### Print Leave Application Report
+
+
+
+### Print Attendance Report
+
+
+
+### Print Leave Balance Report
+
+
+
+### Print Yearly Leave Report
+
+
+
## Brought Forward Leave
1. Make sure in Leave Type brought forward (BF) is ticked
- 
+ 
- 
+ 
2. Make sure there is calculation for amount of leave brought forward (BF)
- 
+ 
- 
+ 
3. Key in leave entitlement (refer to [Leave Entitlement](#leave-entitlement-processor))
- 
+ 
- 
+ 
- 
+ 
4. Apply leave for employees.(refer to [Leave Application](#leave-application))
@@ -257,33 +302,33 @@ Before assigning leave group to your employee, you need to make sure that you ha
Leave/Leave Application/Double click Current Leave
:::
- 
+ 
- 
+ 
- 
+ 
5. Preview Leave Balance Report (Leave/Print Leave Balance Report)
- 
+ 
6. Open Leave Entitlement for 2016 (Repeat step 2)
- 
+ 
## Hourly Leave Application
1. Go to Leave > Leave Application > New Leave Application
- 
+ 
2. Select the Employee's name, then press Apply Leave
- 
+ 
3. Insert the “Day As Time” column
- 
+ 
4. Select the type of leave and the date of leave
@@ -293,7 +338,7 @@ Before assigning leave group to your employee, you need to make sure that you ha
- Day as time = 8.00 ( HH:MM , 8 hours in 1 day)
:::
- 
+ 
5. Apply Hourly Leave
@@ -301,12 +346,12 @@ Before assigning leave group to your employee, you need to make sure that you ha
- You will see that the Day column will automatically change to 0.25
- 
+ 
6. Save
- Press Save icon once you have keyed in the days/hours. Save is completed once the iconchanged to a grey colour
- 
+ 
7. This method can be used for all leaves
diff --git a/docs/usage/payroll/_category_.json b/docs/usage/payroll/_category_.json
index fb15275..0bc04a9 100644
--- a/docs/usage/payroll/_category_.json
+++ b/docs/usage/payroll/_category_.json
@@ -1,6 +1,6 @@
{
"label": "Payroll",
- "position": 2,
+ "position": 3,
"link": {
"type": "generated-index",
"description": "Covers all payroll user guide of SQL Payroll",
diff --git a/docs/usage/payroll/advanced-paid.md b/docs/usage/payroll/advanced-paid.md
deleted file mode 100644
index 0a8541c..0000000
--- a/docs/usage/payroll/advanced-paid.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: Advance Paid
-description: A guide to do advanced paid
-slug: /usage/payroll/advanced-paid
-tags: ["SQL Payroll", "Advance Paid"]
----
-
-:::info
-Employee request advance salary before month end
-:::
-
-## Setup
-
-1. Navigate to **Payroll > Open Pending Payroll**
-
-2. **Select Advance Paid**
-
- 
-
-3. **Key in accordingly**
-
- >***Trans date*** = date apply advance paid
- >
- >***Employee*** = which employee
- >
- >***Amount*** = amount advance paid
-
- 
-
-4. Go to Payroll > New Payroll
-
-5. Choose Ad Hoc
-
-6. Set the date when your employee take advance paid
-
-7. Under Process > select Monthly Fixed Allowance / Pending Payroll (will come out the dialog box as pic attached)
-
-8. Tick "Advanced Paid"
-
- 
-
-9. Process
-
- 
-
-10. Process Month end Payroll as usual, you will found there is advance deduct at the month end.
-
- 
diff --git a/docs/usage/payroll/bonus.md b/docs/usage/payroll/bonus.md
deleted file mode 100644
index 08dbf63..0000000
--- a/docs/usage/payroll/bonus.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Bonus
-description: A guide to process bonus in SQL Payroll
-slug: /usage/payroll/bonus
-tags: ["SQL Payroll", "Bonus"]
----
-
-## Setup
-
-1. Navigate to **Payroll** > **Open Pending Payroll**
-
- 
-
-2. Click on Bonus
-
- 
-
-3. Next, adjust the bonus of your employee
-
- 
-
- 1. Click “Add”
- 2. Select your employee
- 3. Key in amount
- 4. Save
-
-4. Go to **Payroll** > **New Payroll** and click on **Ad Hoc**
-
- 
-
-5. Tick **EPF** if you want to deduct **EPF**, Tick **PCB** if you want to deduct **PCB**
-
- 
-
-6. Tick Bonus / Allowance (To input your amount)
-
- 
-
-7. Change the Description (Optional) and tick the employee you rewarded with bonus
-
- 
-
-8. Complete and check the payslip
-
- 
diff --git a/docs/usage/payroll/comparison-previous-month.md b/docs/usage/payroll/comparison-previous-month.md
deleted file mode 100644
index cd43739..0000000
--- a/docs/usage/payroll/comparison-previous-month.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: Compare the Previous Month Payroll Of Employees
-description: A guide to compare the employees' past months payrolls
-slug: /usage/payroll/comparison-previous-month
-tags: ["SQL Payroll", "Comparison", "Previous Month"]
----
-
-## Setup
-
-If you want to compare your employee past months payrolls you can use out Yearly Individual Report.
-
-1. Go to **Payroll** > **Print Yearly Individual Report**.
-
- 
-
-2. Set which month you want to compare. If you want to compare August 2021 with July 2021, set the Month as 8 and Year as 2021.
-
-3. Press Apply button.
-
- 
-
-4. You will see the yearly earning for each employee. Click on the employee’s name to see their breakdown.
-
- 
-
-5. Press the small + icon to expand the row and see the details for allowances and overtimes
-
- 
-
-6. Press the preview icon to generate a comparison report.
-
- 
-
-7. The report will compare in 2 months (Aug 2021 vs Jul 2021).
-
- 
diff --git a/docs/usage/payroll/cp38.md b/docs/usage/payroll/cp38.md
deleted file mode 100644
index a7ccf7e..0000000
--- a/docs/usage/payroll/cp38.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: CP38
-description: A guide to process CP38
-slug: /usage/payroll/cp38
-tags: ["SQL Payroll", "CP38"]
----
-
-## Introduction
-
-- CP38 is a **instruction** to Deduct Salary which **issued by LHDN**. This CP38 instruction requires that the employer **make additional deductions in monthly installments** from the salary of the taxpayer (other than a Monthly Tax Deduction) towards settlement of taxpayer’s income tax arrears.
-- The Salary Deduction Order (CP38) for tax payment in instalments aims to ease the burden **of the taxpayer** who should be paying the tax arrears in one lump sum under the Income Tax Act 1967.
-
-## Insert CP38
-
-1. **Open Pending Payroll** and choose **CP38**
-
- 
-
-2. Press **GENERATE** on the top left of the window.
-
- 
-
-3. Key in the Amount you receive from LHDN Letter, for example this employee ( 00001- Lucious ) had to pay CP38 on **June ( RM450 )** and July **( RM550 )**. Press **GENERATE**.
-
- 
-
-4. Press **SAVE**
-
- 
-
-5. This **pending** task only needs to be completed **once**. It will impact **both the June and July month-end processes**. The following pictures below will illustrate the end result :
-
- 
diff --git a/docs/usage/payroll/faq.md b/docs/usage/payroll/faq.md
new file mode 100644
index 0000000..438e0ab
--- /dev/null
+++ b/docs/usage/payroll/faq.md
@@ -0,0 +1,220 @@
+---
+sidebar_position: 3
+title: FAQ
+description: A faq for payroll
+slug: /usage/payroll/faq
+tags: ["SQL Payroll", "FAQ"]
+---
+
+## 1. How to solve when missing code and employee name columns in the month payroll screen?
+
+**Issue:**
+
+
+
+**Solution:**
+
+
+
+## 2. Error message dataset "CalendarInfo" does not exist when batch email using customize payslip format
+
+**Issue:**
+
+Error message prompt when try to **Export to E-Mail Client (Batch)** using **customize payslip format**.
+
+
+
+**Solution:**
+
+At payslip report designer,
+
+ Change the [\] to [\]
+
+ 
+
+After correction, it will be look like the screenshot below.
+
+ 
+
+## 3. Where to define the company leave policy?
+
+**Solution:**
+
+1. Preset the leave policy at **Leave | Maintain Leave Group...**
+
+## 4. Why date format not display correctly in some payroll report?
+
+**Issue:**
+
+What is the faster solution to show the date format correctly?
+
+
+
+Government Reports | Print Income Tax PCB 2 (II)
+
+**Solution:**
+
+1. Go to Control Panel.
+2. Search for Region in Control Panel.
+3. Click on Additional Settings...
+
+ 
+
+4. Click to Date tab.
+
+5. Change the Short Date Format to DD/MM/YYYY
+
+
+5. Date format has display correctly now.
+
+ 
+
+6. Date format has display correctly now.
+
+ 
+
+## 5. How to compare the Previous Month Payroll Of Employees?
+
+**Issue:**
+
+What is the approach to compare the **previous month payroll of employees**?
+
+**Solution:**
+
+If you want to compare your employee past months payrolls you can use out Yearly Individual Report.
+
+1. Go to **Payroll** > **Print Yearly Individual Report**.
+
+ 
+
+2. Set which month you want to compare. If you want to compare August 2021 with July 2021, set the Month as 8 and Year as 2021.
+
+3. Press Apply button.
+
+ 
+
+4. You will see the yearly earning for each employee. Click on the employee’s name to see their breakdown.
+
+ 
+
+5. Press the small + icon to expand the row and see the details for allowances and overtimes
+
+ 
+
+6. Press the preview icon to generate a comparison report.
+
+ 
+
+7. The report will compare in 2 months (Aug 2021 vs Jul 2021).
+
+ 
+
+## 6. How to Enter Opening Balance in SQL Payroll?
+
+**Issue:**
+
+How to key in **Opening Balance** for employees in SQL Payroll?
+
+**Solution:**
+
+Maintain employee’s opening balance is done when the respective employee enter the company in a month **later than January**.
+
+The previous PCB amount is **needed to key in so that the system can correctly calculate** the PCB amount that’s needed to pay every month.
+
+1. Navigate to **Payroll** > **Open Payroll**
+
+ 
+
+2. Double click on the payroll year to open it
+
+ 
+
+3. Double click on the transaction section under "**Opening**"
+
+ 
+
+4. Select the employee by double clicking on its name
+
+ 
+
+5. Key in all the employee’s opening balance information
+
+ 
+
+ :::info
+
+ For the General part can enter information accordign to the EA form
+ For others part Employee need to know whether they have any of it in previous employment
+ :::
+
+### Mapping of SQL "opening" to EA form
+
+
+
+### Special note for additional EPF and PCB
+
+- Additional EPF and additional PCB are used when additional remuneration (bonus, commission, paid leave) is given.
+- In the EA form, normal EPF and additional EPF is group into one.
+- However, SQL recommend users to split the amount for a more detail input.
+
+
+
+## 7. How to apply Recurring Payroll?
+
+:::info
+This allow you to repeat the same amount of payment for the next month if you have already keyed in the advance payment, allowance or overtime for one month’s month end payroll
+:::
+
+**Issue:**
+
+How to enable **recurring payroll** so that allowances/overtime/advance payments auto-populate in subsequent month’s payroll?
+
+**Solution:**
+
+1. Right click on previous month’s payroll > **Open** > **Open Overtime**
+
+ 
+
+2. Highlight all the Overtimes by clicking on the entries while pressing down on the SHIFT button.
+
+ 
+
+3. Right click and then Copy
+
+ 
+
+4. Go to **Payroll** > **Open Pending Payroll** and select Overtime
+
+ 
+
+5. Right-click on the white area and select paste
+
+ 
+
+6. Select all the entries by clicking on it while pressing down on the SHIFT button. then right- click and select “batch edit value”.
+
+ 
+
+7. Change the Column to “Post Date”
+
+ 
+
+8. Key in the post date of you next month’s payroll and press Execute.
+
+ 
+
+9. Press OK and Close the window.
+
+ 
+
+10. You will see that the Post Date has change. Press Save. The changes have been successfully saved once the icon turns grey colour.
+
+ 
+
+11. When you process your next month’s payroll. It will capture these values.
+
+ For example, in September 2021’s month end copied from August 2021:
+
+ 
+
+12. Repeat the same steps for allowances, and advance payments.
diff --git a/docs/usage/payroll/general-guide.md b/docs/usage/payroll/general-guide.md
deleted file mode 100644
index bfdfd5c..0000000
--- a/docs/usage/payroll/general-guide.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-sidebar_position: 2
-title: General Guide
-description: A guide to maintain payroll
-slug: /usage/payroll/general
-tags: ["SQL Payroll", "Payroll", "Month End", "Pending Payroll"]
----
-
-## Create Payroll
-
-1. Click into **Payroll** and look for **New Payroll**.
-
- :::tip
- Certain company their payroll cut off date will not in the month end, some of the company will according to the 26th of the month, so you can preset your own company payroll cut off date through the "..." button.
- :::
-
- 
-
-2. Click on the **Process** option.
-
-## Open Payroll
-
-:::info
-Once you have created the payroll and you wish to view whatever you have did, then you can make some amendment.
-:::
-
-1. Navigate to **Payroll** > **Open Payroll**. Alternatively, access it from the home page by clicking **Open Payroll**
-
- 
-
-2. Select employee, double click your employee name to check on its individual’s amount
-
- 
-
- :::info
- You can process 2 month end in the same day also. Initially, you can choose to tick those first batch employees.
-
- While processing the 2nd batch, you can tick the 2nd batch of users.
-
- Example:
-
- **BATCH 1**
-
- 
-
- 
-
- **BATCH 2**
-
- 
-
- 
- :::
-
-## Open Pending Payroll
-
-:::tip
-Before you process the month end, you can use open pending payroll to key-in all others add hoc info like extra allowance, overtime, claim etc.
-:::
-
-1. Go to **Payroll** > **Open Pending Payroll**.
-
- 
-
-2. Double Click on the info that you want to input, eg: Overtime.
-
- 
-
-3. Insert the overtime info accordingly
-
- 1. Press on the ➕ button to add new overtime.
-
- 
-
- 2. Insert the info accordingly like employee, overtime code, work unit etc
-
- 
-
- 3. Once update accordingly then save.
-
- 
-
-4. Once finish the update you may process the month end and observe the result.
-
- 
diff --git a/docs/usage/payroll/guide.md b/docs/usage/payroll/guide.md
new file mode 100644
index 0000000..8641316
--- /dev/null
+++ b/docs/usage/payroll/guide.md
@@ -0,0 +1,553 @@
+---
+sidebar_position: 2
+title: Guide
+description: A guide to maintain payroll
+slug: /usage/payroll/general
+tags: ["SQL Payroll", "Payroll", "Month End", "Pending Payroll"]
+---
+
+## Create Payroll
+
+### Final Process
+
+Enable to process the Month Pay Salary and Final Pay Salary.
+
+1. Click into **Payroll** and look for **New Payroll**.
+
+ :::tip
+ Certain company their payroll cut off date will not in the month end, some of the company will according to the 26th of the month, so you can preset your own company payroll cut off date through the "..." button.
+ :::
+
+ 
+
+2. Click on the **Process** option.
+
+### Frequency Process
+
+To process mid month salary payroll. The salary payout is based on average % of the Fixed Salary.
+
+Not the last Pay of the Month.
+
+
+
+### Ad Hoc Process
+
+To process Mid Month Ad Hoc Payroll
+
+
+
+
+
+Default this option
+
+- All(PCB,Socso,EPF) Contribution for Fixed Transaction will be 0
+- Value will be 0 (Zero) & user need to self enter a value for All/Selected Employee
+
+
+
+In this option allow the user to self control the Contribution (default 100%) for Fixed Transaction.
+
+In other word if (eg Bonus with PCB (A) only just set Contribution to 0%)
+
+## Open Payroll
+
+:::info
+Once you have created the payroll and you wish to view whatever you have did, then you can make some amendment.
+:::
+
+1. Navigate to **Payroll** > **Open Payroll**. Alternatively, access it from the home page by clicking **Open Payroll**
+
+ 
+
+2. Select employee, double click your employee name to check on its individual’s amount
+
+ 
+
+ :::info
+ You can process 2 month end in the same day also. Initially, you can choose to tick those first batch employees.
+
+ While processing the 2nd batch, you can tick the 2nd batch of users.
+
+ Example:
+
+ **BATCH 1**
+
+ 
+
+ 
+
+ **BATCH 2**
+
+ 
+
+ 
+ :::
+
+## Open Pending Payroll
+
+:::tip
+Before you process the month end, you can use open pending payroll to key-in all others add hoc info like extra allowance, overtime, claim etc.
+:::
+
+- This is for the user to prepare the transaction (eg Overtime, Deduction) before Processing the Payroll...
+- Available Pending Type Transactions:
+
+ - Wages, Allowance, Tax Deduction, Overtime
+ - Deduction, Advance Paid, Claims, Loan
+ - CP38, Advance Deduct, Bonus, Paid Leave
+ - Director Fees, Unpaid Leave, Tax Benefit, Commission
+
+- After all the Pending had enter user may go either below step to for next step except Pending Advance Paid
+ - New Payroll | Final Process
+ - New_Payroll | Ad Hoc Process
+- For Pending Advance Paid must use New_Payroll | Ad Hoc Process then only can use New Payroll | Final Process
+
+### Steps
+
+1. Go to **Payroll** > **Open Pending Payroll**.
+
+ 
+
+2. Double Click on the info that you want to input, eg: Overtime.
+
+ 
+
+3. Insert the overtime info accordingly
+
+ 1. Press on the ➕ button to add new overtime.
+
+ 
+
+ 2. Insert the info accordingly like employee, overtime code, work unit etc
+
+ 
+
+ 3. Once update accordingly then save.
+
+ 
+
+4. Once finish the update you may process the month end and observe the result.
+
+ 
+
+### Pending YYYY
+
+- YYYY represents the Year (e.g. if in 2013 will show as Pending 2013).
+- To show the pending in Monthly (with & without Transactions).
+
+
+
+### Pending Navigator
+
+Show which Pending Type had transactions in the day view.
+
+
+
+### Show all Pending Payroll
+
+To show the pending in Yearly (with Transactions).
+
+
+
+## Pending Transactions Types
+
+1. Just click the + button on top of the Screen (The Green + and Money icon) to Insert record(s).
+
+2. After done just Click the Blue Diskette icon on top of the Screen to save the record.
+
+### Pending Wages
+
+This is useful for employees to be paid by the number of days they work (i.e. users can add the day when the selected employee comes to work).
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Wages transaction date | Date |
+| Post Date | Wages posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Wages type | Alphanumerical, length 20 |
+| Description | Wages type description | Alphanumerical, length 160 |
+| Amount | Wages amount | Decimal, length 18, precision 2 |
+
+### Pending Overtime
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Overtime transaction date | Date |
+| Post Date | Overtime posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Overtime type | Alphanumerical, length 20 |
+| Description | Overtime type description | Alphanumerical, length 160 |
+| Work Unit | It can be in Hours or Day depend what Overtime Type selected and Unit type is set at Maintain Overtime | Decimal, length 18, precision 8 |
+| Rate | Overtime rate | Decimal, length 18, precision 8 |
+| Day Type | It follow the Post Date to determine the Day Type which is set at Maintain Calender | Alpha, length 1 |
+| Work Unit As Time | Overtime entered as time (HH:MM:SS) | Time |
+
+### Pending Paid Leave
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Paid leave transaction date | Date |
+| Post Date | Paid leave posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Description | Paid leave description | Alphanumerical, length 160 |
+| Amount | Paid leave amount | Decimal, length 18, precision 2 |
+
+### Pending Unpaid Leave
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Unpaid leave transaction date | Date |
+| Post Date | Unpaid leave posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Unpaid leave type | Alphanumerical, length 20 |
+| Description | Unpaid leave type description | Alphanumerical, length 160 |
+| Leave Day | Number of unpaid leave days | Decimal, length 18, precision 8 |
+| Amount | Unpaid leave amount (Leave blank if want calculated by system) | Decimal, length 18, precision 2 |
+
+### Pending Claim
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Claim transaction date | Date |
+| Post Date | Claim posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Claim type | Alphanumerical, length 20 |
+| Description | Claim type description | Alphanumerical, length 160 |
+| Ref1 | Claim reference 1 | Alphanumerical, length 20 |
+| Ref2 | Claim reference 2 | Alphanumerical, length 20 |
+| Amount | Claim amount | Decimal, length 18, precision 2 |
+
+### Pending CP38
+
+This is generally towards settlement of outstanding taxes.
+
+
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | CP38 transaction date | Date |
+| Post Date | CP38 posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Description | CP38 description | Alphanumerical, length 160 |
+| Ref1 | Reference 1 | Alphanumerical, length 20 |
+| Ref2 | Reference 2 | Alphanumerical, length 20 |
+| Amount | CP38 amount | Decimal, length 18, precision 2 |
+| Generate Button | For Batch Generate CP38 | |
+
+### Pending Allowance
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Allowance transaction date | Date |
+| Post Date | Allowance posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Allowance type | Alphanumerical, length 20 |
+| Tax Code | Tax exemption code | Alphanumerical, length 20 |
+| Description | Allowance type description | Alphanumerical, length 160 |
+| Work Unit | Allowance unit | Decimal, length 18, precision 8 |
+| Rate | Allowance rate | Decimal, length 18, precision 8 |
+| Amount | Allowance total amount | Decimal, length 18, precision 2 |
+
+### Pending Deduction & Pending Commission
+
+Below Example information is applicable for
+
+- Pending Deduction
+- Pending Commission
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Deduction / Commission transaction date | Date |
+| Post Date | Deduction / Commission posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Deduction / Commission type | Alphanumerical, length 20 |
+| Description | Deduction / Commission description | Alphanumerical, length 160 |
+| Work Unit | Deduction unit | Decimal, length 18, precision 8 |
+| Rate | Deduction rate | Decimal, length 18, precision 8 |
+| Amount | Deduction total amount | Decimal, length 18, precision 2 |
+
+### Pending Bonus & Pending Director Fees
+
+Below Example information is applicable for
+
+- Pending Bonus
+- Pending Director Fees
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Bonus / Director fees transaction date | Date |
+| Post Date | Bonus / Director fees posting date | Date |
+| Pay Year | Bonus year (Default is same year as Post Date) | Integer |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Tax Category | Employee tax category | Alphanumerical, length 10 |
+| EPF Rate | Bonus EPF rate | Alphanumerical, length 10 |
+| Wages | Employee wages amount | Decimal, length 18, precision 2 |
+| Amount | Bonus / Director fees amount | Decimal, length 18, precision 2 |
+
+### Pending Advance Paid, Pending Advance Deduct & Pending Loan
+
+Below Example information is applicable for
+
+- Pending Advance Paid
+- Pending Advance Deduct (Only View because it derive from Advance Paid after Ad Hoc Process)
+- Pending Commission
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Advance / Loan transaction date | Date |
+| Post Date | Advance / Loan posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Description | Description | Alphanumerical, length 160 |
+| Ref1 | Reference 1 | Alphanumerical, length 20 |
+| Ref2 | Reference 2 | Alphanumerical, length 20 |
+| Amount | Advance paid amount | Decimal, length 18, precision 2 |
+
+### Pending Tax Benefit & Pending Tax Deduction
+
+Below Example information is applicable for
+
+- Pending Tax Benefit
+- Pending Tax Deduction
+
+
+
+| Field Name | Description | Type / Length / Precision |
+|---|---|---|
+| Trans Date | Tax deduction / benefit transaction date | Date |
+| Post Date | Tax deduction / benefit posting date | Date |
+| Employee | Employee code | Alphanumerical, length 30 |
+| Code | Tax deduction code | Alphanumerical, length 20 |
+| Description | Tax deduction description | Alphanumerical, length 160 |
+| Ref1 | Reference 1 | Alphanumerical, length 20 |
+| Ref2 | Reference 2 | Alphanumerical, length 20 |
+| Amount | Tax deduction description | Decimal, length 18, precision 2 |
+
+## Example of create open pending payroll
+
+### Advance Paid
+
+:::info
+Employee request advance salary before month end
+:::
+
+1. Navigate to **Payroll > Open Pending Payroll**
+
+2. **Select Advance Paid**
+
+ 
+
+3. **Key in accordingly**
+
+ >***Trans date*** = date apply advance paid
+ >
+ >***Employee*** = which employee
+ >
+ >***Amount*** = amount advance paid
+
+ 
+
+4. Go to Payroll > New Payroll
+
+5. Choose Ad Hoc
+
+6. Set the date when your employee take advance paid
+
+7. Under Process > select Monthly Fixed Allowance / Pending Payroll (will come out the dialog box as pic attached)
+
+8. Tick "Advanced Paid"
+
+ 
+
+9. Process
+
+ 
+
+10. Process Month end Payroll as usual, you will found there is advance deduct at the month end.
+
+ 
+
+### Bonus
+
+1. Navigate to **Payroll** > **Open Pending Payroll**
+
+ 
+
+2. Click on Bonus
+
+ 
+
+3. Next, adjust the bonus of your employee
+
+ 
+
+ 1. Click “Add”
+ 2. Select your employee
+ 3. Key in amount
+ 4. Save
+
+4. Go to **Payroll** > **New Payroll** and click on **Ad Hoc**
+
+ 
+
+5. Tick **EPF** if you want to deduct **EPF**, Tick **PCB** if you want to deduct **PCB**
+
+ 
+
+6. Tick Bonus / Allowance (To input your amount)
+
+ 
+
+7. Change the Description (Optional) and tick the employee you rewarded with bonus
+
+ 
+
+8. Complete and check the payslip
+
+ 
+
+### CP38
+
+- CP38 is a **instruction** to Deduct Salary which **issued by LHDN**. This CP38 instruction requires that the employer **make additional deductions in monthly installments** from the salary of the taxpayer (other than a Monthly Tax Deduction) towards settlement of taxpayer’s income tax arrears.
+- The Salary Deduction Order (CP38) for tax payment in instalments aims to ease the burden **of the taxpayer** who should be paying the tax arrears in one lump sum under the Income Tax Act 1967.
+
+1. **Open Pending Payroll** and choose **CP38**
+
+ 
+
+2. Press **GENERATE** on the top left of the window.
+
+ 
+
+3. Key in the Amount you receive from LHDN Letter, for example this employee ( 00001- Lucious ) had to pay CP38 on **June ( RM450 )** and July **( RM550 )**. Press **GENERATE**.
+
+ 
+
+4. Press **SAVE**
+
+ 
+
+5. This **pending** task only needs to be completed **once**. It will impact **both the June and July month-end processes**. The following pictures below will illustrate the end result :
+
+ 
+
+## Generate Payment Voucher / Journal Entry
+
+:::success[note]
+This is **Additional Module** (Payroll Accounting (SQL Payroll))
+:::
+
+1. To generate the monthly payroll data converted into double entry and get post into SQL Account.
+
+2. It is available in **SQL Payroll version 129** and above.
+
+3. It is available to import payroll data in **SQL Account version 745** and above.
+
+ 
+
+### Overview of the Process Flow
+
+
+
+### Configure Payroll Accounting (1 time setup)
+
+Go to **Menu : Payroll | Generate Payment Voucher / Journal Entry...**
+
+1. At Generate Payment Voucher / Journal Entry, click on **Configure Payroll Accounting.**
+
+ 
+
+2. Overview of the Configure Payroll Accounting settings screen.
+
+ 
+
+#### Step 1: Save GL Account to File (SQL Account)
+
+1. Login the SQL Account database.
+
+2. Go to **File | Import | (SQL Payroll) Import Payment Voucher / Journal Entry | Save GL Account File**
+
+ 
+
+ 
+
+3. Save SQL Account file to Desktop.
+
+ 
+
+#### Step 2: SQL Account GL Code
+
+1. Click on **Load From File**.
+
+ 
+
+2. Select a **SQL Account file (*.txt)** and click **Open**.
+
+ 
+
+3. After the SQL Account GL Code has loaded, the company name will be display and last saved date and time.
+
+ 
+
+4. Click Remove File button if you wish to load the new chart of account.
+
+#### Step 3: GL Account Mapping
+
+1. After load the chart of accounts (in step 2), you are able to lookup and **map the GL Account code** to wages, allowance, overtime, bonus, etc accordingly.
+
+ 
+
+2. Example of the account mapping:
+
+ 
+
+#### Step 4: Posting Method
+
+1. Generate posting entry by **Payment Voucher** or by **Journal Entry**.
+
+2. Group by **Employee** (available in payment voucher), **Branch, Department, HR group, or Category**.
+
+3. Tick to **With Project Code** to post the entry with project code.
+
+4. OPTIONAL: Generate Journal Entry for Employer EPF, SOCSO Accrual **(by default is untick)**. For some company might charge the Employer EPF and SOCSO accrual in next month.
+
+ 
+
+### Generate Payment Voucher / Journal Entry (Export)
+
+ To generate the Payment Voucher or Journal Entry from SQL Payroll. Click on **Generate**.
+
+ 
+
+### Import Payment Voucher / Journal Entry (Import)
+
+1. Login the SQL Account database.
+
+2. Go to **File | Import | (SQL Payroll) Import Payment Voucher / Journal Entry...**
+
+3. Click on **Select File** from the Payment Voucher/Journal Entry (payroll data) generate from SQL Payroll.
+
+ 
+
+4. Click on **Execute**.
+
+ 
diff --git a/docs/usage/payroll/maintenance/_category_.json b/docs/usage/payroll/maintenance/_category_.json
deleted file mode 100644
index e67c525..0000000
--- a/docs/usage/payroll/maintenance/_category_.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "label": "Maintenance",
- "position": 1,
- "link": {
- "type": "generated-index",
- "description": "Covers all maintenance guide of SQL Payroll",
- "slug": "/usage/payroll/maintenance"
- }
-}
\ No newline at end of file
diff --git a/docs/usage/payroll/maintenance/maintain-allowance.md b/docs/usage/payroll/maintenance/maintain-allowance.md
deleted file mode 100644
index 9df2f5a..0000000
--- a/docs/usage/payroll/maintenance/maintain-allowance.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: Maintain Allowance
-description: A guide to process payroll with allowance
-slug: /usage/payroll/maintenance/maintain-allowance
-tags: ["SQL Payroll", "allowance"]
----
-
-## Introduction
-
-:::info Features
-
-- Setting up maintain allowance helps you to categorize the type of allowance that employee entitle.
-- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
-- This is especially useful if you have different types of allowance like Petrol, Handphone, Meal Allowance base on different company different entitlement.
-
-:::
-
-## Setup
-
-1. Navigate to **Payroll** > **Maintenance** > **Maintain Allowance**
-
- 
-
-2. Click New to generate a New Allowance
-
- 
-
-3. Insert the info that you want to set in maintain allowance
-
- 
-
- 1. Insert the Code of the Allowance that you want to generate.
- 2. Insert the Description of the allowance.
- 3. Insert the fixed amount for the allowance, eg: Handphone allowance is fixed RM 300 for every employee then you can insert the rate of RM 300 but if there is not then you can left it blank.
- 4. If the allowance is tax exempted then you may insert the tax exempted code.
- 5. Tick or un-tick the contribution of the allowance.
-
-4. After create the master file of Allowance, then you can add the fixed allowance for certain employee which have the allowance monthly
-
- 
-
-5. Alternatively, you can insert the allowance after process month end.
-
- 
-
- 1. Click on the "**Overtime**"
- 2. CLick on the ➕ to add the employee then fill in the overtime
-
-6. Allowance feature is same with deduction feature, all the allowance is not compulsory just depend on company policy.
diff --git a/docs/usage/payroll/maintenance/maintain-commission.md b/docs/usage/payroll/maintenance/maintain-commission.md
deleted file mode 100644
index 62739e0..0000000
--- a/docs/usage/payroll/maintenance/maintain-commission.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: Maintain Commission
-description: A guide to process payroll with commission
-slug: /usage/payroll/maintenance/maintain-commission
-tags: ["SQL Payroll", "Commission"]
----
-
-## Setup
-
-1. Set the commission for employee
-
- - Navigate to **Payroll** > **Maintenance** > **Maintain Commission**
- - Create new for a new commission rate
-
- 
-
-2. Open pending payroll for commission
-
- - Payroll/Open pending payroll/Commission
- - Insert the employee and amount
-
- 
-
-3. Process month end
-
- 1. Method 1 : Final Payroll Process
-
- - Navigate to **Payroll** > **New payroll** > **Process**
-
- 
-
- 2. Method 2 : Process Adhoc
-
- - Tick EPF & PCB & Monthly Fixed Allowance/Pending Payroll
-
- 
-
- 3. Tick Commission
-
- 
-
-4. Double click the employee that you gave commission
-
- 
-
-5. Refer to commission column
-
- 
diff --git a/docs/usage/payroll/maintenance/maintain-contribution.md b/docs/usage/payroll/maintenance/maintain-contribution.md
deleted file mode 100644
index 039ba49..0000000
--- a/docs/usage/payroll/maintenance/maintain-contribution.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Maintain Contribution
-description: A guide to set up maintain contribution for different workers
-slug: /usage/payroll/maintenance/maintain-contribution
-tags: ["SQL Payroll", "Contribution"]
----
-
-## Introduction
-
-:::info
-Learn how to set the Employee/Employer EPF rate, OT calculation and Tax calculation following this guide
-:::
-
-- Setting up maintain contribution helps you to categorise the type of contribution an employee received
-- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
-- This is especially useful if you have different types of worker such as permanent worker, contract worker, foreign worker & etc
-
-## Setup
-
-1. Navigate to **Payroll** > **Maintenance** > **Maintain Contribution**
-
- 
-
-2. Click new to create new contribution
-
- 
-
-3. Key in the info and tick the contribution needed
-
-
-
-
-## Common contribution setup
-
-| Local Permanent Workers | Foreign Workers |
-| ------------------------------------------------------------------------------------ | -------------------------------------------------------------------- |
-|  |  |
-
-## Explanation of terms in Maintain Contribution panel
-
-
-
-
-
-
diff --git a/docs/usage/payroll/maintenance/maintain-employee-opening-balance.md b/docs/usage/payroll/maintenance/maintain-employee-opening-balance.md
deleted file mode 100644
index f49d3dd..0000000
--- a/docs/usage/payroll/maintenance/maintain-employee-opening-balance.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Maintain Employee Opening Balance
-description: A guide to maintain employee's opening balance
-slug: /usage/payroll/maintenance/maintain-employee-opening-balance
-tags: ["SQL Payroll", "Employee", "Opening Balance"]
----
-
-## Introduction
-
-- Maintain employee’s opening balance is done when the respective employee enter the company in a month **later than January**.
-- The previous PCB amount is **needed to key in so that the system can correctly calculate** the PCB amount that’s needed to pay every month.
-
-## Setup
-
-1. Navigate to the **Open Payroll**
-
- 
-
-2. Double click the year in Open Payroll
-
- 
-
-3. Double click the transaction under ‘Opening’
-
- 
-
-4. Select the employee by double clicking on the name
-
- 
-
-5. Key in all the employee’s opening balance information
-
- 
-
-## Mapping of SQL 'opening' to EA form
-
-
-
-## Special note for additional EPF and additional PCB
-
-- Additional EPF and additional PCB are used when additional remuneration (bonus, commission, paid leave) is given.
-- In the EA form, normal EPF and additional EPF is group into one.
-- However, SQL recommend users to split the amount for a more detail input.
-
-
diff --git a/docs/usage/payroll/maintenance/maintain-frequency.md b/docs/usage/payroll/maintenance/maintain-frequency.md
deleted file mode 100644
index 408d018..0000000
--- a/docs/usage/payroll/maintenance/maintain-frequency.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: Maintain Frequency
-description: A guide to maintain payroll frequency method
-slug: /usage/payroll/maintenance/maintain-frequency
-tags: ["SQL Payroll", "Frequency"]
----
-
-:::info
-Frequency – Where one company will pay salary **twice or more times** in **a Month**.
-:::
-
-## Setup
-
-1. Navigate to **Payroll** > **Maintenance** > **Maintain Frequency**
-
- 
-
-2. Click on **New** to preset your contribution.
-
- 
-
-3. Go to **Human Resource** > **Maintain Employee**, Select the particular Employee and then Go to **Payroll Info Tab** and set the Frequency According to the Maintenance Frequency respectively.
-
- 
-
-4. After save, you can check the allowance the employee is having. In this example, the employee Nicole has an Fixed Allowance of RM 230.
-
- 
-
-5. Next, go to **Payroll** > **New payroll** > **Frequency**
-
- 
-
- 1 Select the Frequency as you Set in Maintenance Frequency (EG: Half).
-
- 2 The Employee/s that u have set as the Frequency type in Maintain Employee will show in this column
-
- 3 Tick the Sequence that u wan to process.
-
- 4 Click PROCESS
-
-6. The following result below will show in the **HALF MONTH FREQUENCY PAYROLL**.
-
- 
-
-7. When it is time to do month end, click on Payroll, look for New Payroll and click on Final Month End to process.
-
- 
-
-8. Select the Employee ( Nicole ) that you’ve process Frequency. The following is an example result of the Employee that had process Frequency.
-
- - Wages - [2800 (Basic) – 1400 (Frequency) = 1400 ]
- - Allowance - [ 230 (Fixed) – 115 (Frequency) = 115 ]
-
- 
diff --git a/docs/usage/payroll/maintenance/maintain-overtime.md b/docs/usage/payroll/maintenance/maintain-overtime.md
deleted file mode 100644
index 768603e..0000000
--- a/docs/usage/payroll/maintenance/maintain-overtime.md
+++ /dev/null
@@ -1,202 +0,0 @@
----
-title: Maintain Overtime
-description: A guide to process payroll with overtime
-slug: /usage/payroll/maintenance/maintain-overtime
-tags: ["SQL Payroll", "Overtime"]
----
-
-## Introduction
-
-:::info Features
-
-- Setting up maintain overtime helps you to categorize the type of overtime that company have.
-- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
-- This setting will bring impact of the calculation of overtime.
-
-:::
-
-## Process Overtime After Month End
-
-1. Click on **Payroll** > **Maintenance** > **Maintain Overtime**
-
- 
-
-2. In the list, you can find some default overtime settings. Click on **New** to generate a custom one
-
- 
-
-3. Key-in Overtime details as below
-
- 
-
- - Insert the **Code** and **Description** of the overtime that you want to generate.
- - Insert the **Rate** of the overtime, eg : the overtime rate is 1.5 as per overtime amount or double, triple of the overtime amount.
- - **Unit Type** is to set the overtime calculation by hourly or by daily.
- -Set the contribution of overtime with EPF, SOCSO, PCB, EIS etc.
-
-4. After that, when we need to process the payroll at the month end. Navigate to **Payroll** > **New Payroll**
-
- 
-
-5. Click **Final**, and click on **Process**
-
- 
-
-6. Click on any employee
-
- 
-
-7. Click on the "**Overtime**"
-
- 
-
-8. Click on the ➕ to add the info you want
-
- 
-
-9. Click on the "**Code**" to choose the overtime type
-
- 
-
-10. Key in the work unit as overtime hour, for example if Lee hong Wai overtime for 2 hours on that particular day, just key in numbering as 2 will do
-
- 
-
-11. Alternatively, you can click on the button beside Trans Date, and tick the column name Work Unit As Time
-
- 
-
-12. After call out the column of Work Unit As Time, you may key in he overtime minutes also (eg: 2 hours and 09 mins)
- 
-
-## Process Overtime Before Month End
-
-1. Click on payroll, open pending payroll.
-
- 
-
-2. Double Click on **Overtime**
-
- 
-
-3. Click on Append icon
-
- 
-
- 
-
-4. Select employee
-
- 
-
-5. Select **Overtime Code**
-
- 
-
-6. Tick and enable the **Work Unit As Time**
-
- 
-
-7. Enter the time in the work unit as time, for example Lee Chong Wai worked overtime for 2hours and 30minutes, key in as shown below
-
- 
-
-8. Repeat the same steps as shown above for the other overtime records and save after all done
-
- 
-
-9. During month end,
-
- 
-
- 
-
-10. Double click on the employee’s name or code
-
- 
-
-11. Click on the blue **Overtime** words
-
- 
-
-12. The overtime records entered in pending payroll will be shown
-
- 
-
-## Import Excel Overtime Format into SQL Payroll
-
-1. Prepare a table in Microsoft Excel as shown in the image below
-
- 
-
- :::tip
-
- - **Date**: Trans Date
- - **Employee**: Code of Employee
- - **OT**: Code of Overtime that created in Maintain Overtime
- - **Unit**: Work Unit (count 2.50 = 150 minutes/2 and a half hours)
- :::
-
-2. After done the table, go to file
-
- 
-
-3. Click on Save as
-
- 
-
-4. Select CSV file type
-
- 
-
-5. Click Save
-
- 
-
-6. Go to SQL Payroll > Payroll > Open Pending Payroll...
-
- 
-
-7. Double click on the Overtime
-
- 
-
-8. Click on the Import Data icon
-
- 
-
-9. Click on the … (3 dots button) to select your data source,
-
- 
-
-10. Select the csv file to import
-
- 
-
-11. Click on the Next button
-
- 
-
-12. Import from row 1, select Comma, select " for the text delimiter
-
- 
-
-13. Select the field for every column
-
- 
-
-14. Make sure you have select all the fields for the date, employee, code & workunit.
-
- 
-
-15. Change the Import from row to **2** and click the finish button
-
- 
-
-16. Click on the Close button after done importing the data
-
- 
-
-17. Click on the Save icon
-
- 
diff --git a/docs/usage/payroll/maintenance/maintain-payment-method.md b/docs/usage/payroll/maintenance/maintain-payment-method.md
deleted file mode 100644
index 736005a..0000000
--- a/docs/usage/payroll/maintenance/maintain-payment-method.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: Maintain Payment Method
-description: A guide to maintain payment method
-slug: /usage/payroll/maintenance/maintain-payment-method
-tags: ["SQL Payroll", "Payment Method"]
----
-
-## Introduction
-
-- Maintain Payment Method helps you to categorise how you want to pay your employee
-- This is useful when you have different type of banks (MBB, HLB & etc) and method of paying (Cash, Cheque, Transfer)
-- At here, we can also set the **auto rounding** so that all payout is round to the nearest 5 cent
-
- - eg: Employee total pay = RM1234.**56**
- - After auto rounding, it will become RM1234.**55**
-
-## Setup
-
-1. Navigate to the maintain payment method panel
-
- 
-
-2. Click new to create new payment method
-
- 
-
-3. Key in the information needed (Click save after configured)
-
- 
-
- 
-
-## Explanation of auto rounding
-
-### Without auto rounding
-
-
-
-- After month end will show **no adjustment**
-- However, adjustment can be manually change by clicking the up/down arrow beside it
-
-
-
-### With auto rounding
-
-- After month end will have **auto adjustment** to nearest 5 cents
-
-
-
-## Usage
-
-:::info
-This particular settings can be applied to several places dynamically
-:::
-
-### New Payroll
-
-- You able to process payroll either Final, Frequency or Ad Hoc basis
-
-### Open Payroll
-
-- You can re-open payroll processed to check or edit
-
-### Open Pending Payroll
-
-- This pending payroll allowed to input the pending amount before final payroll process
-- You may input the following type of pending amount:
- - Wages
- - Allowance
- - Paid leave
- - Overtime
- - Claims
- - Director Fees
- - Commission
- - Bonus
- - Loan
- - Deduction
- - Unpaid leave
- - Advance
- - CP38
diff --git a/docs/usage/payroll/maintenance/maintain-wages.md b/docs/usage/payroll/maintenance/maintain-wages.md
deleted file mode 100644
index b0837c9..0000000
--- a/docs/usage/payroll/maintenance/maintain-wages.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: Maintain Wages
-description: A guide to maintain wages
-slug: /usage/payroll/maintenance/maintain-wages
-tags: ["SQL Payroll", "Wages"]
----
-
-## Introduction
-
-:::info Features
-
-- Enable to set different other contribution for Bonus, Director Fee, Pay Leave and Unpaid Leave.
-- Maintain the Employee & Employer EPF Rate.
-- Maintain the working hour and day per month.
-- Enable the Overtime Calculation base on Maintain Employee Setting. It will calculate the OT based on Wages amount in Maintain Employee.
-
-:::
-
-- Setting up maintain wages helps you to categorise the type of wages an employee received.
-- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
-- This is especially useful if you have different types of worker such as
- permanent worker, contract worker, foreign worker & etc
-
-## Setup
-
-1. Navigate to **Payroll** > **Maintenance** > **Maintain Wages**
-
- 
-
-2. Click new to create new wages type
-
- 
-
-3. Key in the info and tick the contribution needed
-
- 
- 
-
-## Common wages setup
-
-| Local Permanent Workers | Foreign Workers |
-| ----------------------------------------------------------------------------- | ------------------------------------------------------------- |
-|  |  |
diff --git a/docs/usage/payroll/opening-balance.md b/docs/usage/payroll/opening-balance.md
deleted file mode 100644
index db571ef..0000000
--- a/docs/usage/payroll/opening-balance.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: Opening Balance
-description: A guide to maintain opening balance of employees
-slug: /usage/payroll/opening-balance
-tags: ["SQL Payroll", "Opening Balance"]
----
-
-## Introduction
-
-Maintain employee’s opening balance is done when the respective employee enter the company in a month **later than January**.
-
-The previous PCB amount is **needed to key in so that the system can correctly calculate** the PCB amount that’s needed to pay every month.
-
-## Setup
-
-1. Navigate to **Payroll** > **Open Payroll**
-
- 
-
-2. Double click on the payroll year to open it
-
- 
-
-3. Double click on the transaction section under "**Opening**"
-
- 
-
-4. Select the employee by double clicking on its name
-
- 
-
-5. Key in all the employee’s opening balance information
-
- 
-
- :::info
-
- For the General part can enter information accordign to the EA form
- For others part Employee need to know whether they have any of it in previous employment
- :::
-
-## Mapping of SQL "opening" to EA form
-
-
-
-## Special note for additional EPF and PCB
-
-- Additional EPF and additional PCB are used when additional remuneration (bonus, commission, paid leave) is given.
-- In the EA form, normal EPF and additional EPF is group into one.
-- However, SQL recommend users to split the amount for a more detail input.
-
-
diff --git a/docs/usage/payroll/recurring-payroll.md b/docs/usage/payroll/recurring-payroll.md
deleted file mode 100644
index 1e90e30..0000000
--- a/docs/usage/payroll/recurring-payroll.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: Recurring Payroll
-description: A guide to process recurring payroll for advance paid, allowance and overtime
-slug: /usage/payroll/recurring-payroll
-tags: ["SQL Payroll", "Recurring", "Recurring Payroll", "Advance Paid", "Allowance", "Overtime"]
----
-
-## Setup
-
-:::info
-This allow you to repeat the same amount of payment for the next month if you have already keyed in the advance payment, allowance or overtime for one month’s month end payroll
-:::
-
-1. Right click on previous month’s payroll > **Open** > **Open Overtime**
-
- 
-
-2. Highlight all the Overtimes by clicking on the entries while pressing down on the SHIFT button.
-
- 
-
-3. Right click and then Copy
-
- 
-
-4. Go to **Payroll** > **Open Pending Payroll** and select Overtime
-
- 
-
-5. Right-click on the white area and select paste
-
- 
-
-6. Select all the entries by clicking on it while pressing down on the SHIFT button. then right- click and select “batch edit value”.
-
- 
-
-7. Change the Column to “Post Date”
-
- 
-
-8. Key in the post date of you next month’s payroll and press Execute.
-
- 
-
-9. Press OK and Close the window.
-
- 
-
-10. You will see that the Post Date has change. Press Save. The changes have been successfully saved once the icon turns grey colour.
-
- 
-
-11. When you process your next month’s payroll. It will capture these values.
-
- For example, in September 2021’s month end copied from August 2021:
-
- 
-
-12. Repeat the same steps for allowances, and advance payments.
diff --git a/docs/usage/payroll/setup.md b/docs/usage/payroll/setup.md
new file mode 100644
index 0000000..2d899cb
--- /dev/null
+++ b/docs/usage/payroll/setup.md
@@ -0,0 +1,565 @@
+---
+sidebar_position: 1
+title: Setup
+description: A setup for payroll maintenance
+slug: /usage/payroll/setup
+tags: ["SQL Payroll", "Setup"]
+---
+
+## Maintain Allowance
+
+:::info Features
+
+- Setting up maintain allowance helps you to categorize the type of allowance that employee entitle.
+- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
+- This is especially useful if you have different types of allowance like Petrol, Handphone, Meal Allowance base on different company different entitlement.
+
+:::
+
+1. Navigate to **Payroll** > **Maintenance** > **Maintain Allowance**
+
+ 
+
+2. Click New to generate a New Allowance
+
+ 
+
+3. Insert the info that you want to set in maintain allowance
+
+ 
+
+ 1. Insert the Code of the Allowance that you want to generate.
+ 2. Insert the Description of the allowance.
+ 3. Insert the fixed amount for the allowance, eg: Handphone allowance is fixed RM 300 for every employee then you can insert the rate of RM 300 but if there is not then you can left it blank.
+ 4. If the allowance is tax exempted then you may insert the tax exempted code.
+ 5. Tick or un-tick the contribution of the allowance.
+
+4. After create the master file of Allowance, then you can add the fixed allowance for certain employee which have the allowance monthly
+
+ 
+
+5. Alternatively, you can insert the allowance after process month end.
+
+ 
+
+ 1. Click on the "**Overtime**"
+ 2. CLick on the ➕ to add the employee then fill in the overtime
+
+6. Allowance feature is same with deduction feature, all the allowance is not compulsory just depend on company policy.
+
+## Maintain Claim
+
+:::info Feature
+
+- Maintain Claim is used to define the types of claims available to employees, as well as set default amounts and limits.
+- For example, for travel claims, accommodation expenses, and communication expenses, you can set monthly or per-claim limits, set fixed amounts, or leave them blank for employees to fill in.
+- This can impact the reimbursement process, monthly reimbursement review, and payroll calculations.
+
+:::
+
+1. Navigate to **Payroll** > **Maintenance** > **Maintain claim**
+
+ 
+
+2. Click New to generate a New Claim
+
+ 
+
+3. Insert the info that you want to set in maintain claim
+
+ 
+
+ 1. Insert the Code of the Claim that you want to generate.
+ 2. Insert the Description of the claim.
+ 3. Insert the Yearly Limit for the claim, eg: RM 2000 for every employee then you can insert the rate of RM 2000 but if there is no limit then you can left it blank as Unlimited by click the 'Set as Unlimited' button.
+ 4. Insert the Monthly Limit for the claim, eg: RM 200 for every employee then you can insert the rate of RM 200 but if there is no limit then you can left it blank as Unlimited by click the 'Set as Unlimited' button.
+
+4. After create the master file of Claim, then you can add the fixed claim's Yearly Limit and Monthly Limit for certain employee which have the claim.
+
+ 
+
+5. Alternatively, you can insert the claim after process month end.
+
+ 
+
+ 1. Click on the "**Claim**"
+ 2. CLick on the ➕ to add the employee then fill in the claim
+
+## Maintain Commission
+
+1. Set the commission for employee
+
+ - Navigate to **Payroll** > **Maintenance** > **Maintain Commission**
+ - Create new for a new commission rate
+
+ 
+
+2. Open pending payroll for commission
+
+ - Payroll/Open pending payroll/Commission
+ - Insert the employee and amount
+
+ 
+
+3. Process month end
+
+ 1. Method 1 : Final Payroll Process
+
+ - Navigate to **Payroll** > **New payroll** > **Process**
+
+ 
+
+ 2. Method 2 : Process Adhoc
+
+ - Tick EPF & PCB & Monthly Fixed Allowance/Pending Payroll
+
+ 
+
+ 3. Tick Commission
+
+ 
+
+4. Double click the employee that you gave commission
+
+ 
+
+5. Refer to commission column
+
+ 
+
+## Maintain Contribution
+
+:::info
+Learn how to set the Employee/Employer EPF rate, OT calculation and Tax calculation following this guide
+:::
+
+- Setting up maintain contribution helps you to categorise the type of contribution an employee received
+- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
+- This is especially useful if you have different types of worker such as permanent worker, contract worker, foreign worker & etc
+
+1. Navigate to **Payroll** > **Maintenance** > **Maintain Contribution**
+
+ 
+
+2. Click new to create new contribution
+
+ 
+
+3. Key in the info and tick the contribution needed
+
+
+
+
+### Common contribution setup
+
+| Local Permanent Workers | Foreign Workers |
+| ------------------------------------------------------------------------------------ | -------------------------------------------------------------------- |
+|  |  |
+
+### Explanation of terms in Maintain Contribution panel
+
+
+
+
+
+
+
+## Maintain Deduction
+
+:::info Features
+
+Maintain Deductions is used to configure employee payroll deductions, such as personal loan deductions, company advance deductions, lateness deductions, and restaurant deductions.
+
+Deductions can be fixed amounts or percentages; once configured, they are automatically deducted from payroll.
+
+Deductions may affect net pay, tax calculations, and the inclusion or exclusion of contributions such as EPF/SOCSO. These settings should be based on company policies and regulations.
+
+:::
+
+1. Navigate to **Payroll** > **Maintenance** > **Maintain Deduction**
+
+ 
+
+2. Click New to generate a New Deduction
+
+ 
+
+3. Insert the info that you want to set in maintain deduction
+
+ 
+
+ 1. Insert the Code of the Deduction that you want to generate.
+ 2. Insert the Description of the deduction.
+ 3. Insert the fixed amount for the deduction, eg: Loan deduction is fixed RM 100 for every employee then you can insert the rate of RM 100 but if there is not then you can left it blank.
+ 4. Select the type of the deduction you want (General / Zakat / Tabung Haji / PTPTN).
+ 5. Tick or un-tick the contribution of the deduction.
+
+4. After create the master file of Deduction, then you can add the fixed deduction for certain employee which have the deduction monthly
+
+ 
+
+5. Alternatively, you can insert the deduction after process month end.
+
+ 
+
+ 1. Click on the "**Deduction**"
+ 2. CLick on the ➕ to add the employee then fill in the deduction
+
+6. Deduction feature is same with allowance feature, all the deduction is not compulsory just depend on company policy.
+
+## Maintain Employee's Opening Balance
+
+- Maintain employee’s opening balance is done when the respective employee enter the company in a month **later than January**.
+- The previous PCB amount is **needed to key in so that the system can correctly calculate** the PCB amount that’s needed to pay every month.
+
+1. Navigate to the **Open Payroll**
+
+ 
+
+2. Double click the year in Open Payroll
+
+ 
+
+3. Double click the transaction under ‘Opening’
+
+ 
+
+4. Select the employee by double clicking on the name
+
+ 
+
+5. Key in all the employee’s opening balance information
+
+ 
+
+### Mapping of SQL 'opening' to EA form
+
+
+
+### Special note for additional EPF and additional PCB
+
+- Additional EPF and additional PCB are used when additional remuneration (bonus, commission, paid leave) is given.
+- In the EA form, normal EPF and additional EPF is group into one.
+- However, SQL recommend users to split the amount for a more detail input.
+
+
+
+:::info
+Frequency – Where one company will pay salary **twice or more times** in **a Month**.
+:::
+
+## Maintain Frequency
+
+1. Navigate to **Payroll** > **Maintenance** > **Maintain Frequency**
+
+ 
+
+2. Click on **New** to preset your contribution.
+
+ 
+
+3. Go to **Human Resource** > **Maintain Employee**, Select the particular Employee and then Go to **Payroll Info Tab** and set the Frequency According to the Maintenance Frequency respectively.
+
+ 
+
+4. After save, you can check the allowance the employee is having. In this example, the employee Nicole has an Fixed Allowance of RM 230.
+
+ 
+
+5. Next, go to **Payroll** > **New payroll** > **Frequency**
+
+ 
+
+ 1 Select the Frequency as you Set in Maintenance Frequency (EG: Half).
+
+ 2 The Employee/s that u have set as the Frequency type in Maintain Employee will show in this column
+
+ 3 Tick the Sequence that u wan to process.
+
+ 4 Click PROCESS
+
+6. The following result below will show in the **HALF MONTH FREQUENCY PAYROLL**.
+
+ 
+
+7. When it is time to do month end, click on Payroll, look for New Payroll and click on Final Month End to process.
+
+ 
+
+8. Select the Employee ( Nicole ) that you’ve process Frequency. The following is an example result of the Employee that had process Frequency.
+
+ - Wages - [2800 (Basic) – 1400 (Frequency) = 1400 ]
+ - Allowance - [ 230 (Fixed) – 115 (Frequency) = 115 ]
+
+ 
+
+## Maintain Overtime
+
+:::info Features
+
+- Setting up maintain overtime helps you to categorize the type of overtime that company have.
+- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
+- This setting will bring impact of the calculation of overtime.
+
+:::
+
+### Process Overtime After Month End
+
+1. Click on **Payroll** > **Maintenance** > **Maintain Overtime**
+
+ 
+
+2. In the list, you can find some default overtime settings. Click on **New** to generate a custom one
+
+ 
+
+3. Key-in Overtime details as below
+
+ 
+
+ - Insert the **Code** and **Description** of the overtime that you want to generate.
+ - Insert the **Rate** of the overtime, eg : the overtime rate is 1.5 as per overtime amount or double, triple of the overtime amount.
+ - **Unit Type** is to set the overtime calculation by hourly or by daily.
+ -Set the contribution of overtime with EPF, SOCSO, PCB, EIS etc.
+
+4. After that, when we need to process the payroll at the month end. Navigate to **Payroll** > **New Payroll**
+
+ 
+
+5. Click **Final**, and click on **Process**
+
+ 
+
+6. Click on any employee
+
+ 
+
+7. Click on the "**Overtime**"
+
+ 
+
+8. Click on the ➕ to add the info you want
+
+ 
+
+9. Click on the "**Code**" to choose the overtime type
+
+ 
+
+10. Key in the work unit as overtime hour, for example if Lee hong Wai overtime for 2 hours on that particular day, just key in numbering as 2 will do
+
+ 
+
+11. Alternatively, you can click on the button beside Trans Date, and tick the column name Work Unit As Time
+
+ 
+
+12. After call out the column of Work Unit As Time, you may key in he overtime minutes also (eg: 2 hours and 09 mins)
+ 
+
+### Process Overtime Before Month End
+
+1. Click on payroll, open pending payroll.
+
+ 
+
+2. Double Click on **Overtime**
+
+ 
+
+3. Click on Append icon
+
+ 
+
+ 
+
+4. Select employee
+
+ 
+
+5. Select **Overtime Code**
+
+ 
+
+6. Tick and enable the **Work Unit As Time**
+
+ 
+
+7. Enter the time in the work unit as time, for example Lee Chong Wai worked overtime for 2hours and 30minutes, key in as shown below
+
+ 
+
+8. Repeat the same steps as shown above for the other overtime records and save after all done
+
+ 
+
+9. During month end,
+
+ 
+
+ 
+
+10. Double click on the employee’s name or code
+
+ 
+
+11. Click on the blue **Overtime** words
+
+ 
+
+12. The overtime records entered in pending payroll will be shown
+
+ 
+
+### Import Excel Overtime Format into SQL Payroll
+
+1. Prepare a table in Microsoft Excel as shown in the image below
+
+ 
+
+ :::tip
+
+ - **Date**: Trans Date
+ - **Employee**: Code of Employee
+ - **OT**: Code of Overtime that created in Maintain Overtime
+ - **Unit**: Work Unit (count 2.50 = 150 minutes/2 and a half hours)
+ :::
+
+2. After done the table, go to file
+
+ 
+
+3. Click on Save as
+
+ 
+
+4. Select CSV file type
+
+ 
+
+5. Click Save
+
+ 
+
+6. Go to SQL Payroll > Payroll > Open Pending Payroll...
+
+ 
+
+7. Double click on the Overtime
+
+ 
+
+8. Click on the Import Data icon
+
+ 
+
+9. Click on the … (3 dots button) to select your data source,
+
+ 
+
+10. Select the csv file to import
+
+ 
+
+11. Click on the Next button
+
+ 
+
+12. Import from row 1, select Comma, select " for the text delimiter
+
+ 
+
+13. Select the field for every column
+
+ 
+
+14. Make sure you have select all the fields for the date, employee, code & workunit.
+
+ 
+
+15. Change the Import from row to **2** and click the finish button
+
+ 
+
+16. Click on the Close button after done importing the data
+
+ 
+
+17. Click on the Save icon
+
+ 
+
+## Maintain Payment Method
+
+- Maintain Payment Method helps you to categorise how you want to pay your employee
+- This is useful when you have different type of banks (MBB, HLB & etc) and method of paying (Cash, Cheque, Transfer)
+- At here, we can also set the **auto rounding** so that all payout is round to the nearest 5 cent
+
+ - eg: Employee total pay = RM1234.**56**
+ - After auto rounding, it will become RM1234.**55**
+
+1. Navigate to the maintain payment method panel
+
+ 
+
+2. Click new to create new payment method
+
+ 
+
+3. Key in the information needed (Click save after configured)
+
+ 
+
+ 
+
+### Explanation of auto rounding
+
+#### Without auto rounding
+
+
+
+- After month end will show **no adjustment**
+- However, adjustment can be manually change by clicking the up/down arrow beside it
+
+
+
+#### With auto rounding
+
+- After month end will have **auto adjustment** to nearest 5 cents
+
+
+
+## Maintain Wages
+
+:::info Features
+
+- Enable to set different other contribution for Bonus, Director Fee, Pay Leave and Unpaid Leave.
+- Maintain the Employee & Employer EPF Rate.
+- Maintain the working hour and day per month.
+- Enable the Overtime Calculation base on Maintain Employee Setting. It will calculate the OT based on Wages amount in Maintain Employee.
+
+:::
+
+- Setting up maintain wages helps you to categorise the type of wages an employee received.
+- This would affect the types of contribution that they need to provide (EPF/SOCSO/PCB & etc)
+- This is especially useful if you have different types of worker such as
+ permanent worker, contract worker, foreign worker & etc
+
+1. Navigate to **Payroll** > **Maintenance** > **Maintain Wages**
+
+ 
+
+2. Click new to create new wages type
+
+ 
+
+3. Key in the info and tick the contribution needed
+
+ 
+ 
+
+### Common wages setup
+
+| Local Permanent Workers | Foreign Workers |
+| ----------------------------------------------------------------------------- | ------------------------------------------------------------- |
+|  |  |
diff --git a/docs/usage/report.md b/docs/usage/report.md
new file mode 100644
index 0000000..27627b1
--- /dev/null
+++ b/docs/usage/report.md
@@ -0,0 +1,76 @@
+---
+sidebar_position: 6
+title: Report
+description: General topics of Report in SQL Payroll
+slug: /usage/report
+tags: ["SQL Payroll", "Report","EA form"]
+---
+
+## List of Reports
+
+| Report | Description |
+| ---------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| **Print Cheque Listing Report** | Help you to generate the individual pay amount for banker |
+| **Print Coinage Report** | Help you to count the number of money papers/coins required for the pay amount |
+| **Print Credit Bank Report** | Help you to generate the individual pay amount via Direct Transfer service |
+| **Print Pay Slip** | Enable to generate the pay slip for the employees selected |
+| **Print Payroll Summary** | Help you to analyse the payroll for a month like wages, claims, unpaid leave, allowance, etc |
+| **Print Yearly Individual Report** | You able to choose the employee to view the detail 12 months payroll |
+| **Print Yearly Payroll Report** | Generate 12 months payroll for individual employees |
+| **Statutory Reports** | You able to generate the government reports, such as EPF Borang A, Income Tax EA, Sosco Borang 8A, etc |
+
+## EA Form
+
+### Print EA Form
+
+1. Let's go to Payroll -> Statutary Reports (Yearly) -> Print Income Tax EA Form..
+
+ 
+
+2. Fill in the details in red box and click ▶️**Apply**
+
+ 
+
+3. After the above steps, you will see the details of each employees
+
+ :::info[Customization]
+ In SQL Payroll, we do support amending employee EA Form details before printing. Find out more [here](#customize-ea-form)
+ :::
+
+4. Click on the **Print** button
+
+ 
+
+5. Lastly, select the EA Form report you wish to print
+
+ 
+
+### Customize EA Form
+
+:::info
+Jump to **step 3** if you are coming from the **Print EA Form** section
+:::
+
+1. Let's go to Payroll -> Statutary Reports (Yearly) -> Print Income Tax EA Form..
+
+ 
+
+2. fill in the details and click ▶️**Apply**
+
+ 
+
+3. Click on the text **Customize EA Form** at your bottom right
+
+ 
+
+4. Select the employee to amend and click **Customize**
+
+ 
+
+5. Fill in the details you wish to amend and click **Save** ( diskette 💾)
+
+ 
+
+6. Amended employee will be highlighted in yellow colour 🟡.
+
+ 
diff --git a/docs/usage/report/_category_.json b/docs/usage/report/_category_.json
deleted file mode 100644
index a34b1c9..0000000
--- a/docs/usage/report/_category_.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "label": "Report",
- "position": 6,
- "link": {
- "type": "generated-index",
- "description": "General topics of Report in SQL Payroll",
- "slug": "/usage/report"
- }
-}
\ No newline at end of file
diff --git a/docs/usage/report/ea-form.md b/docs/usage/report/ea-form.md
deleted file mode 100644
index 036d42b..0000000
--- a/docs/usage/report/ea-form.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: EA Form
-description: EA Form Print guide
-slug: /usage/report/ea-form
-tags: ["SQL Payroll", "EA form"]
----
-
-## Print EA Form
-
-1. Let's go to Payroll -> Statutary Reports (Yearly) -> Print Income Tax EA Form..
-
- 
-
-2. Fill in the details in red box and click ▶️**Apply**
-
- 
-
-3. After the above steps, you will see the details of each employees
-
- :::info[Customization]
- In SQL Payroll, we do support amending employee EA Form details before printing. Find out more [here](#customize-ea-form)
- :::
-
-4. Click on the **Print** button
-
- 
-
-5. Lastly, select the EA Form report you wish to print
-
- 
-
-## Customize EA Form
-
-:::info
-Jump to **step 3** if you are coming from the **Print EA Form** section
-:::
-
-1. Let's go to Payroll -> Statutary Reports (Yearly) -> Print Income Tax EA Form..
-
- 
-
-2. fill in the details and click ▶️**Apply**
-
- 
-
-3. Click on the text **Customize EA Form** at your bottom right
-
- 
-
-4. Select the employee to amend and click **Customize**
-
- 
-
-5. Fill in the details you wish to amend and click **Save** ( diskette 💾)
-
- 
-
-6. Amended employee will be highlighted in yellow colour 🟡.
-
- 
diff --git a/docs/usage/report/report.md b/docs/usage/report/report.md
deleted file mode 100644
index 97f6ef3..0000000
--- a/docs/usage/report/report.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-sidebar_position: 1
-title: Reports
-description: Reports available in SQL Payroll
-slug: /usage/report/reports
-tags: ["SQL Payroll", "Report"]
----
-
-## List of Reports
-
-| Report | Description |
-| ---------------------------------- | ------------------------------------------------------------------------------------------------------ |
-| **Print Cheque Listing Report** | Help you to generate the individual pay amount for banker |
-| **Print Coinage Report** | Help you to count the number of money papers/coins required for the pay amount |
-| **Print Credit Bank Report** | Help you to generate the individual pay amount via Direct Transfer service |
-| **Print Pay Slip** | Enable to generate the pay slip for the employees selected |
-| **Print Payroll Summary** | Help you to analyse the payroll for a month like wages, claims, unpaid leave, allowance, etc |
-| **Print Yearly Individual Report** | You able to choose the employee to view the detail 12 months payroll |
-| **Print Yearly Payroll Report** | Generate 12 months payroll for individual employees |
-| **Statutory Reports** | You able to generate the government reports, such as EPF Borang A, Income Tax EA, Sosco Borang 8A, etc |
diff --git a/docs/usage/tools/_category_.json b/docs/usage/tools/_category_.json
index 7f0beb2..04dedb5 100644
--- a/docs/usage/tools/_category_.json
+++ b/docs/usage/tools/_category_.json
@@ -1,6 +1,6 @@
{
"label": "Tools",
- "position": 3,
+ "position": 6,
"link": {
"type": "generated-index",
"description": "General topics of Tools in SQL Payroll",
diff --git a/docs/usage/tools/maintain-diy.md b/docs/usage/tools/maintain-diy.md
new file mode 100644
index 0000000..bc8aa96
--- /dev/null
+++ b/docs/usage/tools/maintain-diy.md
@@ -0,0 +1,130 @@
+---
+sidebar_position: 3
+title: Maintain DIY
+description: A guide of maintain diy
+slug: /usage/tools/maintain-diy
+tags: ["SQL Payroll", "Maintain DIY"]
+---
+
+## Introduction
+
+:::success[note]
+This is **Additional Module** (DIY Fields & DIY Script Module)
+:::
+
+1. The function and description:
+
+ 1. **Field and Quick Form**: User can Self Create new User Define Field(s) & Design the Layout
+ 2. **Script**: Customise the Application
+ 3. **Calculation**: Override the build in Calculation (SQL Payroll ONLY)
+ 4. **View Template**: For Advance Form Mode
+
+
+
+## Calculation
+
+User can override the build in Calculation/Formula to suite their requirement. The Language use is Pascal.
+
+**Available Calculation Types:**
+
+1. **Generate Document Number**: Manipulate the Next Document Number Format.
+2. **Leave Entitlement Policy**: Manipulate yearly Leave Entitlement
+3. **Leave Entitlement Processor**: Manipulate Calculation of Year of working
+4. **Leave Calculate Amount**: Manipulate the Leave Calculation Amount
+5. **Leave Calculate BF**: Calculate how many leave can be Brought Forward if not fully taken
+6. **Leave Attendance Reward**: Manipulate Reward for Perfect Attendance.
+7. **Overtime Pay Rate**: Manipulate the Overtime Pay rate
+8. **Payroll Rounding**: Manipulate the Net Pay Amount
+9. **Bonus Wages**: Manipulate Bonus and Incentive Payments.
+10. **Time Attendance OT Rule**: Manipulate Overtime Rules based on Attendance.
+11. **Time Attendance Leave Rule**: Manipulate Leave Rules based on Attendance.
+12. **Time Attendance Reward**: Manipulate Reward Rules based on Attendance.
+
+
+
+### Example 1 - Leave Entitlement Processor - Calculate from Confirm Date
+
+Below is example to change the Leave Entitlement Processor to be calculate from the Confirmation Date.
+
+1. Right Click at **Leave Entitlement Processor** and select **New Calculation**.
+
+ 
+
+2. Click **New Button** and select any Formula which suit you & Click OK.
+
+ 
+
+3. Enter any **Description** (eg. Leave_Entitlement_Processor-Confirm Date) in the Description field (Only Alphanumeric & no spacing).
+
+4. In the **Script** look for the word `lJoinDate` & change it to `lConfirmDate`.
+
+ 
+
+### Example 2 - Leave Calculate Amount - Unpaid Leave Amount Base on Working Day
+
+Below is example to change the Unpaid Leave Amount to base on Working Days in Maintain Contribution.
+
+1. **Right Click** at Leave Calculate Amount and select **New Calculation**.
+
+2. Click **New Button** and select any Formula which suit you & Click OK.
+
+ 
+
+3. Enter any **Description** (eg. Leave_Calculate_Amt-Unpaid) in the Description field (Only Alphanumeric & no spacing).
+
+4. In the **Script** look for the word `DaysBetweenStartAndEndDate` & change it to `WorkingDayPerMonth` or Copy below script & paste to the Script Section.
+
+ ```pascal
+ // Example - Leave Calculate Amount - Based On Employee Default Wages
+ uses DB, DateUtils;
+
+ begin
+ Amount := DefaultWages / WorkingDayPerMonth;
+ end.
+ ```
+
+ 
+
+5. Click **Compile button** to make sure is **Compile success**.
+
+6. Click **Save** button and click X to Close.
+
+7. Select the Item just created (eg. Leave_Calculate_Amt-Unpaid) and click Ok button.
+
+8. Done & **Remember** to set it at **Maintain Leave Group** under the **Amount Column** for UL.
+
+### Example 3 - Limit Overtime Rate
+
+Below is example to set Maximum limit the Overtime Rate.
+
+1. **Right Click** at Overtime Pay Rate and select **New Calculation**.
+
+2. Click **New Button**.
+
+3. Enter any **Description** (eg. Overtime_Max_Rate) in the Description field (Only Alphanumeric & no spacing)
+
+4. Copy below script & paste to the Script Section.
+
+ ```pascal
+ uses Math, DB;
+
+ var V: Double;
+ begin
+ V := 0;
+ if OTAmount > 1500.00 then
+ V := 10.82 else //(1500/26/8)
+ V := (OTAmount / 26 /8);
+
+ PayRate := SimpleRoundToEx(V, -2);
+ end.
+ ```
+
+ 
+
+5. Click **Compile button** to make sure is **Compile success**.
+
+6. Click **Save** button and click X to Close.
+
+7. Select the Item just created (eg. Overtime_Max_Rate) and click Ok button.
+
+8. Done & **Remember** to set it at **Maintain Overtime**.
diff --git a/docs/usage/tools/options.md b/docs/usage/tools/options.md
new file mode 100644
index 0000000..61168ba
--- /dev/null
+++ b/docs/usage/tools/options.md
@@ -0,0 +1,48 @@
+---
+sidebar_position: 2
+title: Options
+description: A guide of system default or personal setting
+slug: /usage/tools/options
+tags: ["SQL Payroll", "Options"]
+---
+
+## Introduction
+
+This is the System application settings. It can be set as Global or Personal Setting.
+
+
+
+## System Default Setting
+
+This is the setting is set and will apply to all user.
+
+1. Fields name and properties:
+
+ 1. **Payroll Value** : Is set to how many decimal point to show Amount Column (Default is 2 Decimal Point).
+ 2. **Work Unit** : Is to set how many decimal point to show at the Work Unit Column (Default is 2 Decimal Point).
+ 3. **Rate** : Is to set how many decimal point to show at the Rate Column (Default is 2 Decimal Point).
+ 4. **Day** : Is to set how many decimal point to show at the Day Column for Leave Application (Default is 2 Decimal Point).
+ 5. **Rate Rounding Precision** : Is to set how many decimal point to keep for Rate Column (Default is 8 Decimal Point).
+
+2. **Auto Mark Finalize After Save PaySheet Changes.** Tick this option is wanted system to put indicator which employee you had done at PaySheet.
+
+ 
+
+3. You can choose the following password requirement:
+
+ 1. **Maximum Password Age (days)**: Number of days to expire and change password.
+ 2. **Minimum Password Length**: Password length cannot less than the minimum.
+ 3. **Save Password History (0-10)**: Number of password history not allow to re-use
+ 4. Password combination of
+ - At least one Upper Case letter (A-Z)
+ - At least one Lower Case letter (a-z)
+ - At least one number (0-9)
+ - At least one non-alphanumeric character \!\$\%\^\&\*\(\)_\-\+\=\@\~\#\<\,\>\.
+
+
+
+## Personal Setting
+
+These settings apply only to the currently logged-in user.
+
+
diff --git a/docs/usage/tools/sql-view.md b/docs/usage/tools/sql-view.md
index aa3d703..751d4f5 100644
--- a/docs/usage/tools/sql-view.md
+++ b/docs/usage/tools/sql-view.md
@@ -1,4 +1,5 @@
---
+sidebar_position: 1
title: SQL View
description: A guide of setting user view on certain records and data
slug: /usage/tools/sql-view
@@ -26,9 +27,9 @@ In this example scenario, the goal is allowing KL User to view/ edit only the em
- 3. Press New
+ 3. Press **New**
- 4. Enter description, enter condition and save
+ 4. Enter description, condition and save
diff --git a/static/img/faq/error-calendarinfo/error-issue.jpg b/static/img/faq/error-calendarinfo/error-issue.jpg
new file mode 100644
index 0000000..a5f1029
Binary files /dev/null and b/static/img/faq/error-calendarinfo/error-issue.jpg differ
diff --git a/static/img/faq/error-calendarinfo/error-result.jpg b/static/img/faq/error-calendarinfo/error-result.jpg
new file mode 100644
index 0000000..bb9578d
Binary files /dev/null and b/static/img/faq/error-calendarinfo/error-result.jpg differ
diff --git a/static/img/faq/error-calendarinfo/error-solution.jpg b/static/img/faq/error-calendarinfo/error-solution.jpg
new file mode 100644
index 0000000..4d05098
Binary files /dev/null and b/static/img/faq/error-calendarinfo/error-solution.jpg differ
diff --git a/static/img/faq/missing-code/missingcode-issue.jpg b/static/img/faq/missing-code/missingcode-issue.jpg
new file mode 100644
index 0000000..22ee572
Binary files /dev/null and b/static/img/faq/missing-code/missingcode-issue.jpg differ
diff --git a/static/img/faq/missing-code/missingcode-solution.jpg b/static/img/faq/missing-code/missingcode-solution.jpg
new file mode 100644
index 0000000..de85a3e
Binary files /dev/null and b/static/img/faq/missing-code/missingcode-solution.jpg differ
diff --git a/static/img/faq/register-email-eleave/register-setup.png b/static/img/faq/register-email-eleave/register-setup.png
new file mode 100644
index 0000000..d238c9b
Binary files /dev/null and b/static/img/faq/register-email-eleave/register-setup.png differ
diff --git a/static/img/faq/register-email-eleave/register-sync.jpg b/static/img/faq/register-email-eleave/register-sync.jpg
new file mode 100644
index 0000000..b8c92b7
Binary files /dev/null and b/static/img/faq/register-email-eleave/register-sync.jpg differ
diff --git a/static/img/faq/register-email-eleave/remove-staff-email.png b/static/img/faq/register-email-eleave/remove-staff-email.png
new file mode 100644
index 0000000..3c71b62
Binary files /dev/null and b/static/img/faq/register-email-eleave/remove-staff-email.png differ
diff --git a/static/img/faq/register-email-eleave/remove-sync.jpg b/static/img/faq/register-email-eleave/remove-sync.jpg
new file mode 100644
index 0000000..b8c92b7
Binary files /dev/null and b/static/img/faq/register-email-eleave/remove-sync.jpg differ
diff --git a/static/img/miscellaneous/epf/epf-table.jpg b/static/img/miscellaneous/epf/epf-table.jpg
new file mode 100644
index 0000000..0d25bee
Binary files /dev/null and b/static/img/miscellaneous/epf/epf-table.jpg differ
diff --git a/static/img/miscellaneous/pcb/pcb-table.jpg b/static/img/miscellaneous/pcb/pcb-table.jpg
new file mode 100644
index 0000000..c2cb4be
Binary files /dev/null and b/static/img/miscellaneous/pcb/pcb-table.jpg differ
diff --git a/static/img/miscellaneous/socso/socso-table.jpg b/static/img/miscellaneous/socso/socso-table.jpg
new file mode 100644
index 0000000..223d0f0
Binary files /dev/null and b/static/img/miscellaneous/socso/socso-table.jpg differ
diff --git a/static/img/usage/file/data-import/ac-step2-1.png b/static/img/usage/file/data-import/ac-step2-1.png
new file mode 100644
index 0000000..d5fc766
Binary files /dev/null and b/static/img/usage/file/data-import/ac-step2-1.png differ
diff --git a/static/img/usage/file/data-import/ac-step2-2.png b/static/img/usage/file/data-import/ac-step2-2.png
new file mode 100644
index 0000000..24eb34c
Binary files /dev/null and b/static/img/usage/file/data-import/ac-step2-2.png differ
diff --git a/static/img/usage/file/data-import/ac-step2-3.png b/static/img/usage/file/data-import/ac-step2-3.png
new file mode 100644
index 0000000..2b08fb5
Binary files /dev/null and b/static/img/usage/file/data-import/ac-step2-3.png differ
diff --git a/static/img/usage/file/data-import/others-step1.png b/static/img/usage/file/data-import/others-step1.png
new file mode 100644
index 0000000..8cbfb51
Binary files /dev/null and b/static/img/usage/file/data-import/others-step1.png differ
diff --git a/static/img/usage/file/data-import/others-step2-1.png b/static/img/usage/file/data-import/others-step2-1.png
new file mode 100644
index 0000000..f226ba1
Binary files /dev/null and b/static/img/usage/file/data-import/others-step2-1.png differ
diff --git a/static/img/usage/file/data-import/others-step2-2.png b/static/img/usage/file/data-import/others-step2-2.png
new file mode 100644
index 0000000..3c5524b
Binary files /dev/null and b/static/img/usage/file/data-import/others-step2-2.png differ
diff --git a/static/img/usage/file/data-import/others-step3-1.png b/static/img/usage/file/data-import/others-step3-1.png
new file mode 100644
index 0000000..6008c00
Binary files /dev/null and b/static/img/usage/file/data-import/others-step3-1.png differ
diff --git a/static/img/usage/file/data-import/others-step3-2.png b/static/img/usage/file/data-import/others-step3-2.png
new file mode 100644
index 0000000..689ce7d
Binary files /dev/null and b/static/img/usage/file/data-import/others-step3-2.png differ
diff --git a/static/img/usage/file/data-import/others-step4.png b/static/img/usage/file/data-import/others-step4.png
new file mode 100644
index 0000000..7a986ed
Binary files /dev/null and b/static/img/usage/file/data-import/others-step4.png differ
diff --git a/static/img/usage/file/data-import/others-step5.png b/static/img/usage/file/data-import/others-step5.png
new file mode 100644
index 0000000..faffe11
Binary files /dev/null and b/static/img/usage/file/data-import/others-step5.png differ
diff --git a/static/img/usage/file/data-import/ubs-step1.png b/static/img/usage/file/data-import/ubs-step1.png
new file mode 100644
index 0000000..6d47e23
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step1.png differ
diff --git a/static/img/usage/file/data-import/ubs-step2-1.png b/static/img/usage/file/data-import/ubs-step2-1.png
new file mode 100644
index 0000000..3ee9c1a
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step2-1.png differ
diff --git a/static/img/usage/file/data-import/ubs-step2-2.png b/static/img/usage/file/data-import/ubs-step2-2.png
new file mode 100644
index 0000000..943b31f
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step2-2.png differ
diff --git a/static/img/usage/file/data-import/ubs-step2-3.png b/static/img/usage/file/data-import/ubs-step2-3.png
new file mode 100644
index 0000000..11785df
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step2-3.png differ
diff --git a/static/img/usage/file/data-import/ubs-step3.png b/static/img/usage/file/data-import/ubs-step3.png
new file mode 100644
index 0000000..66bbae3
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step3.png differ
diff --git a/static/img/usage/file/data-import/ubs-step4.png b/static/img/usage/file/data-import/ubs-step4.png
new file mode 100644
index 0000000..d40db2a
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step4.png differ
diff --git a/static/img/usage/file/data-import/ubs-step5.png b/static/img/usage/file/data-import/ubs-step5.png
new file mode 100644
index 0000000..79baf99
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step5.png differ
diff --git a/static/img/usage/file/data-import/ubs-step6.png b/static/img/usage/file/data-import/ubs-step6.png
new file mode 100644
index 0000000..6cde2de
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step6.png differ
diff --git a/static/img/usage/file/data-import/ubs-step7-1.png b/static/img/usage/file/data-import/ubs-step7-1.png
new file mode 100644
index 0000000..cfe2e71
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step7-1.png differ
diff --git a/static/img/usage/file/data-import/ubs-step7-2.png b/static/img/usage/file/data-import/ubs-step7-2.png
new file mode 100644
index 0000000..86ac711
Binary files /dev/null and b/static/img/usage/file/data-import/ubs-step7-2.png differ
diff --git a/static/img/usage/batch-email/copy-template.png b/static/img/usage/general/batch-email/copy-template.png
similarity index 100%
rename from static/img/usage/batch-email/copy-template.png
rename to static/img/usage/general/batch-email/copy-template.png
diff --git a/static/img/usage/batch-email/email-client-filter.png b/static/img/usage/general/batch-email/email-client-filter.png
similarity index 100%
rename from static/img/usage/batch-email/email-client-filter.png
rename to static/img/usage/general/batch-email/email-client-filter.png
diff --git a/static/img/usage/batch-email/email-client-more.png b/static/img/usage/general/batch-email/email-client-more.png
similarity index 100%
rename from static/img/usage/batch-email/email-client-more.png
rename to static/img/usage/general/batch-email/email-client-more.png
diff --git a/static/img/usage/batch-email/email-client-print-payslip.png b/static/img/usage/general/batch-email/email-client-print-payslip.png
similarity index 100%
rename from static/img/usage/batch-email/email-client-print-payslip.png
rename to static/img/usage/general/batch-email/email-client-print-payslip.png
diff --git a/static/img/usage/batch-email/email-client-select-payslip.png b/static/img/usage/general/batch-email/email-client-select-payslip.png
similarity index 100%
rename from static/img/usage/batch-email/email-client-select-payslip.png
rename to static/img/usage/general/batch-email/email-client-select-payslip.png
diff --git a/static/img/usage/batch-email/email-client-send.png b/static/img/usage/general/batch-email/email-client-send.png
similarity index 100%
rename from static/img/usage/batch-email/email-client-send.png
rename to static/img/usage/general/batch-email/email-client-send.png
diff --git a/static/img/usage/batch-email/employee-name-2-pdf-password-1.png b/static/img/usage/general/batch-email/employee-name-2-pdf-password-1.png
similarity index 100%
rename from static/img/usage/batch-email/employee-name-2-pdf-password-1.png
rename to static/img/usage/general/batch-email/employee-name-2-pdf-password-1.png
diff --git a/static/img/usage/batch-email/employee-name-2-pdf-password-2.png b/static/img/usage/general/batch-email/employee-name-2-pdf-password-2.png
similarity index 100%
rename from static/img/usage/batch-email/employee-name-2-pdf-password-2.png
rename to static/img/usage/general/batch-email/employee-name-2-pdf-password-2.png
diff --git a/static/img/usage/batch-email/global-pdf-password-usename-ic-pass.png b/static/img/usage/general/batch-email/global-pdf-password-usename-ic-pass.png
similarity index 100%
rename from static/img/usage/batch-email/global-pdf-password-usename-ic-pass.png
rename to static/img/usage/general/batch-email/global-pdf-password-usename-ic-pass.png
diff --git a/static/img/usage/batch-email/more-dropdown.png b/static/img/usage/general/batch-email/more-dropdown.png
similarity index 100%
rename from static/img/usage/batch-email/more-dropdown.png
rename to static/img/usage/general/batch-email/more-dropdown.png
diff --git a/static/img/usage/batch-email/new.png b/static/img/usage/general/batch-email/new.png
similarity index 100%
rename from static/img/usage/batch-email/new.png
rename to static/img/usage/general/batch-email/new.png
diff --git a/static/img/usage/batch-email/paste-employee-result.png b/static/img/usage/general/batch-email/paste-employee-result.png
similarity index 100%
rename from static/img/usage/batch-email/paste-employee-result.png
rename to static/img/usage/general/batch-email/paste-employee-result.png
diff --git a/static/img/usage/batch-email/paste-employee.png b/static/img/usage/general/batch-email/paste-employee.png
similarity index 100%
rename from static/img/usage/batch-email/paste-employee.png
rename to static/img/usage/general/batch-email/paste-employee.png
diff --git a/static/img/usage/batch-email/pdf-password-global.png b/static/img/usage/general/batch-email/pdf-password-global.png
similarity index 100%
rename from static/img/usage/batch-email/pdf-password-global.png
rename to static/img/usage/general/batch-email/pdf-password-global.png
diff --git a/static/img/usage/batch-email/pdf-password-individual.png b/static/img/usage/general/batch-email/pdf-password-individual.png
similarity index 100%
rename from static/img/usage/batch-email/pdf-password-individual.png
rename to static/img/usage/general/batch-email/pdf-password-individual.png
diff --git a/static/img/usage/batch-email/smtp-app-password.png b/static/img/usage/general/batch-email/smtp-app-password.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-app-password.png
rename to static/img/usage/general/batch-email/smtp-app-password.png
diff --git a/static/img/usage/batch-email/smtp-company-profile.png b/static/img/usage/general/batch-email/smtp-company-profile.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-company-profile.png
rename to static/img/usage/general/batch-email/smtp-company-profile.png
diff --git a/static/img/usage/batch-email/smtp-export.png b/static/img/usage/general/batch-email/smtp-export.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-export.png
rename to static/img/usage/general/batch-email/smtp-export.png
diff --git a/static/img/usage/batch-email/smtp-filter.png b/static/img/usage/general/batch-email/smtp-filter.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-filter.png
rename to static/img/usage/general/batch-email/smtp-filter.png
diff --git a/static/img/usage/batch-email/smtp-print-payslip.png b/static/img/usage/general/batch-email/smtp-print-payslip.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-print-payslip.png
rename to static/img/usage/general/batch-email/smtp-print-payslip.png
diff --git a/static/img/usage/batch-email/smtp-select-payslip.png b/static/img/usage/general/batch-email/smtp-select-payslip.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-select-payslip.png
rename to static/img/usage/general/batch-email/smtp-select-payslip.png
diff --git a/static/img/usage/batch-email/smtp-send.png b/static/img/usage/general/batch-email/smtp-send.png
similarity index 100%
rename from static/img/usage/batch-email/smtp-send.png
rename to static/img/usage/general/batch-email/smtp-send.png
diff --git a/static/img/usage/batch-email/template.png b/static/img/usage/general/batch-email/template.png
similarity index 100%
rename from static/img/usage/batch-email/template.png
rename to static/img/usage/general/batch-email/template.png
diff --git a/static/img/usage/batch-email/wiki-batch-email.png b/static/img/usage/general/batch-email/wiki-batch-email.png
similarity index 100%
rename from static/img/usage/batch-email/wiki-batch-email.png
rename to static/img/usage/general/batch-email/wiki-batch-email.png
diff --git a/static/img/usage/change-payroll-description/after-process-change.png b/static/img/usage/general/change-payroll-description/after-process-change.png
similarity index 100%
rename from static/img/usage/change-payroll-description/after-process-change.png
rename to static/img/usage/general/change-payroll-description/after-process-change.png
diff --git a/static/img/usage/change-payroll-description/default.png b/static/img/usage/general/change-payroll-description/default.png
similarity index 100%
rename from static/img/usage/change-payroll-description/default.png
rename to static/img/usage/general/change-payroll-description/default.png
diff --git a/static/img/usage/change-payroll-description/description.png b/static/img/usage/general/change-payroll-description/description.png
similarity index 100%
rename from static/img/usage/change-payroll-description/description.png
rename to static/img/usage/general/change-payroll-description/description.png
diff --git a/static/img/usage/change-payroll-description/process.png b/static/img/usage/general/change-payroll-description/process.png
similarity index 100%
rename from static/img/usage/change-payroll-description/process.png
rename to static/img/usage/general/change-payroll-description/process.png
diff --git a/static/img/usage/change-payroll-description/result.png b/static/img/usage/general/change-payroll-description/result.png
similarity index 100%
rename from static/img/usage/change-payroll-description/result.png
rename to static/img/usage/general/change-payroll-description/result.png
diff --git a/static/img/usage/daily-pay-method/check-overtime.png b/static/img/usage/general/daily-pay-method/check-overtime.png
similarity index 100%
rename from static/img/usage/daily-pay-method/check-overtime.png
rename to static/img/usage/general/daily-pay-method/check-overtime.png
diff --git a/static/img/usage/daily-pay-method/check-wages.png b/static/img/usage/general/daily-pay-method/check-wages.png
similarity index 100%
rename from static/img/usage/daily-pay-method/check-wages.png
rename to static/img/usage/general/daily-pay-method/check-wages.png
diff --git a/static/img/usage/daily-pay-method/contributions-settings.png b/static/img/usage/general/daily-pay-method/contributions-settings.png
similarity index 100%
rename from static/img/usage/daily-pay-method/contributions-settings.png
rename to static/img/usage/general/daily-pay-method/contributions-settings.png
diff --git a/static/img/usage/daily-pay-method/final-payroll-process.png b/static/img/usage/general/daily-pay-method/final-payroll-process.png
similarity index 100%
rename from static/img/usage/daily-pay-method/final-payroll-process.png
rename to static/img/usage/general/daily-pay-method/final-payroll-process.png
diff --git a/static/img/usage/daily-pay-method/input-daily-rate.png b/static/img/usage/general/daily-pay-method/input-daily-rate.png
similarity index 100%
rename from static/img/usage/daily-pay-method/input-daily-rate.png
rename to static/img/usage/general/daily-pay-method/input-daily-rate.png
diff --git a/static/img/usage/daily-pay-method/pending-payroll-overtime.png b/static/img/usage/general/daily-pay-method/pending-payroll-overtime.png
similarity index 100%
rename from static/img/usage/daily-pay-method/pending-payroll-overtime.png
rename to static/img/usage/general/daily-pay-method/pending-payroll-overtime.png
diff --git a/static/img/usage/daily-pay-method/pending-payroll-wages.png b/static/img/usage/general/daily-pay-method/pending-payroll-wages.png
similarity index 100%
rename from static/img/usage/daily-pay-method/pending-payroll-wages.png
rename to static/img/usage/general/daily-pay-method/pending-payroll-wages.png
diff --git a/static/img/usage/general/date-format/date-format-additional-setting.jpg b/static/img/usage/general/date-format/date-format-additional-setting.jpg
new file mode 100644
index 0000000..d5205cc
Binary files /dev/null and b/static/img/usage/general/date-format/date-format-additional-setting.jpg differ
diff --git a/static/img/usage/general/date-format/date-format-change.jpg b/static/img/usage/general/date-format/date-format-change.jpg
new file mode 100644
index 0000000..2dd1985
Binary files /dev/null and b/static/img/usage/general/date-format/date-format-change.jpg differ
diff --git a/static/img/usage/general/date-format/date-format-issue.jpg b/static/img/usage/general/date-format/date-format-issue.jpg
new file mode 100644
index 0000000..00cddf5
Binary files /dev/null and b/static/img/usage/general/date-format/date-format-issue.jpg differ
diff --git a/static/img/usage/general/date-format/date-format-result.jpg b/static/img/usage/general/date-format/date-format-result.jpg
new file mode 100644
index 0000000..353ad06
Binary files /dev/null and b/static/img/usage/general/date-format/date-format-result.jpg differ
diff --git a/static/img/usage/final-payroll/check-details.png b/static/img/usage/general/final-payroll/check-details.png
similarity index 100%
rename from static/img/usage/final-payroll/check-details.png
rename to static/img/usage/general/final-payroll/check-details.png
diff --git a/static/img/usage/final-payroll/employee-1.png b/static/img/usage/general/final-payroll/employee-1.png
similarity index 100%
rename from static/img/usage/final-payroll/employee-1.png
rename to static/img/usage/general/final-payroll/employee-1.png
diff --git a/static/img/usage/final-payroll/employee-2.png b/static/img/usage/general/final-payroll/employee-2.png
similarity index 100%
rename from static/img/usage/final-payroll/employee-2.png
rename to static/img/usage/general/final-payroll/employee-2.png
diff --git a/static/img/usage/final-payroll/export-result.png b/static/img/usage/general/final-payroll/export-result.png
similarity index 100%
rename from static/img/usage/final-payroll/export-result.png
rename to static/img/usage/general/final-payroll/export-result.png
diff --git a/static/img/usage/final-payroll/export.png b/static/img/usage/general/final-payroll/export.png
similarity index 100%
rename from static/img/usage/final-payroll/export.png
rename to static/img/usage/general/final-payroll/export.png
diff --git a/static/img/usage/final-payroll/print-payroll.png b/static/img/usage/general/final-payroll/print-payroll.png
similarity index 100%
rename from static/img/usage/final-payroll/print-payroll.png
rename to static/img/usage/general/final-payroll/print-payroll.png
diff --git a/static/img/usage/final-payroll/print-payslip.png b/static/img/usage/general/final-payroll/print-payslip.png
similarity index 100%
rename from static/img/usage/final-payroll/print-payslip.png
rename to static/img/usage/general/final-payroll/print-payslip.png
diff --git a/static/img/usage/final-payroll/process.png b/static/img/usage/general/final-payroll/process.png
similarity index 100%
rename from static/img/usage/final-payroll/process.png
rename to static/img/usage/general/final-payroll/process.png
diff --git a/static/img/usage/final-payroll/result-1.png b/static/img/usage/general/final-payroll/result-1.png
similarity index 100%
rename from static/img/usage/final-payroll/result-1.png
rename to static/img/usage/general/final-payroll/result-1.png
diff --git a/static/img/usage/final-payroll/result-2.png b/static/img/usage/general/final-payroll/result-2.png
similarity index 100%
rename from static/img/usage/final-payroll/result-2.png
rename to static/img/usage/general/final-payroll/result-2.png
diff --git a/static/img/usage/final-payroll/select-date-year.png b/static/img/usage/general/final-payroll/select-date-year.png
similarity index 100%
rename from static/img/usage/final-payroll/select-date-year.png
rename to static/img/usage/general/final-payroll/select-date-year.png
diff --git a/static/img/usage/final-payroll/summary-1.png b/static/img/usage/general/final-payroll/summary-1.png
similarity index 100%
rename from static/img/usage/final-payroll/summary-1.png
rename to static/img/usage/general/final-payroll/summary-1.png
diff --git a/static/img/usage/final-payroll/summary-2.png b/static/img/usage/general/final-payroll/summary-2.png
similarity index 100%
rename from static/img/usage/final-payroll/summary-2.png
rename to static/img/usage/general/final-payroll/summary-2.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-1.png b/static/img/usage/general/online-mobile-approval/sample-scenario-1.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-1.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-1.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-10.png b/static/img/usage/general/online-mobile-approval/sample-scenario-10.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-10.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-10.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-11.png b/static/img/usage/general/online-mobile-approval/sample-scenario-11.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-11.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-11.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-2.png b/static/img/usage/general/online-mobile-approval/sample-scenario-2.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-2.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-2.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-3.png b/static/img/usage/general/online-mobile-approval/sample-scenario-3.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-3.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-3.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-4.png b/static/img/usage/general/online-mobile-approval/sample-scenario-4.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-4.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-4.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-5.png b/static/img/usage/general/online-mobile-approval/sample-scenario-5.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-5.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-5.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-6.png b/static/img/usage/general/online-mobile-approval/sample-scenario-6.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-6.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-6.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-7.png b/static/img/usage/general/online-mobile-approval/sample-scenario-7.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-7.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-7.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-8.png b/static/img/usage/general/online-mobile-approval/sample-scenario-8.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-8.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-8.png
diff --git a/static/img/usage/online-mobile-approval/sample-scenario-9.png b/static/img/usage/general/online-mobile-approval/sample-scenario-9.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/sample-scenario-9.png
rename to static/img/usage/general/online-mobile-approval/sample-scenario-9.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-1.png b/static/img/usage/general/online-mobile-approval/setup-step-1.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-1.png
rename to static/img/usage/general/online-mobile-approval/setup-step-1.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-2-1.png b/static/img/usage/general/online-mobile-approval/setup-step-2-1.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-2-1.png
rename to static/img/usage/general/online-mobile-approval/setup-step-2-1.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-2-2.png b/static/img/usage/general/online-mobile-approval/setup-step-2-2.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-2-2.png
rename to static/img/usage/general/online-mobile-approval/setup-step-2-2.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-3-1.png b/static/img/usage/general/online-mobile-approval/setup-step-3-1.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-3-1.png
rename to static/img/usage/general/online-mobile-approval/setup-step-3-1.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-3-2.png b/static/img/usage/general/online-mobile-approval/setup-step-3-2.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-3-2.png
rename to static/img/usage/general/online-mobile-approval/setup-step-3-2.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-3-3.png b/static/img/usage/general/online-mobile-approval/setup-step-3-3.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-3-3.png
rename to static/img/usage/general/online-mobile-approval/setup-step-3-3.png
diff --git a/static/img/usage/online-mobile-approval/setup-step-4.png b/static/img/usage/general/online-mobile-approval/setup-step-4.png
similarity index 100%
rename from static/img/usage/online-mobile-approval/setup-step-4.png
rename to static/img/usage/general/online-mobile-approval/setup-step-4.png
diff --git a/static/img/usage/pcb-cp38-receipt-no-date/calculate.png b/static/img/usage/general/pcb-cp38-receipt-no-date/calculate.png
similarity index 100%
rename from static/img/usage/pcb-cp38-receipt-no-date/calculate.png
rename to static/img/usage/general/pcb-cp38-receipt-no-date/calculate.png
diff --git a/static/img/usage/pcb-cp38-receipt-no-date/example.png b/static/img/usage/general/pcb-cp38-receipt-no-date/example.png
similarity index 100%
rename from static/img/usage/pcb-cp38-receipt-no-date/example.png
rename to static/img/usage/general/pcb-cp38-receipt-no-date/example.png
diff --git a/static/img/usage/pcb-cp38-receipt-no-date/pcb-receipt-interface.png b/static/img/usage/general/pcb-cp38-receipt-no-date/pcb-receipt-interface.png
similarity index 100%
rename from static/img/usage/pcb-cp38-receipt-no-date/pcb-receipt-interface.png
rename to static/img/usage/general/pcb-cp38-receipt-no-date/pcb-receipt-interface.png
diff --git a/static/img/usage/pcb-cp38-receipt-no-date/pcb-receipt.png b/static/img/usage/general/pcb-cp38-receipt-no-date/pcb-receipt.png
similarity index 100%
rename from static/img/usage/pcb-cp38-receipt-no-date/pcb-receipt.png
rename to static/img/usage/general/pcb-cp38-receipt-no-date/pcb-receipt.png
diff --git a/static/img/usage/pcb-cp38-receipt-no-date/print-income-tax-pcb.png b/static/img/usage/general/pcb-cp38-receipt-no-date/print-income-tax-pcb.png
similarity index 100%
rename from static/img/usage/pcb-cp38-receipt-no-date/print-income-tax-pcb.png
rename to static/img/usage/general/pcb-cp38-receipt-no-date/print-income-tax-pcb.png
diff --git a/static/img/usage/pcb-cp38-receipt-no-date/result.png b/static/img/usage/general/pcb-cp38-receipt-no-date/result.png
similarity index 100%
rename from static/img/usage/pcb-cp38-receipt-no-date/result.png
rename to static/img/usage/general/pcb-cp38-receipt-no-date/result.png
diff --git a/static/img/usage/zakat-tabung-haji/company-profile.png b/static/img/usage/general/zakat-tabung-haji/company-profile.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/company-profile.png
rename to static/img/usage/general/zakat-tabung-haji/company-profile.png
diff --git a/static/img/usage/zakat-tabung-haji/create-tabung-haji.png b/static/img/usage/general/zakat-tabung-haji/create-tabung-haji.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/create-tabung-haji.png
rename to static/img/usage/general/zakat-tabung-haji/create-tabung-haji.png
diff --git a/static/img/usage/zakat-tabung-haji/create-zakat.png b/static/img/usage/general/zakat-tabung-haji/create-zakat.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/create-zakat.png
rename to static/img/usage/general/zakat-tabung-haji/create-zakat.png
diff --git a/static/img/usage/zakat-tabung-haji/employee-edit-zakat-tabung-haji.png b/static/img/usage/general/zakat-tabung-haji/employee-edit-zakat-tabung-haji.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/employee-edit-zakat-tabung-haji.png
rename to static/img/usage/general/zakat-tabung-haji/employee-edit-zakat-tabung-haji.png
diff --git a/static/img/usage/zakat-tabung-haji/lembaga-zakat-selangor-1.png b/static/img/usage/general/zakat-tabung-haji/lembaga-zakat-selangor-1.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/lembaga-zakat-selangor-1.png
rename to static/img/usage/general/zakat-tabung-haji/lembaga-zakat-selangor-1.png
diff --git a/static/img/usage/zakat-tabung-haji/lembaga-zakat-selangor-2.png b/static/img/usage/general/zakat-tabung-haji/lembaga-zakat-selangor-2.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/lembaga-zakat-selangor-2.png
rename to static/img/usage/general/zakat-tabung-haji/lembaga-zakat-selangor-2.png
diff --git a/static/img/usage/zakat-tabung-haji/maintain-deduction.png b/static/img/usage/general/zakat-tabung-haji/maintain-deduction.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/maintain-deduction.png
rename to static/img/usage/general/zakat-tabung-haji/maintain-deduction.png
diff --git a/static/img/usage/zakat-tabung-haji/new-deduction.png b/static/img/usage/general/zakat-tabung-haji/new-deduction.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/new-deduction.png
rename to static/img/usage/general/zakat-tabung-haji/new-deduction.png
diff --git a/static/img/usage/zakat-tabung-haji/pending-payroll-deduction.png b/static/img/usage/general/zakat-tabung-haji/pending-payroll-deduction.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/pending-payroll-deduction.png
rename to static/img/usage/general/zakat-tabung-haji/pending-payroll-deduction.png
diff --git a/static/img/usage/zakat-tabung-haji/process-result.png b/static/img/usage/general/zakat-tabung-haji/process-result.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/process-result.png
rename to static/img/usage/general/zakat-tabung-haji/process-result.png
diff --git a/static/img/usage/zakat-tabung-haji/select-date.png b/static/img/usage/general/zakat-tabung-haji/select-date.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/select-date.png
rename to static/img/usage/general/zakat-tabung-haji/select-date.png
diff --git a/static/img/usage/zakat-tabung-haji/select-payment-format.png b/static/img/usage/general/zakat-tabung-haji/select-payment-format.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/select-payment-format.png
rename to static/img/usage/general/zakat-tabung-haji/select-payment-format.png
diff --git a/static/img/usage/zakat-tabung-haji/tabung-haji-number.png b/static/img/usage/general/zakat-tabung-haji/tabung-haji-number.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/tabung-haji-number.png
rename to static/img/usage/general/zakat-tabung-haji/tabung-haji-number.png
diff --git a/static/img/usage/zakat-tabung-haji/tabung-haji-report.png b/static/img/usage/general/zakat-tabung-haji/tabung-haji-report.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/tabung-haji-report.png
rename to static/img/usage/general/zakat-tabung-haji/tabung-haji-report.png
diff --git a/static/img/usage/zakat-tabung-haji/tabung-haji-select-date.png b/static/img/usage/general/zakat-tabung-haji/tabung-haji-select-date.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/tabung-haji-select-date.png
rename to static/img/usage/general/zakat-tabung-haji/tabung-haji-select-date.png
diff --git a/static/img/usage/zakat-tabung-haji/zakat.png b/static/img/usage/general/zakat-tabung-haji/zakat.png
similarity index 100%
rename from static/img/usage/zakat-tabung-haji/zakat.png
rename to static/img/usage/general/zakat-tabung-haji/zakat.png
diff --git a/static/img/usage/human-resource/hr-faq-images/faq-get-appointment-letter-1.jpg b/static/img/usage/human-resource/hr-faq-images/faq-get-appointment-letter-1.jpg
new file mode 100644
index 0000000..27a1ff6
Binary files /dev/null and b/static/img/usage/human-resource/hr-faq-images/faq-get-appointment-letter-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-function-images/advanced-repayment-step-1.jpg b/static/img/usage/human-resource/hr-function-images/advanced-repayment-step-1.jpg
new file mode 100644
index 0000000..4e08192
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/advanced-repayment-step-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-function-images/auto-repayment-step-1.jpg b/static/img/usage/human-resource/hr-function-images/auto-repayment-step-1.jpg
new file mode 100644
index 0000000..1136935
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/auto-repayment-step-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-function-images/batch-email.png b/static/img/usage/human-resource/hr-function-images/batch-email.png
new file mode 100644
index 0000000..433a5ba
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/batch-email.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/change-password.png b/static/img/usage/human-resource/hr-function-images/change-password.png
new file mode 100644
index 0000000..fe00dbf
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/change-password.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/check-zakat.png b/static/img/usage/human-resource/hr-function-images/check-zakat.png
new file mode 100644
index 0000000..1e6b265
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/check-zakat.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/deduction.png b/static/img/usage/human-resource/hr-function-images/deduction.png
new file mode 100644
index 0000000..1f966cd
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/deduction.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/employee-view.png b/static/img/usage/human-resource/hr-function-images/employee-view.png
new file mode 100644
index 0000000..4c6dc03
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/employee-view.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/enter-password.png b/static/img/usage/human-resource/hr-function-images/enter-password.png
new file mode 100644
index 0000000..b9f1edd
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/enter-password.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/error.png b/static/img/usage/human-resource/hr-function-images/error.png
new file mode 100644
index 0000000..fd507ab
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/error.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/export-to-email-client-batch.png b/static/img/usage/human-resource/hr-function-images/export-to-email-client-batch.png
new file mode 100644
index 0000000..1686243
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/export-to-email-client-batch.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-1.png b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-1.png
new file mode 100644
index 0000000..57d5b6a
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-1.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-2.png b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-2.png
new file mode 100644
index 0000000..cf3a1df
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-2.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-3.png b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-3.png
new file mode 100644
index 0000000..57427cf
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-3.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-4.png b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-4.png
new file mode 100644
index 0000000..03bdd6f
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/ic-as-pdf-password-4.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/inc-letter-click-preview.png b/static/img/usage/human-resource/hr-function-images/inc-letter-click-preview.png
new file mode 100644
index 0000000..79b5f5e
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/inc-letter-click-preview.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/inc-letter-select-employee.png b/static/img/usage/human-resource/hr-function-images/inc-letter-select-employee.png
new file mode 100644
index 0000000..5c6900d
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/inc-letter-select-employee.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/inc-letter-select-report.png b/static/img/usage/human-resource/hr-function-images/inc-letter-select-report.png
new file mode 100644
index 0000000..c9df666
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/inc-letter-select-report.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/increment-letter-setup.png b/static/img/usage/human-resource/hr-function-images/increment-letter-setup.png
new file mode 100644
index 0000000..46f0a6d
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/increment-letter-setup.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/key-in-rate.png b/static/img/usage/human-resource/hr-function-images/key-in-rate.png
new file mode 100644
index 0000000..3963efa
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/key-in-rate.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/letter-example.png b/static/img/usage/human-resource/hr-function-images/letter-example.png
new file mode 100644
index 0000000..deebca0
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/letter-example.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/loan-repayment-history-step-1.jpg b/static/img/usage/human-resource/hr-function-images/loan-repayment-history-step-1.jpg
new file mode 100644
index 0000000..a5dccab
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/loan-repayment-history-step-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-function-images/login.png b/static/img/usage/human-resource/hr-function-images/login.png
new file mode 100644
index 0000000..1df3087
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/login.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/maintain-employee copy.png b/static/img/usage/human-resource/hr-function-images/maintain-employee copy.png
new file mode 100644
index 0000000..20d0875
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/maintain-employee copy.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/maintain-employee-1.png b/static/img/usage/human-resource/hr-function-images/maintain-employee-1.png
new file mode 100644
index 0000000..41c84f7
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/maintain-employee-1.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/maintain-employee-button.png b/static/img/usage/human-resource/hr-function-images/maintain-employee-button.png
new file mode 100644
index 0000000..20d0875
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/maintain-employee-button.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/maintain-loan-step-1.jpg b/static/img/usage/human-resource/hr-function-images/maintain-loan-step-1.jpg
new file mode 100644
index 0000000..0f4cc93
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/maintain-loan-step-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-function-images/maintain-loan-step-2.jpg b/static/img/usage/human-resource/hr-function-images/maintain-loan-step-2.jpg
new file mode 100644
index 0000000..02d2867
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/maintain-loan-step-2.jpg differ
diff --git a/static/img/usage/human-resource/hr-function-images/navigate-1.png b/static/img/usage/human-resource/hr-function-images/navigate-1.png
new file mode 100644
index 0000000..88e60f8
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/navigate-1.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/navigate-2.png b/static/img/usage/human-resource/hr-function-images/navigate-2.png
new file mode 100644
index 0000000..8e96cc0
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/navigate-2.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/navigate.png b/static/img/usage/human-resource/hr-function-images/navigate.png
new file mode 100644
index 0000000..7a1d1ac
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/navigate.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/plug-in-mykad.png b/static/img/usage/human-resource/hr-function-images/plug-in-mykad.png
new file mode 100644
index 0000000..1da20f7
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/plug-in-mykad.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/preview-report.png b/static/img/usage/human-resource/hr-function-images/preview-report.png
new file mode 100644
index 0000000..ae78cc2
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/preview-report.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/read-card.png b/static/img/usage/human-resource/hr-function-images/read-card.png
new file mode 100644
index 0000000..94d442c
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/read-card.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/read-mykad-physical.png b/static/img/usage/human-resource/hr-function-images/read-mykad-physical.png
new file mode 100644
index 0000000..dfce461
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/read-mykad-physical.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/read-mykad.png b/static/img/usage/human-resource/hr-function-images/read-mykad.png
new file mode 100644
index 0000000..d52b5fe
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/read-mykad.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/reader.png b/static/img/usage/human-resource/hr-function-images/reader.png
new file mode 100644
index 0000000..e4324e7
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/reader.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/result-1.png b/static/img/usage/human-resource/hr-function-images/result-1.png
new file mode 100644
index 0000000..ba7c5b3
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/result-1.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/result-2.png b/static/img/usage/human-resource/hr-function-images/result-2.png
new file mode 100644
index 0000000..b7cd3bc
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/result-2.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/result.png b/static/img/usage/human-resource/hr-function-images/result.png
new file mode 100644
index 0000000..f3d53b0
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/result.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/select-employee.png b/static/img/usage/human-resource/hr-function-images/select-employee.png
new file mode 100644
index 0000000..bc75fa5
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/select-employee.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/select-report.png b/static/img/usage/human-resource/hr-function-images/select-report.png
new file mode 100644
index 0000000..f3a12e6
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/select-report.png differ
diff --git a/static/img/usage/human-resource/hr-function-images/yc1-appointment-letter.jpg b/static/img/usage/human-resource/hr-function-images/yc1-appointment-letter.jpg
new file mode 100644
index 0000000..cff1114
Binary files /dev/null and b/static/img/usage/human-resource/hr-function-images/yc1-appointment-letter.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/allowance-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/allowance-tab-1.jpg
new file mode 100644
index 0000000..aa7e47b
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/allowance-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/attachments-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/attachments-tab-1.jpg
new file mode 100644
index 0000000..46ee3a5
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/attachments-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/child-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/child-tab-1.jpg
new file mode 100644
index 0000000..4a0f3ce
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/child-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/deduction-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/deduction-tab-1.jpg
new file mode 100644
index 0000000..26844d3
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/deduction-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/family-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/family-tab-1.jpg
new file mode 100644
index 0000000..06509d3
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/family-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/grouping-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/grouping-tab-1.jpg
new file mode 100644
index 0000000..1cdc41d
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/grouping-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/history-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/history-tab-1.jpg
new file mode 100644
index 0000000..d14057c
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/history-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-announcement-1.png b/static/img/usage/human-resource/hr-setup-images/maintain-announcement-1.png
new file mode 100644
index 0000000..1c58546
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-announcement-1.png differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-branch-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-branch-1.jpg
new file mode 100644
index 0000000..5fd5905
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-branch-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-category-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-category-1.jpg
new file mode 100644
index 0000000..354fb2d
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-category-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-department-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-department-1.jpg
new file mode 100644
index 0000000..f0cba4e
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-department-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-group-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-group-1.jpg
new file mode 100644
index 0000000..10b330a
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-group-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-history-type-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-history-type-1.jpg
new file mode 100644
index 0000000..1bdfd73
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-history-type-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-job-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-job-1.jpg
new file mode 100644
index 0000000..1beede8
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-job-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-project-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-project-1.jpg
new file mode 100644
index 0000000..1beede8
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-project-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-race-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-race-1.jpg
new file mode 100644
index 0000000..0bbbd43
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-race-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/maintain-task-1.jpg b/static/img/usage/human-resource/hr-setup-images/maintain-task-1.jpg
new file mode 100644
index 0000000..e725de8
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/maintain-task-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/navigate-1.png b/static/img/usage/human-resource/hr-setup-images/navigate-1.png
new file mode 100644
index 0000000..88e60f8
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/navigate-1.png differ
diff --git a/static/img/usage/human-resource/hr-setup-images/navigate-2.png b/static/img/usage/human-resource/hr-setup-images/navigate-2.png
new file mode 100644
index 0000000..8e96cc0
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/navigate-2.png differ
diff --git a/static/img/usage/human-resource/hr-setup-images/new-employee.png b/static/img/usage/human-resource/hr-setup-images/new-employee.png
new file mode 100644
index 0000000..4b1ac9a
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/new-employee.png differ
diff --git a/static/img/usage/human-resource/hr-setup-images/note-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/note-tab-1.jpg
new file mode 100644
index 0000000..c77505a
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/note-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/payroll-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/payroll-tab-1.jpg
new file mode 100644
index 0000000..afce121
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/payroll-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/personal-tab-1.jpg b/static/img/usage/human-resource/hr-setup-images/personal-tab-1.jpg
new file mode 100644
index 0000000..80a3656
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/personal-tab-1.jpg differ
diff --git a/static/img/usage/human-resource/hr-setup-images/print-history-listing-1.png b/static/img/usage/human-resource/hr-setup-images/print-history-listing-1.png
new file mode 100644
index 0000000..765a17e
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/print-history-listing-1.png differ
diff --git a/static/img/usage/human-resource/hr-setup-images/print-history-listing-2.png b/static/img/usage/human-resource/hr-setup-images/print-history-listing-2.png
new file mode 100644
index 0000000..dee2fae
Binary files /dev/null and b/static/img/usage/human-resource/hr-setup-images/print-history-listing-2.png differ
diff --git a/static/img/usage/human-resource/print-letter/appointment-letter.jpg b/static/img/usage/human-resource/print-letter/appointment-letter.jpg
new file mode 100644
index 0000000..cff1114
Binary files /dev/null and b/static/img/usage/human-resource/print-letter/appointment-letter.jpg differ
diff --git a/static/img/usage/leave-module/print-attendance-report.png b/static/img/usage/leave-module/print-attendance-report.png
new file mode 100644
index 0000000..a38ea4b
Binary files /dev/null and b/static/img/usage/leave-module/print-attendance-report.png differ
diff --git a/static/img/usage/leave-module/print-leave-application-report.png b/static/img/usage/leave-module/print-leave-application-report.png
new file mode 100644
index 0000000..cb7155d
Binary files /dev/null and b/static/img/usage/leave-module/print-leave-application-report.png differ
diff --git a/static/img/usage/leave-module/print-leave-balance-report.png b/static/img/usage/leave-module/print-leave-balance-report.png
new file mode 100644
index 0000000..65e4d89
Binary files /dev/null and b/static/img/usage/leave-module/print-leave-balance-report.png differ
diff --git a/static/img/usage/leave-module/print-yearly-leave-report.png b/static/img/usage/leave-module/print-yearly-leave-report.png
new file mode 100644
index 0000000..1d32320
Binary files /dev/null and b/static/img/usage/leave-module/print-yearly-leave-report.png differ
diff --git a/static/img/usage/payroll/opening-balance/additional-epf-pcb.png b/static/img/usage/payroll/faq/additional-epf-pcb.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/additional-epf-pcb.png
rename to static/img/usage/payroll/faq/additional-epf-pcb.png
diff --git a/static/img/usage/payroll/comparison-previous-month/apply.png b/static/img/usage/payroll/faq/apply.png
similarity index 100%
rename from static/img/usage/payroll/comparison-previous-month/apply.png
rename to static/img/usage/payroll/faq/apply.png
diff --git a/static/img/usage/payroll/recurring-payroll/change-column-post-date.png b/static/img/usage/payroll/faq/change-column-post-date.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/change-column-post-date.png
rename to static/img/usage/payroll/faq/change-column-post-date.png
diff --git a/static/img/usage/payroll/recurring-payroll/copy.png b/static/img/usage/payroll/faq/copy.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/copy.png
rename to static/img/usage/payroll/faq/copy.png
diff --git a/static/img/usage/payroll/comparison-previous-month/employee-details.png b/static/img/usage/payroll/faq/employee-details.png
similarity index 100%
rename from static/img/usage/payroll/comparison-previous-month/employee-details.png
rename to static/img/usage/payroll/faq/employee-details.png
diff --git a/static/img/usage/payroll/faq/empty-data.png b/static/img/usage/payroll/faq/empty-data.png
new file mode 100644
index 0000000..22ee572
Binary files /dev/null and b/static/img/usage/payroll/faq/empty-data.png differ
diff --git a/static/img/usage/payroll/faq/error.png b/static/img/usage/payroll/faq/error.png
new file mode 100644
index 0000000..a5f1029
Binary files /dev/null and b/static/img/usage/payroll/faq/error.png differ
diff --git a/static/img/usage/payroll/recurring-payroll/example.png b/static/img/usage/payroll/faq/example.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/example.png
rename to static/img/usage/payroll/faq/example.png
diff --git a/static/img/usage/payroll/comparison-previous-month/expand.png b/static/img/usage/payroll/faq/expand.png
similarity index 100%
rename from static/img/usage/payroll/comparison-previous-month/expand.png
rename to static/img/usage/payroll/faq/expand.png
diff --git a/static/img/usage/payroll/opening-balance/fill-in-employee-details.png b/static/img/usage/payroll/faq/fill-in-employee-details.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/fill-in-employee-details.png
rename to static/img/usage/payroll/faq/fill-in-employee-details.png
diff --git a/static/img/usage/payroll/faq/grid-filter.png b/static/img/usage/payroll/faq/grid-filter.png
new file mode 100644
index 0000000..de85a3e
Binary files /dev/null and b/static/img/usage/payroll/faq/grid-filter.png differ
diff --git a/static/img/usage/payroll/recurring-payroll/highlight.png b/static/img/usage/payroll/faq/highlight.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/highlight.png
rename to static/img/usage/payroll/faq/highlight.png
diff --git a/static/img/usage/payroll/recurring-payroll/key-in-post-date.png b/static/img/usage/payroll/faq/key-in-post-date.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/key-in-post-date.png
rename to static/img/usage/payroll/faq/key-in-post-date.png
diff --git a/static/img/usage/payroll/opening-balance/mapping.png b/static/img/usage/payroll/faq/mapping.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/mapping.png
rename to static/img/usage/payroll/faq/mapping.png
diff --git a/static/img/usage/payroll/general/open-navigate.png b/static/img/usage/payroll/faq/navigate copy.png
similarity index 100%
rename from static/img/usage/payroll/general/open-navigate.png
rename to static/img/usage/payroll/faq/navigate copy.png
diff --git a/static/img/usage/payroll/comparison-previous-month/navigate.png b/static/img/usage/payroll/faq/navigate.png
similarity index 100%
rename from static/img/usage/payroll/comparison-previous-month/navigate.png
rename to static/img/usage/payroll/faq/navigate.png
diff --git a/static/img/usage/payroll/recurring-payroll/ok-confirm.png b/static/img/usage/payroll/faq/ok-confirm.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/ok-confirm.png
rename to static/img/usage/payroll/faq/ok-confirm.png
diff --git a/static/img/usage/payroll/recurring-payroll/open-overtime.png b/static/img/usage/payroll/faq/open-overtime.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/open-overtime.png
rename to static/img/usage/payroll/faq/open-overtime.png
diff --git a/static/img/usage/payroll/opening-balance/open-transaction.png b/static/img/usage/payroll/faq/open-transaction.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/open-transaction.png
rename to static/img/usage/payroll/faq/open-transaction.png
diff --git a/static/img/usage/payroll/opening-balance/open.png b/static/img/usage/payroll/faq/open.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/open.png
rename to static/img/usage/payroll/faq/open.png
diff --git a/static/img/usage/payroll/recurring-payroll/paste.png b/static/img/usage/payroll/faq/paste.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/paste.png
rename to static/img/usage/payroll/faq/paste.png
diff --git a/static/img/usage/payroll/faq/pr-tax-pcb2-corrected-date-format.png b/static/img/usage/payroll/faq/pr-tax-pcb2-corrected-date-format.png
new file mode 100644
index 0000000..353ad06
Binary files /dev/null and b/static/img/usage/payroll/faq/pr-tax-pcb2-corrected-date-format.png differ
diff --git a/static/img/usage/payroll/faq/pr-tax-pcb2.png b/static/img/usage/payroll/faq/pr-tax-pcb2.png
new file mode 100644
index 0000000..00cddf5
Binary files /dev/null and b/static/img/usage/payroll/faq/pr-tax-pcb2.png differ
diff --git a/static/img/usage/payroll/comparison-previous-month/print-preview.png b/static/img/usage/payroll/faq/print-preview.png
similarity index 100%
rename from static/img/usage/payroll/comparison-previous-month/print-preview.png
rename to static/img/usage/payroll/faq/print-preview.png
diff --git a/static/img/usage/payroll/faq/region-date.png b/static/img/usage/payroll/faq/region-date.png
new file mode 100644
index 0000000..2dd1985
Binary files /dev/null and b/static/img/usage/payroll/faq/region-date.png differ
diff --git a/static/img/usage/payroll/faq/region.png b/static/img/usage/payroll/faq/region.png
new file mode 100644
index 0000000..d5205cc
Binary files /dev/null and b/static/img/usage/payroll/faq/region.png differ
diff --git a/static/img/usage/payroll/faq/report-designer-1.png b/static/img/usage/payroll/faq/report-designer-1.png
new file mode 100644
index 0000000..4d05098
Binary files /dev/null and b/static/img/usage/payroll/faq/report-designer-1.png differ
diff --git a/static/img/usage/payroll/faq/report-designer-2.png b/static/img/usage/payroll/faq/report-designer-2.png
new file mode 100644
index 0000000..bb9578d
Binary files /dev/null and b/static/img/usage/payroll/faq/report-designer-2.png differ
diff --git a/static/img/usage/payroll/comparison-previous-month/report.png b/static/img/usage/payroll/faq/report.png
similarity index 100%
rename from static/img/usage/payroll/comparison-previous-month/report.png
rename to static/img/usage/payroll/faq/report.png
diff --git a/static/img/usage/payroll/recurring-payroll/save.png b/static/img/usage/payroll/faq/save.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/save.png
rename to static/img/usage/payroll/faq/save.png
diff --git a/static/img/usage/payroll/recurring-payroll/select-batch-edit.png b/static/img/usage/payroll/faq/select-batch-edit.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/select-batch-edit.png
rename to static/img/usage/payroll/faq/select-batch-edit.png
diff --git a/static/img/usage/payroll/opening-balance/select-employee.png b/static/img/usage/payroll/faq/select-employee.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/select-employee.png
rename to static/img/usage/payroll/faq/select-employee.png
diff --git a/static/img/usage/payroll/recurring-payroll/select-overtime.png b/static/img/usage/payroll/faq/select-overtime.png
similarity index 100%
rename from static/img/usage/payroll/recurring-payroll/select-overtime.png
rename to static/img/usage/payroll/faq/select-overtime.png
diff --git a/static/img/usage/payroll/guide/account-mapping-table.png b/static/img/usage/payroll/guide/account-mapping-table.png
new file mode 100644
index 0000000..b566fe3
Binary files /dev/null and b/static/img/usage/payroll/guide/account-mapping-table.png differ
diff --git a/static/img/usage/payroll/bonus/adhoc.png b/static/img/usage/payroll/guide/adhoc.png
similarity index 100%
rename from static/img/usage/payroll/bonus/adhoc.png
rename to static/img/usage/payroll/guide/adhoc.png
diff --git a/static/img/usage/payroll/bonus/adjust-employee.png b/static/img/usage/payroll/guide/adjust-employee.png
similarity index 100%
rename from static/img/usage/payroll/bonus/adjust-employee.png
rename to static/img/usage/payroll/guide/adjust-employee.png
diff --git a/static/img/usage/payroll/general/batch-1-employees.png b/static/img/usage/payroll/guide/batch-1-employees.png
similarity index 100%
rename from static/img/usage/payroll/general/batch-1-employees.png
rename to static/img/usage/payroll/guide/batch-1-employees.png
diff --git a/static/img/usage/payroll/general/batch-1-payroll.png b/static/img/usage/payroll/guide/batch-1-payroll.png
similarity index 100%
rename from static/img/usage/payroll/general/batch-1-payroll.png
rename to static/img/usage/payroll/guide/batch-1-payroll.png
diff --git a/static/img/usage/payroll/general/batch-2-employees.png b/static/img/usage/payroll/guide/batch-2-employees.png
similarity index 100%
rename from static/img/usage/payroll/general/batch-2-employees.png
rename to static/img/usage/payroll/guide/batch-2-employees.png
diff --git a/static/img/usage/payroll/general/batch-2-payroll.png b/static/img/usage/payroll/guide/batch-2-payroll.png
similarity index 100%
rename from static/img/usage/payroll/general/batch-2-payroll.png
rename to static/img/usage/payroll/guide/batch-2-payroll.png
diff --git a/static/img/usage/payroll/bonus/change-desc.png b/static/img/usage/payroll/guide/change-desc.png
similarity index 100%
rename from static/img/usage/payroll/bonus/change-desc.png
rename to static/img/usage/payroll/guide/change-desc.png
diff --git a/static/img/usage/payroll/bonus/click-bonus.png b/static/img/usage/payroll/guide/click-bonus.png
similarity index 100%
rename from static/img/usage/payroll/bonus/click-bonus.png
rename to static/img/usage/payroll/guide/click-bonus.png
diff --git a/static/img/usage/payroll/advanced-paid/config.png b/static/img/usage/payroll/guide/config.png
similarity index 100%
rename from static/img/usage/payroll/advanced-paid/config.png
rename to static/img/usage/payroll/guide/config.png
diff --git a/static/img/usage/payroll/guide/configure-payroll-accounting.jpg b/static/img/usage/payroll/guide/configure-payroll-accounting.jpg
new file mode 100644
index 0000000..92da9ec
Binary files /dev/null and b/static/img/usage/payroll/guide/configure-payroll-accounting.jpg differ
diff --git a/static/img/usage/payroll/general/create.png b/static/img/usage/payroll/guide/create.png
similarity index 100%
rename from static/img/usage/payroll/general/create.png
rename to static/img/usage/payroll/guide/create.png
diff --git a/static/img/usage/payroll/guide/display-company-name-and-last-saved-date-and-time.jpg b/static/img/usage/payroll/guide/display-company-name-and-last-saved-date-and-time.jpg
new file mode 100644
index 0000000..444db20
Binary files /dev/null and b/static/img/usage/payroll/guide/display-company-name-and-last-saved-date-and-time.jpg differ
diff --git a/static/img/usage/payroll/bonus/epf-pcb.png b/static/img/usage/payroll/guide/epf-pcb.png
similarity index 100%
rename from static/img/usage/payroll/bonus/epf-pcb.png
rename to static/img/usage/payroll/guide/epf-pcb.png
diff --git a/static/img/usage/payroll/guide/export-import-as-pv-je.jpg b/static/img/usage/payroll/guide/export-import-as-pv-je.jpg
new file mode 100644
index 0000000..85879c0
Binary files /dev/null and b/static/img/usage/payroll/guide/export-import-as-pv-je.jpg differ
diff --git a/static/img/usage/payroll/cp38/fill-in-details.png b/static/img/usage/payroll/guide/fill-in-details.png
similarity index 100%
rename from static/img/usage/payroll/cp38/fill-in-details.png
rename to static/img/usage/payroll/guide/fill-in-details.png
diff --git a/static/img/usage/payroll/advanced-paid/fill-in.png b/static/img/usage/payroll/guide/fill-in.png
similarity index 100%
rename from static/img/usage/payroll/advanced-paid/fill-in.png
rename to static/img/usage/payroll/guide/fill-in.png
diff --git a/static/img/usage/payroll/guide/generate-pv-je.jpg b/static/img/usage/payroll/guide/generate-pv-je.jpg
new file mode 100644
index 0000000..1ff0be9
Binary files /dev/null and b/static/img/usage/payroll/guide/generate-pv-je.jpg differ
diff --git a/static/img/usage/payroll/cp38/generate.png b/static/img/usage/payroll/guide/generate.png
similarity index 100%
rename from static/img/usage/payroll/cp38/generate.png
rename to static/img/usage/payroll/guide/generate.png
diff --git a/static/img/usage/payroll/guide/gl-account-mapping.jpg b/static/img/usage/payroll/guide/gl-account-mapping.jpg
new file mode 100644
index 0000000..9bbe26d
Binary files /dev/null and b/static/img/usage/payroll/guide/gl-account-mapping.jpg differ
diff --git a/static/img/usage/payroll/guide/import-pv-je-successful.jpg b/static/img/usage/payroll/guide/import-pv-je-successful.jpg
new file mode 100644
index 0000000..afdef09
Binary files /dev/null and b/static/img/usage/payroll/guide/import-pv-je-successful.jpg differ
diff --git a/static/img/usage/payroll/guide/import-pv-je.jpg b/static/img/usage/payroll/guide/import-pv-je.jpg
new file mode 100644
index 0000000..aa7d145
Binary files /dev/null and b/static/img/usage/payroll/guide/import-pv-je.jpg differ
diff --git a/static/img/usage/payroll/guide/insert-process-and-date.jpg b/static/img/usage/payroll/guide/insert-process-and-date.jpg
new file mode 100644
index 0000000..01e3139
Binary files /dev/null and b/static/img/usage/payroll/guide/insert-process-and-date.jpg differ
diff --git a/static/img/usage/payroll/guide/load-from-sql-account.jpg b/static/img/usage/payroll/guide/load-from-sql-account.jpg
new file mode 100644
index 0000000..f730e4b
Binary files /dev/null and b/static/img/usage/payroll/guide/load-from-sql-account.jpg differ
diff --git a/static/img/usage/payroll/guide/load-sql-account-file.jpg b/static/img/usage/payroll/guide/load-sql-account-file.jpg
new file mode 100644
index 0000000..2cbb3a6
Binary files /dev/null and b/static/img/usage/payroll/guide/load-sql-account-file.jpg differ
diff --git a/static/img/usage/payroll/bonus/navigate.png b/static/img/usage/payroll/guide/navigate copy.png
similarity index 100%
rename from static/img/usage/payroll/bonus/navigate.png
rename to static/img/usage/payroll/guide/navigate copy.png
diff --git a/static/img/usage/payroll/guide/navigate-import-payment-voucher.png b/static/img/usage/payroll/guide/navigate-import-payment-voucher.png
new file mode 100644
index 0000000..3afe468
Binary files /dev/null and b/static/img/usage/payroll/guide/navigate-import-payment-voucher.png differ
diff --git a/static/img/usage/payroll/general/navigate.png b/static/img/usage/payroll/guide/navigate.png
similarity index 100%
rename from static/img/usage/payroll/general/navigate.png
rename to static/img/usage/payroll/guide/navigate.png
diff --git a/static/img/usage/payroll/opening-balance/navigate.png b/static/img/usage/payroll/guide/open-navigate.png
similarity index 100%
rename from static/img/usage/payroll/opening-balance/navigate.png
rename to static/img/usage/payroll/guide/open-navigate.png
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-advance-paid.png b/static/img/usage/payroll/guide/open-pending-payroll-advance-paid.png
new file mode 100644
index 0000000..94ba008
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-advance-paid.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-allowance.png b/static/img/usage/payroll/guide/open-pending-payroll-allowance.png
new file mode 100644
index 0000000..847b918
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-allowance.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-bonus.png b/static/img/usage/payroll/guide/open-pending-payroll-bonus.png
new file mode 100644
index 0000000..6c9520a
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-bonus.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-claim.png b/static/img/usage/payroll/guide/open-pending-payroll-claim.png
new file mode 100644
index 0000000..33c0e81
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-claim.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-cp3801.png b/static/img/usage/payroll/guide/open-pending-payroll-cp3801.png
new file mode 100644
index 0000000..614ad56
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-cp3801.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-cp3802.png b/static/img/usage/payroll/guide/open-pending-payroll-cp3802.png
new file mode 100644
index 0000000..254bd99
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-cp3802.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-deduction.png b/static/img/usage/payroll/guide/open-pending-payroll-deduction.png
new file mode 100644
index 0000000..0f4786e
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-deduction.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-overtime.png b/static/img/usage/payroll/guide/open-pending-payroll-overtime.png
new file mode 100644
index 0000000..d66a18f
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-overtime.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-paid-leave.png b/static/img/usage/payroll/guide/open-pending-payroll-paid-leave.png
new file mode 100644
index 0000000..3434cf8
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-paid-leave.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-pending-navigator.png b/static/img/usage/payroll/guide/open-pending-payroll-pending-navigator.png
new file mode 100644
index 0000000..8c7b4a2
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-pending-navigator.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-pending-yyyy.png b/static/img/usage/payroll/guide/open-pending-payroll-pending-yyyy.png
new file mode 100644
index 0000000..ebbad13
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-pending-yyyy.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-show-all-pending-payroll.png b/static/img/usage/payroll/guide/open-pending-payroll-show-all-pending-payroll.png
new file mode 100644
index 0000000..9628949
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-show-all-pending-payroll.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-tax-deduct.png b/static/img/usage/payroll/guide/open-pending-payroll-tax-deduct.png
new file mode 100644
index 0000000..cd5f112
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-tax-deduct.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-unpaid-leave.png b/static/img/usage/payroll/guide/open-pending-payroll-unpaid-leave.png
new file mode 100644
index 0000000..56978a1
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-unpaid-leave.png differ
diff --git a/static/img/usage/payroll/guide/open-pending-payroll-wages.png b/static/img/usage/payroll/guide/open-pending-payroll-wages.png
new file mode 100644
index 0000000..b69508f
Binary files /dev/null and b/static/img/usage/payroll/guide/open-pending-payroll-wages.png differ
diff --git a/static/img/usage/payroll/general/open-select-employee.png b/static/img/usage/payroll/guide/open-select-employee.png
similarity index 100%
rename from static/img/usage/payroll/general/open-select-employee.png
rename to static/img/usage/payroll/guide/open-select-employee.png
diff --git a/static/img/usage/payroll/guide/overview-process-flow.jpg b/static/img/usage/payroll/guide/overview-process-flow.jpg
new file mode 100644
index 0000000..0fea93d
Binary files /dev/null and b/static/img/usage/payroll/guide/overview-process-flow.jpg differ
diff --git a/static/img/usage/payroll/guide/pay-adhoc-bonus-allowance.png b/static/img/usage/payroll/guide/pay-adhoc-bonus-allowance.png
new file mode 100644
index 0000000..b55be11
Binary files /dev/null and b/static/img/usage/payroll/guide/pay-adhoc-bonus-allowance.png differ
diff --git a/static/img/usage/payroll/guide/pay-adhoc-montly-fixed-allowance.png b/static/img/usage/payroll/guide/pay-adhoc-montly-fixed-allowance.png
new file mode 100644
index 0000000..d8e5ced
Binary files /dev/null and b/static/img/usage/payroll/guide/pay-adhoc-montly-fixed-allowance.png differ
diff --git a/static/img/usage/payroll/guide/pay-adhoc.png b/static/img/usage/payroll/guide/pay-adhoc.png
new file mode 100644
index 0000000..410d5c2
Binary files /dev/null and b/static/img/usage/payroll/guide/pay-adhoc.png differ
diff --git a/static/img/usage/payroll/guide/pay-frequency.png b/static/img/usage/payroll/guide/pay-frequency.png
new file mode 100644
index 0000000..8996e8f
Binary files /dev/null and b/static/img/usage/payroll/guide/pay-frequency.png differ
diff --git a/static/img/usage/payroll/general/pending-add-new-overtime.png b/static/img/usage/payroll/guide/pending-add-new-overtime.png
similarity index 100%
rename from static/img/usage/payroll/general/pending-add-new-overtime.png
rename to static/img/usage/payroll/guide/pending-add-new-overtime.png
diff --git a/static/img/usage/payroll/general/pending-click-overtime.png b/static/img/usage/payroll/guide/pending-click-overtime.png
similarity index 100%
rename from static/img/usage/payroll/general/pending-click-overtime.png
rename to static/img/usage/payroll/guide/pending-click-overtime.png
diff --git a/static/img/usage/payroll/general/pending-insert-info.png b/static/img/usage/payroll/guide/pending-insert-info.png
similarity index 100%
rename from static/img/usage/payroll/general/pending-insert-info.png
rename to static/img/usage/payroll/guide/pending-insert-info.png
diff --git a/static/img/usage/payroll/general/pending-overtime-save.png b/static/img/usage/payroll/guide/pending-overtime-save.png
similarity index 100%
rename from static/img/usage/payroll/general/pending-overtime-save.png
rename to static/img/usage/payroll/guide/pending-overtime-save.png
diff --git a/static/img/usage/payroll/general/pending-result.png b/static/img/usage/payroll/guide/pending-result.png
similarity index 100%
rename from static/img/usage/payroll/general/pending-result.png
rename to static/img/usage/payroll/guide/pending-result.png
diff --git a/static/img/usage/payroll/guide/posting-method.jpg b/static/img/usage/payroll/guide/posting-method.jpg
new file mode 100644
index 0000000..c83d078
Binary files /dev/null and b/static/img/usage/payroll/guide/posting-method.jpg differ
diff --git a/static/img/usage/payroll/advanced-paid/process.png b/static/img/usage/payroll/guide/process.png
similarity index 100%
rename from static/img/usage/payroll/advanced-paid/process.png
rename to static/img/usage/payroll/guide/process.png
diff --git a/static/img/usage/payroll/cp38/result.png b/static/img/usage/payroll/guide/result copy 2.png
similarity index 100%
rename from static/img/usage/payroll/cp38/result.png
rename to static/img/usage/payroll/guide/result copy 2.png
diff --git a/static/img/usage/payroll/bonus/result.png b/static/img/usage/payroll/guide/result copy.png
similarity index 100%
rename from static/img/usage/payroll/bonus/result.png
rename to static/img/usage/payroll/guide/result copy.png
diff --git a/static/img/usage/payroll/advanced-paid/result.png b/static/img/usage/payroll/guide/result.png
similarity index 100%
rename from static/img/usage/payroll/advanced-paid/result.png
rename to static/img/usage/payroll/guide/result.png
diff --git a/static/img/usage/payroll/guide/save-gl-account-to-file.png b/static/img/usage/payroll/guide/save-gl-account-to-file.png
new file mode 100644
index 0000000..b1a3680
Binary files /dev/null and b/static/img/usage/payroll/guide/save-gl-account-to-file.png differ
diff --git a/static/img/usage/payroll/guide/save-gl-to-file.jpg b/static/img/usage/payroll/guide/save-gl-to-file.jpg
new file mode 100644
index 0000000..5850b09
Binary files /dev/null and b/static/img/usage/payroll/guide/save-gl-to-file.jpg differ
diff --git a/static/img/usage/payroll/cp38/save.png b/static/img/usage/payroll/guide/save.png
similarity index 100%
rename from static/img/usage/payroll/cp38/save.png
rename to static/img/usage/payroll/guide/save.png
diff --git a/static/img/usage/payroll/advanced-paid/select-advance-paid.png b/static/img/usage/payroll/guide/select-advance-paid.png
similarity index 100%
rename from static/img/usage/payroll/advanced-paid/select-advance-paid.png
rename to static/img/usage/payroll/guide/select-advance-paid.png
diff --git a/static/img/usage/payroll/cp38/select-cp38.png b/static/img/usage/payroll/guide/select-cp38.png
similarity index 100%
rename from static/img/usage/payroll/cp38/select-cp38.png
rename to static/img/usage/payroll/guide/select-cp38.png
diff --git a/static/img/usage/payroll/bonus/tick-bonus.png b/static/img/usage/payroll/guide/tick-bonus.png
similarity index 100%
rename from static/img/usage/payroll/bonus/tick-bonus.png
rename to static/img/usage/payroll/guide/tick-bonus.png
diff --git a/static/img/usage/payroll/maintenance/maintain-allowance/add-fixed-allowance.png b/static/img/usage/payroll/setup/maintain-allowance/add-fixed-allowance.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-allowance/add-fixed-allowance.png
rename to static/img/usage/payroll/setup/maintain-allowance/add-fixed-allowance.png
diff --git a/static/img/usage/payroll/maintenance/maintain-allowance/insert.png b/static/img/usage/payroll/setup/maintain-allowance/insert.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-allowance/insert.png
rename to static/img/usage/payroll/setup/maintain-allowance/insert.png
diff --git a/static/img/usage/payroll/maintenance/maintain-allowance/navigate.png b/static/img/usage/payroll/setup/maintain-allowance/navigate.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-allowance/navigate.png
rename to static/img/usage/payroll/setup/maintain-allowance/navigate.png
diff --git a/static/img/usage/payroll/maintenance/maintain-allowance/new.png b/static/img/usage/payroll/setup/maintain-allowance/new.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-allowance/new.png
rename to static/img/usage/payroll/setup/maintain-allowance/new.png
diff --git a/static/img/usage/payroll/maintenance/maintain-allowance/process-month-end-add-allowance.png b/static/img/usage/payroll/setup/maintain-allowance/process-month-end-add-allowance.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-allowance/process-month-end-add-allowance.png
rename to static/img/usage/payroll/setup/maintain-allowance/process-month-end-add-allowance.png
diff --git a/static/img/usage/payroll/setup/maintain-claim/add-fixed-claim.png b/static/img/usage/payroll/setup/maintain-claim/add-fixed-claim.png
new file mode 100644
index 0000000..7fd4b9b
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-claim/add-fixed-claim.png differ
diff --git a/static/img/usage/payroll/setup/maintain-claim/insert.png b/static/img/usage/payroll/setup/maintain-claim/insert.png
new file mode 100644
index 0000000..e67b4da
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-claim/insert.png differ
diff --git a/static/img/usage/payroll/setup/maintain-claim/navigate.png b/static/img/usage/payroll/setup/maintain-claim/navigate.png
new file mode 100644
index 0000000..9297387
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-claim/navigate.png differ
diff --git a/static/img/usage/payroll/setup/maintain-claim/new.png b/static/img/usage/payroll/setup/maintain-claim/new.png
new file mode 100644
index 0000000..be1fe28
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-claim/new.png differ
diff --git a/static/img/usage/payroll/setup/maintain-claim/process-month-end-add-claim.png b/static/img/usage/payroll/setup/maintain-claim/process-month-end-add-claim.png
new file mode 100644
index 0000000..d0cc333
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-claim/process-month-end-add-claim.png differ
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/check-employee.png b/static/img/usage/payroll/setup/maintain-commission/check-employee.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/check-employee.png
rename to static/img/usage/payroll/setup/maintain-commission/check-employee.png
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/maintain-commission.png b/static/img/usage/payroll/setup/maintain-commission/maintain-commission.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/maintain-commission.png
rename to static/img/usage/payroll/setup/maintain-commission/maintain-commission.png
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/pending-payroll.png b/static/img/usage/payroll/setup/maintain-commission/pending-payroll.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/pending-payroll.png
rename to static/img/usage/payroll/setup/maintain-commission/pending-payroll.png
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/process-month-end-1.png b/static/img/usage/payroll/setup/maintain-commission/process-month-end-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/process-month-end-1.png
rename to static/img/usage/payroll/setup/maintain-commission/process-month-end-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/process-month-end-2.png b/static/img/usage/payroll/setup/maintain-commission/process-month-end-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/process-month-end-2.png
rename to static/img/usage/payroll/setup/maintain-commission/process-month-end-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/result.png b/static/img/usage/payroll/setup/maintain-commission/result.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/result.png
rename to static/img/usage/payroll/setup/maintain-commission/result.png
diff --git a/static/img/usage/payroll/maintenance/maintain-commission/tick-comm.png b/static/img/usage/payroll/setup/maintain-commission/tick-comm.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-commission/tick-comm.png
rename to static/img/usage/payroll/setup/maintain-commission/tick-comm.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/explanation-1.png b/static/img/usage/payroll/setup/maintain-contribution/explanation-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/explanation-1.png
rename to static/img/usage/payroll/setup/maintain-contribution/explanation-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/explanation-2.png b/static/img/usage/payroll/setup/maintain-contribution/explanation-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/explanation-2.png
rename to static/img/usage/payroll/setup/maintain-contribution/explanation-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/explanation-3.png b/static/img/usage/payroll/setup/maintain-contribution/explanation-3.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/explanation-3.png
rename to static/img/usage/payroll/setup/maintain-contribution/explanation-3.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/foreign.png b/static/img/usage/payroll/setup/maintain-contribution/foreign.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/foreign.png
rename to static/img/usage/payroll/setup/maintain-contribution/foreign.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/key-in-1.png b/static/img/usage/payroll/setup/maintain-contribution/key-in-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/key-in-1.png
rename to static/img/usage/payroll/setup/maintain-contribution/key-in-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/key-in-2.png b/static/img/usage/payroll/setup/maintain-contribution/key-in-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/key-in-2.png
rename to static/img/usage/payroll/setup/maintain-contribution/key-in-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/local-permanent.png b/static/img/usage/payroll/setup/maintain-contribution/local-permanent.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/local-permanent.png
rename to static/img/usage/payroll/setup/maintain-contribution/local-permanent.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/navigate.png b/static/img/usage/payroll/setup/maintain-contribution/navigate.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/navigate.png
rename to static/img/usage/payroll/setup/maintain-contribution/navigate.png
diff --git a/static/img/usage/payroll/maintenance/maintain-contribution/new.png b/static/img/usage/payroll/setup/maintain-contribution/new.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-contribution/new.png
rename to static/img/usage/payroll/setup/maintain-contribution/new.png
diff --git a/static/img/usage/payroll/setup/maintain-deduction/add-fixed-deduction.png b/static/img/usage/payroll/setup/maintain-deduction/add-fixed-deduction.png
new file mode 100644
index 0000000..622a451
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-deduction/add-fixed-deduction.png differ
diff --git a/static/img/usage/payroll/setup/maintain-deduction/insert.png b/static/img/usage/payroll/setup/maintain-deduction/insert.png
new file mode 100644
index 0000000..1d570b9
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-deduction/insert.png differ
diff --git a/static/img/usage/payroll/setup/maintain-deduction/navigate.png b/static/img/usage/payroll/setup/maintain-deduction/navigate.png
new file mode 100644
index 0000000..8a4a7cb
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-deduction/navigate.png differ
diff --git a/static/img/usage/payroll/setup/maintain-deduction/new.png b/static/img/usage/payroll/setup/maintain-deduction/new.png
new file mode 100644
index 0000000..f566b58
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-deduction/new.png differ
diff --git a/static/img/usage/payroll/setup/maintain-deduction/process-month-end-add-deduction.png b/static/img/usage/payroll/setup/maintain-deduction/process-month-end-add-deduction.png
new file mode 100644
index 0000000..ae23f11
Binary files /dev/null and b/static/img/usage/payroll/setup/maintain-deduction/process-month-end-add-deduction.png differ
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/key-in-employee-details.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/key-in-employee-details.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/key-in-employee-details.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/key-in-employee-details.png
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/mapping.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/mapping.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/mapping.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/mapping.png
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/navigate.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/navigate.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/navigate.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/navigate.png
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/notes.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/notes.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/notes.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/notes.png
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/open-payroll.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/open-payroll.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/open-payroll.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/open-payroll.png
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/open-txn.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/open-txn.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/open-txn.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/open-txn.png
diff --git a/static/img/usage/payroll/maintenance/maintain-employee-opening-balance/select-employee.png b/static/img/usage/payroll/setup/maintain-employee-opening-balance/select-employee.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-employee-opening-balance/select-employee.png
rename to static/img/usage/payroll/setup/maintain-employee-opening-balance/select-employee.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/final-result.png b/static/img/usage/payroll/setup/maintain-frequency/final-result.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/final-result.png
rename to static/img/usage/payroll/setup/maintain-frequency/final-result.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/frequency.png b/static/img/usage/payroll/setup/maintain-frequency/frequency.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/frequency.png
rename to static/img/usage/payroll/setup/maintain-frequency/frequency.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/maintain-frequency.png b/static/img/usage/payroll/setup/maintain-frequency/maintain-frequency.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/maintain-frequency.png
rename to static/img/usage/payroll/setup/maintain-frequency/maintain-frequency.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/new.png b/static/img/usage/payroll/setup/maintain-frequency/new.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/new.png
rename to static/img/usage/payroll/setup/maintain-frequency/new.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/result-1.png b/static/img/usage/payroll/setup/maintain-frequency/result-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/result-1.png
rename to static/img/usage/payroll/setup/maintain-frequency/result-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/result-2.png b/static/img/usage/payroll/setup/maintain-frequency/result-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/result-2.png
rename to static/img/usage/payroll/setup/maintain-frequency/result-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/set-freq-1.png b/static/img/usage/payroll/setup/maintain-frequency/set-freq-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/set-freq-1.png
rename to static/img/usage/payroll/setup/maintain-frequency/set-freq-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-frequency/set-freq-2.png b/static/img/usage/payroll/setup/maintain-frequency/set-freq-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-frequency/set-freq-2.png
rename to static/img/usage/payroll/setup/maintain-frequency/set-freq-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-click-employee.png b/static/img/usage/payroll/setup/maintain-overtime/after-click-employee.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-click-employee.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-click-employee.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-click-overtime.png b/static/img/usage/payroll/setup/maintain-overtime/after-click-overtime.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-click-overtime.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-click-overtime.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-click-plus.png b/static/img/usage/payroll/setup/maintain-overtime/after-click-plus.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-click-plus.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-click-plus.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-click-process.png b/static/img/usage/payroll/setup/maintain-overtime/after-click-process.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-click-process.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-click-process.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-enter-details.png b/static/img/usage/payroll/setup/maintain-overtime/after-enter-details.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-enter-details.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-enter-details.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-key-overtime-hour.png b/static/img/usage/payroll/setup/maintain-overtime/after-key-overtime-hour.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-key-overtime-hour.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-key-overtime-hour.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-key-overtime-minutes.png b/static/img/usage/payroll/setup/maintain-overtime/after-key-overtime-minutes.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-key-overtime-minutes.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-key-overtime-minutes.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-maintain-overtime.png b/static/img/usage/payroll/setup/maintain-overtime/after-maintain-overtime.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-maintain-overtime.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-maintain-overtime.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-navigate-new-payroll.png b/static/img/usage/payroll/setup/maintain-overtime/after-navigate-new-payroll.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-navigate-new-payroll.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-navigate-new-payroll.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-new.png b/static/img/usage/payroll/setup/maintain-overtime/after-new.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-new.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-new.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-select-code.png b/static/img/usage/payroll/setup/maintain-overtime/after-select-code.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-select-code.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-select-code.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/after-tick-column.png b/static/img/usage/payroll/setup/maintain-overtime/after-tick-column.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/after-tick-column.png
rename to static/img/usage/payroll/setup/maintain-overtime/after-tick-column.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-append-1.png b/static/img/usage/payroll/setup/maintain-overtime/before-append-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-append-1.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-append-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-append-2.png b/static/img/usage/payroll/setup/maintain-overtime/before-append-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-append-2.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-append-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-click-employee.png b/static/img/usage/payroll/setup/maintain-overtime/before-click-employee.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-click-employee.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-click-employee.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-click-overtime.png b/static/img/usage/payroll/setup/maintain-overtime/before-click-overtime.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-click-overtime.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-click-overtime.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-enable-work-unit-as-time.png b/static/img/usage/payroll/setup/maintain-overtime/before-enable-work-unit-as-time.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-enable-work-unit-as-time.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-enable-work-unit-as-time.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-enter-time.png b/static/img/usage/payroll/setup/maintain-overtime/before-enter-time.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-enter-time.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-enter-time.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-month-end-1.png b/static/img/usage/payroll/setup/maintain-overtime/before-month-end-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-month-end-1.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-month-end-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-month-end-2.png b/static/img/usage/payroll/setup/maintain-overtime/before-month-end-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-month-end-2.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-month-end-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-open-pending.png b/static/img/usage/payroll/setup/maintain-overtime/before-open-pending.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-open-pending.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-open-pending.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-open.png b/static/img/usage/payroll/setup/maintain-overtime/before-open.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-open.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-open.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-overtime-records.png b/static/img/usage/payroll/setup/maintain-overtime/before-overtime-records.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-overtime-records.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-overtime-records.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-repeat.png b/static/img/usage/payroll/setup/maintain-overtime/before-repeat.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-repeat.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-repeat.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-select-code.png b/static/img/usage/payroll/setup/maintain-overtime/before-select-code.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-select-code.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-select-code.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/before-select-employee.png b/static/img/usage/payroll/setup/maintain-overtime/before-select-employee.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/before-select-employee.png
rename to static/img/usage/payroll/setup/maintain-overtime/before-select-employee.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-click-data.png b/static/img/usage/payroll/setup/maintain-overtime/import-click-data.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-click-data.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-click-data.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-click-dots-button.png b/static/img/usage/payroll/setup/maintain-overtime/import-click-dots-button.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-click-dots-button.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-click-dots-button.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-click-overtime.png b/static/img/usage/payroll/setup/maintain-overtime/import-click-overtime.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-click-overtime.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-click-overtime.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-close.png b/static/img/usage/payroll/setup/maintain-overtime/import-close.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-close.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-close.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-excel.png b/static/img/usage/payroll/setup/maintain-overtime/import-excel.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-excel.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-excel.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-finish.png b/static/img/usage/payroll/setup/maintain-overtime/import-finish.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-finish.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-finish.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-go-to-file.png b/static/img/usage/payroll/setup/maintain-overtime/import-go-to-file.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-go-to-file.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-go-to-file.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-import.png b/static/img/usage/payroll/setup/maintain-overtime/import-import.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-import.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-import.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-last-save.png b/static/img/usage/payroll/setup/maintain-overtime/import-last-save.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-last-save.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-last-save.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-next.png b/static/img/usage/payroll/setup/maintain-overtime/import-next.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-next.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-next.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-open-pending-payroll.png b/static/img/usage/payroll/setup/maintain-overtime/import-open-pending-payroll.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-open-pending-payroll.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-open-pending-payroll.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-save-as.png b/static/img/usage/payroll/setup/maintain-overtime/import-save-as.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-save-as.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-save-as.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-save.png b/static/img/usage/payroll/setup/maintain-overtime/import-save.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-save.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-save.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-select-csv-file.png b/static/img/usage/payroll/setup/maintain-overtime/import-select-csv-file.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-select-csv-file.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-select-csv-file.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-select-csv.png b/static/img/usage/payroll/setup/maintain-overtime/import-select-csv.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-select-csv.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-select-csv.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-select-field-1.png b/static/img/usage/payroll/setup/maintain-overtime/import-select-field-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-select-field-1.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-select-field-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-overtime/import-select-field-2.png b/static/img/usage/payroll/setup/maintain-overtime/import-select-field-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-overtime/import-select-field-2.png
rename to static/img/usage/payroll/setup/maintain-overtime/import-select-field-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/5.png b/static/img/usage/payroll/setup/maintain-payment-method/5.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/5.png
rename to static/img/usage/payroll/setup/maintain-payment-method/5.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/6.png b/static/img/usage/payroll/setup/maintain-payment-method/6.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/6.png
rename to static/img/usage/payroll/setup/maintain-payment-method/6.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/7.png b/static/img/usage/payroll/setup/maintain-payment-method/7.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/7.png
rename to static/img/usage/payroll/setup/maintain-payment-method/7.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/key-in-1.png b/static/img/usage/payroll/setup/maintain-payment-method/key-in-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/key-in-1.png
rename to static/img/usage/payroll/setup/maintain-payment-method/key-in-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/key-in-2.png b/static/img/usage/payroll/setup/maintain-payment-method/key-in-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/key-in-2.png
rename to static/img/usage/payroll/setup/maintain-payment-method/key-in-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/navigate.png b/static/img/usage/payroll/setup/maintain-payment-method/navigate.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/navigate.png
rename to static/img/usage/payroll/setup/maintain-payment-method/navigate.png
diff --git a/static/img/usage/payroll/maintenance/maintain-payment-method/new.png b/static/img/usage/payroll/setup/maintain-payment-method/new.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-payment-method/new.png
rename to static/img/usage/payroll/setup/maintain-payment-method/new.png
diff --git a/static/img/usage/payroll/maintenance/maintain-wages/fill-in-1.png b/static/img/usage/payroll/setup/maintain-wages/fill-in-1.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-wages/fill-in-1.png
rename to static/img/usage/payroll/setup/maintain-wages/fill-in-1.png
diff --git a/static/img/usage/payroll/maintenance/maintain-wages/fill-in-2.png b/static/img/usage/payroll/setup/maintain-wages/fill-in-2.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-wages/fill-in-2.png
rename to static/img/usage/payroll/setup/maintain-wages/fill-in-2.png
diff --git a/static/img/usage/payroll/maintenance/maintain-wages/foreign.png b/static/img/usage/payroll/setup/maintain-wages/foreign.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-wages/foreign.png
rename to static/img/usage/payroll/setup/maintain-wages/foreign.png
diff --git a/static/img/usage/payroll/maintenance/maintain-wages/local-permanent.png b/static/img/usage/payroll/setup/maintain-wages/local-permanent.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-wages/local-permanent.png
rename to static/img/usage/payroll/setup/maintain-wages/local-permanent.png
diff --git a/static/img/usage/payroll/maintenance/maintain-wages/maintain-wages.png b/static/img/usage/payroll/setup/maintain-wages/maintain-wages.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-wages/maintain-wages.png
rename to static/img/usage/payroll/setup/maintain-wages/maintain-wages.png
diff --git a/static/img/usage/payroll/maintenance/maintain-wages/new.png b/static/img/usage/payroll/setup/maintain-wages/new.png
similarity index 100%
rename from static/img/usage/payroll/maintenance/maintain-wages/new.png
rename to static/img/usage/payroll/setup/maintain-wages/new.png
diff --git a/static/img/usage/tools/maintain-diy/diy-calculation-type.png b/static/img/usage/tools/maintain-diy/diy-calculation-type.png
new file mode 100644
index 0000000..b13c4e4
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-calculation-type.png differ
diff --git a/static/img/usage/tools/maintain-diy/diy-example1-1.png b/static/img/usage/tools/maintain-diy/diy-example1-1.png
new file mode 100644
index 0000000..5ffa760
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-example1-1.png differ
diff --git a/static/img/usage/tools/maintain-diy/diy-example1-2.png b/static/img/usage/tools/maintain-diy/diy-example1-2.png
new file mode 100644
index 0000000..497e1d5
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-example1-2.png differ
diff --git a/static/img/usage/tools/maintain-diy/diy-example1-3.jpg b/static/img/usage/tools/maintain-diy/diy-example1-3.jpg
new file mode 100644
index 0000000..a4e805d
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-example1-3.jpg differ
diff --git a/static/img/usage/tools/maintain-diy/diy-example2-1.png b/static/img/usage/tools/maintain-diy/diy-example2-1.png
new file mode 100644
index 0000000..c6cd507
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-example2-1.png differ
diff --git a/static/img/usage/tools/maintain-diy/diy-example2-2.png b/static/img/usage/tools/maintain-diy/diy-example2-2.png
new file mode 100644
index 0000000..193a578
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-example2-2.png differ
diff --git a/static/img/usage/tools/maintain-diy/diy-example3-1.png b/static/img/usage/tools/maintain-diy/diy-example3-1.png
new file mode 100644
index 0000000..cae1848
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-example3-1.png differ
diff --git a/static/img/usage/tools/maintain-diy/diy-intro.png b/static/img/usage/tools/maintain-diy/diy-intro.png
new file mode 100644
index 0000000..213922f
Binary files /dev/null and b/static/img/usage/tools/maintain-diy/diy-intro.png differ
diff --git a/static/img/usage/tools/options/options-intro.jpg b/static/img/usage/tools/options/options-intro.jpg
new file mode 100644
index 0000000..ef0d875
Binary files /dev/null and b/static/img/usage/tools/options/options-intro.jpg differ
diff --git a/static/img/usage/tools/options/personal-general-setting.png b/static/img/usage/tools/options/personal-general-setting.png
new file mode 100644
index 0000000..ce60731
Binary files /dev/null and b/static/img/usage/tools/options/personal-general-setting.png differ
diff --git a/static/img/usage/tools/options/system-general-setting.png b/static/img/usage/tools/options/system-general-setting.png
new file mode 100644
index 0000000..752eef1
Binary files /dev/null and b/static/img/usage/tools/options/system-general-setting.png differ
diff --git a/static/img/usage/tools/options/system-password-policy.png b/static/img/usage/tools/options/system-password-policy.png
new file mode 100644
index 0000000..064479c
Binary files /dev/null and b/static/img/usage/tools/options/system-password-policy.png differ