nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-32250

Browse Source
This commit is contained in:
Sagar Sharma
2022-09-19 19:22:31 +05:30
committed by GitHub
parent e8d2e49155 e2e69dced7
commit 7fc460bb32
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py
View File

@@ -22,9 +22,9 @@ def execute(filters=None):
def get_columns(leave_types): def get_columns(leave_types):
columns = [ columns = [
_("Employee") + ":Link.Employee:150", _("Employee") + ":Link/Employee:150",
_("Employee Name") + "::200", _("Employee Name") + "::200",
_("Department") + "::150", _("Department") + ":Link/Department:150",
] ]
for leave_type in leave_types: for leave_type in leave_types:

1
erpnext/patches.txt
View File

@@ -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.reset_corrupt_defaults
erpnext.patches.v13_0.show_hr_payroll_deprecation_warning erpnext.patches.v13_0.show_hr_payroll_deprecation_warning
erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair 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})

12
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -950,6 +950,9 @@ def get_events(start, end, filters=None):
@frappe.whitelist() @frappe.whitelist()
def make_purchase_order_for_default_supplier(source_name, selected_items=None, target_doc=None): 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.""" """Creates Purchase Order for each Supplier. Returns a list of doc objects."""
from erpnext.setup.utils import get_exchange_rate
if not selected_items: if not selected_items:
return return
@@ -958,6 +961,15 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t
def set_missing_values(source, target): def set_missing_values(source, target):
target.supplier = supplier 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.apply_discount_on = ""
target.additional_discount_percentage = 0.0 target.additional_discount_percentage = 0.0
target.discount_amount = 0.0 target.discount_amount = 0.0