Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activity mapper, workspace under payrol #2

Merged
merged 1 commit into from
May 21, 2024
Merged

Activity mapper, workspace under payrol #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions nl_piece_rate_pay/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
},

]

doctype_js = {"Activity Type" : "nl_piece_rate_pay/client_scripts/activity_type_mapper.js"}

# Includes in <head>
# ------------------

Expand Down
10 changes: 10 additions & 0 deletions nl_piece_rate_pay/nl_piece_rate_pay/client_scripts/activity_type_mapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

frappe.ui.form.on('Activity Type', {
refresh: function(frm) {

frm.add_custom_button(__("Casual Item Cost"), function () {
frappe.route_options = { activity_type: frm.doc.name };
frappe.set_route("List", "Casual Activity Item");
});
}
});
6 changes: 3 additions & 3 deletions nl_piece_rate_pay/nl_piece_rate_pay/doctype/casual_activity_item/casual_activity_item.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
{
"default": "0",
"description": "per day",
"description": "per item",
"fieldname": "costing_rate",
"fieldtype": "Currency",
"label": "Costing Rate"
Expand All @@ -76,9 +76,9 @@
}
],
"links": [],
"modified": "2024-04-23 07:58:13.804557",
"modified": "2024-05-21 17:23:40.990331",
"modified_by": "Administrator",
"module": "CSF KE",
"module": "NL Piece Rate Pay",
"name": "Casual Activity Item",
"naming_rule": "Expression (old style)",
"owner": "Administrator",
Expand Down
2 changes: 1 addition & 1 deletion nl_piece_rate_pay/nl_piece_rate_pay/doctype/casual_payment_record/casual_payment_record.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"links": [],
"modified": "2024-04-28 08:27:43.330454",
"modified_by": "Administrator",
"module": "CSF KE",
"module": "NL Piece Rate Pay",
"name": "Casual Payment Record",
"owner": "Administrator",
"permissions": [],
Expand Down
2 changes: 1 addition & 1 deletion nl_piece_rate_pay/nl_piece_rate_pay/doctype/casual_payroll_payout/casual_payroll_payout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"links": [],
"modified": "2024-04-24 12:56:07.842413",
"modified_by": "Administrator",
"module": "CSF KE",
"module": "NL Piece Rate Pay",
"name": "Casual Payroll Payout",
"naming_rule": "Expression",
"owner": "Administrator",
Expand Down
2 changes: 1 addition & 1 deletion ...piece_rate_pay/doctype/casual_payroll_payout_employee/casual_payroll_payout_employee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"links": [],
"modified": "2024-04-24 12:54:32.929154",
"modified_by": "Administrator",
"module": "CSF KE",
"module": "NL Piece Rate Pay",
"name": "Casual Payroll Payout Employee",
"owner": "Administrator",
"permissions": [],
Expand Down
2 changes: 1 addition & 1 deletion ..._pay/nl_piece_rate_pay/doctype/casual_payroll_payout_item/casual_payroll_payout_item.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"links": [],
"modified": "2024-04-22 12:42:45.132037",
"modified_by": "Administrator",
"module": "CSF KE",
"module": "NL Piece Rate Pay",
"name": "Casual Payroll Payout Item",
"owner": "Administrator",
"permissions": [],
Expand Down
13 changes: 7 additions & 6 deletions nl_piece_rate_pay/nl_piece_rate_pay/workspace/casual_piece_rate/casual_piece_rate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
{
"charts": [],
"content": "[{\"id\":\"TFGWHXtT34\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">Casual Piece Rate</span>\",\"col\":12}},{\"id\":\"SIfGwCveBT\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Casual Activity Item\",\"col\":3}},{\"id\":\"CeZ63AmI5-\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Casual Salary Structure Assignment Tool\",\"col\":3}},{\"id\":\"Z5YADe8s5V\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Casual Payroll Payout\",\"col\":3}}]",
"creation": "2024-05-20 09:37:30.945724",
"content": "[{\"id\":\"9HGm55y889\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">Casual Piece Rate</span>\",\"col\":12}},{\"id\":\"TIbQgaOmvH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Casual Activity Item\",\"col\":4}},{\"id\":\"RlDQdF5EOc\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Casual Salary Structure Assignment Tool\",\"col\":4}},{\"id\":\"JCgieJP-fC\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Casual Daily Payroll Payout\",\"col\":4}}]",
"creation": "2024-05-21 17:19:45.641814",
"custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "money-coins-1",
"idx": 0,
"indicator_color": "green",
"is_hidden": 0,
"label": "Casual Piece Rate",
"links": [],
"modified": "2024-05-20 09:39:21.348316",
"modified": "2024-05-21 17:21:49.926551",
"modified_by": "Administrator",
"module": "NL Piece Rate Pay",
"name": "Casual Piece Rate",
"number_cards": [],
"owner": "Administrator",
"parent_page": "",
"parent_page": "Payroll",
"public": 1,
"quick_lists": [],
"roles": [],
"sequence_id": 58.0,
"sequence_id": 46.0,
"shortcuts": [
{
"color": "Grey",
Expand All @@ -43,7 +44,7 @@
{
"color": "Grey",
"doc_view": "List",
"label": "Casual Payroll Payout",
"label": "Casual Daily Payroll Payout",
"link_to": "Casual Payroll Payout",
"stats_filter": "[]",
"type": "DocType"
Expand Down
Loading