From 3c10e5066a2601c98d0480c2db091f767a322c7f Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 16 Sep 2022 16:20:35 +0530 Subject: [PATCH 1/3] fix: use default supplier currency if default supplier is enabled (cherry picked from commit 77fdc37cb75d465a7a5297fc89bba31b8193ebeb) --- erpnext/selling/doctype/sales_order/sales_order.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index b673223dc6b..e9024aee69e 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -950,6 +950,9 @@ def get_events(start, end, filters=None): @frappe.whitelist() def make_purchase_order_for_default_supplier(source_name, selected_items=None, target_doc=None): """Creates Purchase Order for each Supplier. Returns a list of doc objects.""" + + from erpnext.setup.utils import get_exchange_rate + if not selected_items: return @@ -958,6 +961,15 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t def set_missing_values(source, target): target.supplier = supplier + target.currency = frappe.db.get_value( + "Supplier", filters={"name": supplier}, fieldname=["default_currency"] + ) + company_currency = frappe.db.get_value( + "Company", filters={"name": target.company}, fieldname=["default_currency"] + ) + + target.conversion_rate = get_exchange_rate(target.currency, company_currency, args="for_buying") + target.apply_discount_on = "" target.additional_discount_percentage = 0.0 target.discount_amount = 0.0 From 2e3445fad95db741cbc1bc42b19d1f3ba378fba2 Mon Sep 17 00:00:00 2001 From: Ritwik Puri Date: Mon, 19 Sep 2022 13:35:08 +0530 Subject: [PATCH 2/3] chore: patch for removing stale values in Naming Series (#32271) --- erpnext/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index cbc224f99e4..b3099644780 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -373,3 +373,4 @@ erpnext.patches.v13_0.fix_number_and_frequency_for_monthly_depreciation erpnext.patches.v13_0.reset_corrupt_defaults erpnext.patches.v13_0.show_hr_payroll_deprecation_warning erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair +execute:frappe.db.set_value("Naming Series", "Naming Series", {"select_doc_for_series": "", "set_options": "", "prefix": "", "current_value": 0, "user_must_always_select": 0}) From e2e69dced7048d154d2a5b22b67de05d12a4ead3 Mon Sep 17 00:00:00 2001 From: Solufyin <34390782+Solufyin@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:42:05 +0530 Subject: [PATCH 3/3] fix: Change Department fieldtype to Link in Leave Balance Report (#32252) Co-authored-by: Nihantra C. Patel --- .../employee_leave_balance_summary.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py b/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py index 986c686e5b3..35ba16c74a7 100644 --- a/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py +++ b/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py @@ -22,9 +22,9 @@ def execute(filters=None): def get_columns(leave_types): columns = [ - _("Employee") + ":Link.Employee:150", + _("Employee") + ":Link/Employee:150", _("Employee Name") + "::200", - _("Department") + "::150", + _("Department") + ":Link/Department:150", ] for leave_type in leave_types: