From db13e3d305b791d6e2ce0b8295cfd3bc15f7e8ca Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Fri, 20 Oct 2023 14:13:57 +0200 Subject: [PATCH 1/4] chore: Fix typo --- erpnext/manufacturing/doctype/job_card/job_card_list.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card_list.js b/erpnext/manufacturing/doctype/job_card/job_card_list.js index 698afcb735..3534ec3827 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card_list.js +++ b/erpnext/manufacturing/doctype/job_card/job_card_list.js @@ -1,7 +1,7 @@ frappe.listview_settings['Job Card'] = { has_indicator_for_draft: true, - get_indicator: function(doc) { + get_indicator: function (doc) { const status_colors = { "Work In Progress": "orange", "Completed": "green", @@ -13,6 +13,5 @@ frappe.listview_settings['Job Card'] = { const color = status_colors[status] || "blue"; return [__(status), color, `status,=,${status}`]; - } } }; -- GitLab From c96f7039573bfb7b71afede72f2ad55b1f1392c2 Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Fri, 20 Oct 2023 14:20:15 +0200 Subject: [PATCH 2/4] chore: Fix typo (list_view, listview, doclist) --- erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js | 2 +- erpnext/stock/doctype/delivery_note/delivery_note_list.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js index b1dfdeba6f..2b9b405196 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -28,7 +28,7 @@ frappe.listview_settings['Sales Invoice'] = { listview.page.add_actions_menu_item( __("Accounting Journal Adjustment"), () => { - const docnames = list_view.get_checked_items(true); + const docnames = listview.get_checked_items(true); new erpnext.journalAdjustment({doctype: listview.doctype, docnames: docnames}) }, true diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js index c9e4c3dcaa..91b0c6bef7 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js @@ -16,8 +16,8 @@ frappe.listview_settings['Delivery Note'] = { }, onload: function (doclist) { const action = () => { - const selected_docs = listview.get_checked_items(); - const docnames = listview.get_checked_items(true); + const selected_docs = doclist.get_checked_items(); + const docnames = doclist.get_checked_items(true); if (selected_docs.length > 0) { for (let doc of selected_docs) { -- GitLab From f1d91f82a76008b82b88f22b08ebd7d2ad3d5b0e Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Sat, 21 Oct 2023 00:06:45 +0200 Subject: [PATCH 3/4] fix: Fix syntax errors in JS --- .../doctype/adjustment_entry/adjustment_entry.js | 2 +- .../doctype/bank_transaction/bank_transaction.js | 3 ++- .../purchase_order_analysis.js | 1 - erpnext/projects/doctype/task/task.js | 13 +++++-------- erpnext/public/js/booking-page/resource_grid.js | 2 +- erpnext/setup/doctype/company/company.js | 2 +- .../stock/doctype/delivery_trip/delivery_trip.js | 3 ++- erpnext/stock/doctype/stock_entry/stock_entry.js | 2 +- erpnext/www/book_appointment/index.js | 2 +- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/erpnext/accounts/doctype/adjustment_entry/adjustment_entry.js b/erpnext/accounts/doctype/adjustment_entry/adjustment_entry.js index 453091faf7..77db12c074 100644 --- a/erpnext/accounts/doctype/adjustment_entry/adjustment_entry.js +++ b/erpnext/accounts/doctype/adjustment_entry/adjustment_entry.js @@ -32,7 +32,7 @@ frappe.ui.form.on('Adjustment Entry', { frm.refresh_field("details"); frm.set_value("total_debit", r.message.total_debit); - frm.refresh_field("total_debit");; + frm.refresh_field("total_debit"); frm.set_value("total_credit", r.message.total_credit); frm.refresh_field("total_credit"); frm.set_value("total_posting_amount", r.message.total_posting_amount); diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js index 8cd55ba569..6e504668d8 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js @@ -1,3 +1,4 @@ + // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt @@ -113,8 +114,8 @@ frappe.ui.form.on('Bank Transaction Payments', { r&&r.party_name&&frappe.model.set_value(cdt, cdn, "party", r.party_name); r&&r.posting_date&&frappe.model.set_value(cdt, cdn, "date", r.posting_date); }); - break; } + break; case "Journal Entry": if (frm.doc.bank_account_head) { frappe.db.get_value("Journal Entry Account", {parent: row.payment_entry, account: frm.doc.bank_account_head}, "debit_in_account_currency", (value) => { diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js index eaf100e7aa..91506c0ab3 100644 --- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js +++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js @@ -38,7 +38,6 @@ frappe.query_reports["Purchase Order Analysis"] = { }, { "fieldname": "name", - "fieldname": "purchase_order", "label": __("Purchase Order"), "fieldtype": "Link", "width": "80", diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js index 365d4f2e90..3222a1af9d 100644 --- a/erpnext/projects/doctype/task/task.js +++ b/erpnext/projects/doctype/task/task.js @@ -12,6 +12,11 @@ frappe.ui.form.on("Task", { }) } + frm.fields_dict.project.get_query = function() { + return { + query: "erpnext.projects.doctype.task.task.get_project" + } + }; }, onload: function (frm) { frm.set_query("task", "depends_on", function () { @@ -36,14 +41,6 @@ frappe.ui.form.on("Task", { }); }, - setup: function(frm) { - frm.fields_dict.project.get_query = function() { - return { - query: "erpnext.projects.doctype.task.task.get_project" - } - }; - }, - is_group: function (frm) { frappe.call({ method: "erpnext.projects.doctype.task.task.check_if_child_exists", diff --git a/erpnext/public/js/booking-page/resource_grid.js b/erpnext/public/js/booking-page/resource_grid.js index cc5bef778d..932f9009d9 100644 --- a/erpnext/public/js/booking-page/resource_grid.js +++ b/erpnext/public/js/booking-page/resource_grid.js @@ -145,4 +145,4 @@ export default class ResourceGrid { return ``; } } -}; \ No newline at end of file +} diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index 5e9de95f04..44fb45fb74 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -60,7 +60,7 @@ frappe.ui.form.on("Company", { var bool = frm.doc.parent_company ? true : false; frm.set_value('create_chart_of_accounts_based_on', bool ? "Existing Company" : ""); frm.set_value('existing_company', bool ? frm.doc.parent_company : ""); - disbale_coa_fields(frm, bool); + disable_coa_fields(frm, bool); }, date_of_commencement: function(frm) { diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js index 2da22da400..8a5d25c37f 100755 --- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js +++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js @@ -79,6 +79,7 @@ frappe.ui.form.on('Delivery Trip', { }, () => { frm.reload_doc(); }); + }, driver: function (frm) { if (frm.doc.driver) { @@ -203,7 +204,7 @@ frappe.ui.form.on('Delivery Stop', { frm.set_value("driver_email", data.message.email); } }); - }; + } }, contact: function (frm, cdt, cdn) { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index da7e8192c2..8cab438dd5 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1082,7 +1082,7 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle items_on_form_rendered(doc, grid_row) { if (doc.purpose !== 'Material Receipt') { erpnext.setup_serial_or_batch_no(); - }; + } } toggle_related_fields(doc) { diff --git a/erpnext/www/book_appointment/index.js b/erpnext/www/book_appointment/index.js index dd5e9e537b..95736c0b7d 100644 --- a/erpnext/www/book_appointment/index.js +++ b/erpnext/www/book_appointment/index.js @@ -237,7 +237,7 @@ async function submit() { window.location.href = redirect_url;},5000) }, error: (err)=>{ - frappe.show_alert(_("Something went wrong please try again")); + frappe.show_alert(__("Something went wrong please try again")); button.disabled = false; } }); -- GitLab From 0d079060c25732dbbf42e87d36508d90441a2601 Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Sat, 21 Oct 2023 00:07:29 +0200 Subject: [PATCH 4/4] test: Fix mutable argument default --- erpnext/projects/doctype/project/test_project.py | 2 +- .../projects/doctype/project_template/test_project_template.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py index f47fe6aa50..890e42efc8 100644 --- a/erpnext/projects/doctype/project/test_project.py +++ b/erpnext/projects/doctype/project/test_project.py @@ -247,7 +247,7 @@ def make_project(args): ) if args.project_template_name: - template = make_project_template(args.project_template_name) + template = make_project_template(args.project_template_name, []) project.project_template = template.name project.insert() diff --git a/erpnext/projects/doctype/project_template/test_project_template.py b/erpnext/projects/doctype/project_template/test_project_template.py index eb2f1a1c7b..ad9e505e71 100644 --- a/erpnext/projects/doctype/project_template/test_project_template.py +++ b/erpnext/projects/doctype/project_template/test_project_template.py @@ -13,7 +13,7 @@ class TestProjectTemplate(unittest.TestCase): pass -def make_project_template(project_template_name, project_tasks=[]): +def make_project_template(project_template_name, project_tasks: list): if not frappe.db.exists("Project Template", project_template_name): project_tasks = project_tasks or [ create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3), -- GitLab