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

fix: Merge Conflicts

Browse Source
This commit is contained in:
marination
2021-12-28 12:43:14 +05:30
parent 24727dbadb
commit bae184fc2f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/report/stock_ageing/stock_ageing.py
View File

@@ -8,7 +8,6 @@ from typing import Dict, List, Tuple, Union
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import cint, date_diff, flt from frappe.utils import cint, date_diff, flt
from six import iteritems
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -29,12 +28,8 @@ def format_report_data(filters: Filters, item_details: Dict, to_date: str) -> Li
"Returns ordered, formatted data with ranges." "Returns ordered, formatted data with ranges."
_func = itemgetter(1) _func = itemgetter(1)
data = [] data = []
<<<<<<< HEAD
for item, item_dict in iteritems(item_details):
=======
for item, item_dict in item_details.items(): for item, item_dict in item_details.items():
>>>>>>> 0f43792dbb (fix: Stock Ageing Report - Negative Opening Stock)
earliest_age, latest_age = 0, 0 earliest_age, latest_age = 0, 0
details = item_dict["details"] details = item_dict["details"]