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

Merge branch 'version-12-hotfix' into delievered-received-items-to-bill-report-fix

Browse Source
This commit is contained in:
Marica
2020-11-05 12:31:59 +05:30
committed by GitHub
parent 4f008f59fc 533954cd12
commit 3960c49fc6
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@@ -635,7 +635,7 @@ execute:frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
execute:frappe.reload_doc('desk', 'doctype', 'dashboard_chart_field') execute:frappe.reload_doc('desk', 'doctype', 'dashboard_chart_field')
erpnext.patches.v12_0.add_default_dashboards erpnext.patches.v12_0.add_default_dashboards
erpnext.patches.v12_0.remove_bank_remittance_custom_fields erpnext.patches.v12_0.remove_bank_remittance_custom_fields
erpnext.patches.v12_0.generate_leave_ledger_entries #27-08-2020 erpnext.patches.v12_0.generate_leave_ledger_entries #04-11-2020
erpnext.patches.v12_0.move_credit_limit_to_customer_credit_limit erpnext.patches.v12_0.move_credit_limit_to_customer_credit_limit
erpnext.patches.v12_0.add_variant_of_in_item_attribute_table erpnext.patches.v12_0.add_variant_of_in_item_attribute_table
erpnext.patches.v12_0.rename_bank_account_field_in_journal_entry_account erpnext.patches.v12_0.rename_bank_account_field_in_journal_entry_account

2
erpnext/patches/v12_0/generate_leave_ledger_entries.py
View File

@@ -11,8 +11,6 @@ def execute():
frappe.reload_doc("HR", "doctype", "Leave Ledger Entry") frappe.reload_doc("HR", "doctype", "Leave Ledger Entry")
frappe.reload_doc("HR", "doctype", "Leave Encashment") frappe.reload_doc("HR", "doctype", "Leave Encashment")
frappe.reload_doc("HR", "doctype", "Leave Type") frappe.reload_doc("HR", "doctype", "Leave Type")
if frappe.db.a_row_exists("Leave Ledger Entry"):
return
if not frappe.get_meta("Leave Allocation").has_field("unused_leaves"): if not frappe.get_meta("Leave Allocation").has_field("unused_leaves"):
frappe.reload_doc("HR", "doctype", "Leave Allocation") frappe.reload_doc("HR", "doctype", "Leave Allocation")

7
erpnext/stock/utils.py
View File

@@ -284,7 +284,6 @@ def update_included_uom_in_report(columns, result, include_uom, conversion_facto
return return
convertible_cols = {} convertible_cols = {}
is_dict_obj = False is_dict_obj = False
if isinstance(result[0], dict): if isinstance(result[0], dict):
is_dict_obj = True is_dict_obj = True
@@ -306,13 +305,13 @@ def update_included_uom_in_report(columns, result, include_uom, conversion_facto
for row_idx, row in enumerate(result): for row_idx, row in enumerate(result):
data = row.items() if is_dict_obj else enumerate(row) data = row.items() if is_dict_obj else enumerate(row)
for key, value in data: for key, value in data:
if not key in convertible_columns or not conversion_factors[row_idx]: if key not in convertible_columns or not conversion_factors[row_idx-1]:
continue continue
if convertible_columns.get(key) == 'rate': if convertible_columns.get(key) == 'rate':
new_value = flt(value) * conversion_factors[row_idx] new_value = flt(value) * conversion_factors[row_idx-1]
else: else:
new_value = flt(value) / conversion_factors[row_idx] new_value = flt(value) / conversion_factors[row_idx-1]
if not is_dict_obj: if not is_dict_obj:
row.insert(key+1, new_value) row.insert(key+1, new_value)