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

Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status

Browse Source
This commit is contained in:
David Arnold
2023-12-20 12:47:48 +01:00
parent e824cd012b ae353398d9
commit f73685f4f6
142 changed files with 2182 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
View File

@@ -240,7 +240,7 @@ def get_chart_data(data):
for row in data:
item_key = row.get("item_code")
if not item_key in item_wise_sales_map:
if item_key not in item_wise_sales_map:
item_wise_sales_map[item_key] = 0
item_wise_sales_map[item_key] = flt(item_wise_sales_map[item_key]) + flt(row.get("amount"))

2
erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
View File

@@ -167,7 +167,7 @@ def prepare_data(data, so_elapsed_time, filters):
if filters.get("group_by_so"):
so_name = row["sales_order"]
if not so_name in sales_order_map:
if so_name not in sales_order_map:
# create an entry
row_copy = copy.deepcopy(row)
sales_order_map[so_name] = row_copy