Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Sider and Server side test

Browse Source 
- args passed to wrong function
- missing space around '='
This commit is contained in:
marination 2021-12-21 12:32:55 +05:30
parent 8951a5c267
commit 24a35c69c0
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ class FIFOSlots:
consumed/updated and maintained via FIFO. ** consumed/updated and maintained via FIFO. **
} }
""" """
if self.sle == None: if self.sle is None:
self.sle = self.__get_stock_ledger_entries() self.sle = self.__get_stock_ledger_entries()
for d in self.sle: for d in self.sle:
@ -358,7 +358,8 @@ class FIFOSlots:
posting_date <= %(to_date)s and posting_date <= %(to_date)s and
is_cancelled != 1 is_cancelled != 1
{sle_conditions} {sle_conditions}
order by posting_date, posting_time, sle.creation, actual_qty""" #nosec order by posting_date, posting_time, sle.creation, actual_qty
""" #nosec
.format( .format(
item_conditions=self.__get_item_conditions(), item_conditions=self.__get_item_conditions(),
sle_conditions=self.__get_sle_conditions() sle_conditions=self.__get_sle_conditions()

2
erpnext/stock/report/stock_balance/stock_balance.py
View File

@ -33,7 +33,7 @@ def execute(filters=None):
if filters.get('show_stock_ageing_data'): if filters.get('show_stock_ageing_data'):
filters['show_warehouse_wise_stock'] = True filters['show_warehouse_wise_stock'] = True
item_wise_fifo_queue = FIFOSlots().generate(filters, sle) item_wise_fifo_queue = FIFOSlots(filters, sle).generate()
# if no stock ledger entry found return # if no stock ledger entry found return
if not sle: if not sle:

2
erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
View File

@ -33,7 +33,7 @@ def execute(filters=None):
item_map = get_item_details(items, sle, filters) item_map = get_item_details(items, sle, filters)
iwb_map = get_item_warehouse_map(filters, sle) iwb_map = get_item_warehouse_map(filters, sle)
warehouse_list = get_warehouse_list(filters) warehouse_list = get_warehouse_list(filters)
item_ageing = FIFOSlots().generate(filters) item_ageing = FIFOSlots(filters).generate()
data = [] data = []
item_balance = {} item_balance = {}
item_value = {} item_value = {}