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

Merge branch 'develop' into gst-category

Browse Source
This commit is contained in:
Anuja Pawar 2021-10-25 10:50:03 +05:30 committed by GitHub
commit a1213006a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
View File

@ -44,16 +44,16 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map):
if rate and tds_deducted: if rate and tds_deducted:
row = { row = {
'pan' if frappe.db.has_column('Supplier', 'pan') else 'tax_id': supplier_map.get(supplier).pan, 'pan' if frappe.db.has_column('Supplier', 'pan') else 'tax_id': supplier_map.get(supplier, {}).get('pan'),
'supplier': supplier_map.get(supplier).name 'supplier': supplier_map.get(supplier, {}).get('name')
} }
if filters.naming_series == 'Naming Series': if filters.naming_series == 'Naming Series':
row.update({'supplier_name': supplier_map.get(supplier).supplier_name}) row.update({'supplier_name': supplier_map.get(supplier, {}).get('supplier_name')})
row.update({ row.update({
'section_code': tax_withholding_category, 'section_code': tax_withholding_category,
'entity_type': supplier_map.get(supplier).supplier_type, 'entity_type': supplier_map.get(supplier, {}).get('supplier_type'),
'tds_rate': rate, 'tds_rate': rate,
'total_amount_credited': total_amount_credited, 'total_amount_credited': total_amount_credited,
'tds_deducted': tds_deducted, 'tds_deducted': tds_deducted,

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

@ -202,7 +202,9 @@ def get_item_warehouse_map(filters, sle):
value_diff = flt(d.stock_value_difference) value_diff = flt(d.stock_value_difference)
if d.posting_date < from_date: if d.posting_date < from_date or (d.posting_date == from_date
and d.voucher_type == "Stock Reconciliation" and
frappe.db.get_value("Stock Reconciliation", d.voucher_no, "purpose") == "Opening Stock"):
qty_dict.opening_qty += qty_diff qty_dict.opening_qty += qty_diff
qty_dict.opening_val += value_diff qty_dict.opening_val += value_diff

13
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -21,7 +21,7 @@ def execute(filters=None):
items = get_items(filters) items = get_items(filters)
sl_entries = get_stock_ledger_entries(filters, items) sl_entries = get_stock_ledger_entries(filters, items)
item_details = get_item_details(items, sl_entries, include_uom) item_details = get_item_details(items, sl_entries, include_uom)
opening_row = get_opening_balance(filters, columns) opening_row = get_opening_balance(filters, columns, sl_entries)
precision = cint(frappe.db.get_single_value("System Settings", "float_precision")) precision = cint(frappe.db.get_single_value("System Settings", "float_precision"))
data = [] data = []
@ -218,7 +218,7 @@ def get_sle_conditions(filters):
return "and {}".format(" and ".join(conditions)) if conditions else "" return "and {}".format(" and ".join(conditions)) if conditions else ""
def get_opening_balance(filters, columns): def get_opening_balance(filters, columns, sl_entries):
if not (filters.item_code and filters.warehouse and filters.from_date): if not (filters.item_code and filters.warehouse and filters.from_date):
return return
@ -230,6 +230,15 @@ def get_opening_balance(filters, columns):
"posting_time": "00:00:00" "posting_time": "00:00:00"
}) })
# check if any SLEs are actually Opening Stock Reconciliation
for sle in sl_entries:
if (sle.get("voucher_type") == "Stock Reconciliation"
and sle.get("date").split()[0] == filters.from_date
and frappe.db.get_value("Stock Reconciliation", sle.voucher_no, "purpose") == "Opening Stock"
):
last_entry = sle
sl_entries.remove(sle)
row = { row = {
"item_code": _("'Opening'"), "item_code": _("'Opening'"),
"qty_after_transaction": last_entry.get("qty_after_transaction", 0), "qty_after_transaction": last_entry.get("qty_after_transaction", 0),