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.

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

feat: merge APIs, doc events and schedules from Payware App to CSF TZ App #256

Merged
merged 26 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3939b2d
chore: csf patches to be excuted after syncing of database
av-dev2 Nov 3, 2023
dbac27e
feat: user role listing report
skibanga Nov 22, 2023
7824f54
feat: show multi currency salary transaction on the report
av-dev2 Nov 25, 2023
2ec7136
Merge pull request #241 from skibanga/report_1
aakvatech Dec 1, 2023
167dae0
feat: add custom fields in employee doctype
iphenelist Dec 3, 2023
c7f67b9
Merge pull request #245 from iphenelist/innomake_patch
aakvatech Dec 3, 2023
599cedb
fix: removing the custom_from the fieldnam and add other custom fiel…
iphenelist Dec 4, 2023
40a2a88
fix: change the fieldname from employee_country_codes to employee_cou…
iphenelist Dec 5, 2023
c3aa555
feat: implement Cost Center wise Monthly Comparison in Salary Registe…
skibanga Dec 5, 2023
c446c64
feat: Payroll Report for Mobile Payment
iphenelist Dec 7, 2023
272a8e5
feat: role permission listing report
skibanga Dec 9, 2023
b008909
feat: adding tax_category field in customer and supplier groups
iphenelist Dec 9, 2023
da031c5
Merge pull request #236 from av-dev2/chore_patch_run_after_db_sync
aakvatech Dec 11, 2023
06e9c91
Merge pull request #246 from iphenelist/innomake_patch
aakvatech Dec 11, 2023
3c03346
Merge pull request #243 from av-dev2/feat_multi_currency_for_salary_r…
aakvatech Dec 11, 2023
de8ef32
Merge pull request #247 from skibanga/cost_center
aakvatech Dec 11, 2023
14630ad
Merge pull request #248 from iphenelist/payroll_report
aakvatech Dec 11, 2023
a695872
Merge pull request #249 from skibanga/report_3
aakvatech Dec 11, 2023
b19472c
Merge pull request #250 from iphenelist/tax_patch
aakvatech Dec 11, 2023
97eaf9a
fix: permission for Program Fee
iphenelist Dec 12, 2023
3f2539e
Merge pull request #251 from iphenelist/fix_permission
aakvatech Dec 12, 2023
7171b99
feat: adding remarks on right and buttom
skibanga Dec 15, 2023
45a3147
Merge pull request #252 from skibanga/report_supplier
aakvatech Dec 15, 2023
7a21314
Merge branch 'version-14' into payware_merger
av-dev2 Dec 18, 2023
2a45d36
feat: merge APIs, doc events and schedules from Payware App to CSF TZ…
av-dev2 Dec 18, 2023
9302425
feat: move custom fields and property setters from payware app to csf…
av-dev2 Dec 20, 2023
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
19 changes: 8 additions & 11 deletions csf_tz/csf_tz/additional_salary.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
frappe.ui.form.on('Additional Salary', {
refresh: function(frm) {
cur_frm.add_custom_button(__("Generate Additional Salary Records"), function() {
generate_additional_salary_records();
frappe.call({
method: "csf_tz.csftz_hooks.additional_salary.generate_additional_salary_records",
args: {},
callback: function () {
cur_frm.reload_doc();
}
});
});
},
payroll_date: function(frm) {
Expand All @@ -23,7 +29,7 @@ frappe.ui.form.on('Additional Salary', {
no_of_hours: function(frm) {
if (frm.doc.employee && frm.doc.payroll_date) {
frappe.call({
method: "payware.payware.utils.get_employee_base_salary_in_hours",
method: "csf_tz.csftz_hooks.additional_salary.get_employee_base_salary_in_hours",
args: {
employee: frm.doc.employee,
payroll_date: frm.doc.payroll_date
Expand All @@ -39,12 +45,3 @@ frappe.ui.form.on('Additional Salary', {
}
},
});
var generate_additional_salary_records = function(){
frappe.call({
method: "payware.payware.utils.generate_additional_salary_records",
args: {},
callback: function(){
cur_frm.reload_doc();
}
});
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"add_total_row": 0,
"columns": [],
"creation": "2023-12-07 09:19:33.465533",
"disable_prepared_report": 0,
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"filters": [
{
"fieldname": "from_date",
"fieldtype": "Date",
"label": "From Date",
"mandatory": 1,
"wildcard_filter": 0
},
{
"fieldname": "to_date",
"fieldtype": "Date",
"label": "To Date",
"mandatory": 1,
"wildcard_filter": 0
}
],
"idx": 0,
"is_standard": "No",
"letter_head": "Letterhead",
"modified": "2023-12-07 09:22:16.053511",
"modified_by": "imetumba@aakvatech.com",
"module": "CSF TZ",
"name": "Payroll for Mobile Payment",
"owner": "imetumba@aakvatech.com",
"prepared_report": 0,
"query": "select\nep.employee AS \"Employee ID\",\n ep.employee_name AS \"Employee Name:Data:200\",\n ep.payroll_cost_center AS \"Payroll Cost Center\",\n sp.net_pay AS \"Net Pay:Currency:150\",\n ep.cell_number AS \"Mobile No::150\"\nFROM\n `tabSalary Slip` sp\nINNER JOIN\n `tabEmployee` ep ON sp.employee = ep.name\nWHERE \n ep.bank_name IS NULL AND\n sp.start_date >= %(from_date)s AND sp.end_date <= %(to_date)s",
"ref_doctype": "Salary Slip",
"report_name": "Payroll for Mobile Payment",
"report_type": "Query Report",
"roles": [
{
"role": "HR Manager"
},
{
"role": "Employee"
},
{
"role": "HR User"
},
{
"role": "System Manager"
},
{
"role": "Employee Self Service"
}
]
}
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"add_total_row": 0,
"columns": [],
"creation": "2023-12-09 10:15:43.188145",
"disable_prepared_report": 0,
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"filters": [],
"idx": 0,
"is_standard": "Yes",
"letter_head": "MKUTA",
"modified": "2023-12-09 10:17:45.306710",
"modified_by": "Administrator",
"module": "CSF TZ",
"name": "Role Permission Listing",
"owner": "Administrator",
"prepared_report": 0,
"query": "SELECT * FROM `tabCustom DocPerm` WHERE parent = 'DocType'",
"ref_doctype": "Custom DocPerm",
"report_name": "Role Permission Listing",
"report_type": "Query Report",
"roles": [
{
"role": "System Manager"
}
]
}
88 changes: 43 additions & 45 deletions csf_tz/csf_tz/report/salary_register_csf/salary_register_csf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,46 +16,47 @@ frappe.query_reports["Salary Register csf"] = {
});
});
},
filters: [
"filters": [
{
fieldname: "from_date",
label: __("From"),
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
reqd: 1,
width: "100px",
"fieldname": "company",
"label": __("Company"),
"fieldtype": "Link",
"options": "Company",
"default": frappe.defaults.get_user_default("Company"),
"width": "100px",
"reqd": 1
},
{
fieldname: "to_date",
label: __("To"),
fieldtype: "Date",
default: frappe.datetime.get_today(),
reqd: 1,
width: "100px",
"fieldname": "from_date",
"label": __("From"),
"fieldtype": "Date",
"default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
"reqd": 1,
"width": "100px"
},
{
fieldname: "currency",
fieldtype: "Link",
options: "Currency",
label: __("Currency"),
default: erpnext.get_currency(frappe.defaults.get_default("Company")),
width: "50px",
"fieldname": "to_date",
"label": __("To"),
"fieldtype": "Date",
"default": frappe.datetime.get_today(),
"reqd": 1,
"width": "100px"
},
{
fieldname: "employee",
label: __("Employee"),
fieldtype: "Link",
options: "Employee",
width: "100px",
"fieldname": "currency",
"fieldtype": "Link",
"options": "Currency",
"label": __("Currency"),
"default": erpnext.get_currency(frappe.defaults.get_default("Company")),
"width": "50px",
"reqd": 1
},
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
width: "100px",
reqd: 1,
"fieldname": "employee",
"label": __("Employee"),
"fieldtype": "Link",
"options": "Employee",
"width": "100px"
},
{
fieldname: "department",
Expand All @@ -75,20 +76,17 @@ frappe.query_reports["Salary Register csf"] = {
},
},
{
fieldname: "docstatus",
label: __("Document Status"),
fieldtype: "Select",
options: ["Draft", "Submitted", "Cancelled"],
default: "Submitted",
width: "100px",
"fieldname": "docstatus",
"label": __("Document Status"),
"fieldtype": "Select",
"options": ["Draft", "Submitted", "Cancelled"],
"default": "Submitted",
"width": "100px"
},
{
fieldname: "workflow_state",
label: __("Workflow"),
fieldtype: "Select",
options: ["", "Pending", "Approved", "Rejected"],
// default: "Pending",
width: "100px",
},
],
"fieldname": "multi_currency",
"label": __("Multi Currency"),
"fieldtype": "Check",
}
]
};
Loading