schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31665 from maharshivpatel/fix-add-overseas-hsn-report

Browse Source 
fix: (india) add entries from overseas invoices in HSN wise report
This commit is contained in:
Deepesh Garg
2022-07-22 13:06:30 +05:30
committed by GitHub
parent 529a47bc88 1d69ce1932
commit dc67d39ce6
1 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
View File

@@ -33,7 +33,7 @@ def _execute(filters=None):
added_item = [] added_item = []
for d in item_list: for d in item_list:
if (d.parent, d.item_code) not in added_item: if (d.parent, d.item_code) not in added_item:
row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty, d.tax_rate] row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty, d.tax_rate or 0]
total_tax = 0 total_tax = 0
for tax in tax_columns: for tax in tax_columns:
item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {}) item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {})
@@ -100,31 +100,51 @@ def get_items(filters):
items = frappe.db.sql( items = frappe.db.sql(
""" """
select SELECT
`tabSales Invoice Item`.gst_hsn_code, `tabSales Invoice Item`.gst_hsn_code,
`tabSales Invoice Item`.stock_uom, `tabSales Invoice Item`.stock_uom,
sum(`tabSales Invoice Item`.stock_qty) as stock_qty, sum(
sum(`tabSales Invoice Item`.base_net_amount) as base_net_amount, `tabSales Invoice Item`.stock_qty
sum(`tabSales Invoice Item`.base_price_list_rate) as base_price_list_rate, ) as stock_qty,
sum(
`tabSales Invoice Item`.base_net_amount
) as base_net_amount,
sum(
`tabSales Invoice Item`.base_price_list_rate
) as base_price_list_rate,
`tabSales Invoice Item`.parent, `tabSales Invoice Item`.parent,
`tabSales Invoice Item`.item_code, `tabSales Invoice Item`.item_code,
`tabGST HSN Code`.description, `tabGST HSN Code`.description,
json_extract(`tabSales Taxes and Charges`.item_wise_tax_detail, json_extract(
concat('$."' , `tabSales Invoice Item`.item_code, '"[0]')) * count(distinct `tabSales Taxes and Charges`.name) as tax_rate `tabSales Taxes and Charges`.item_wise_tax_detail,
from concat(
`tabSales Invoice`, '$."', `tabSales Invoice Item`.item_code,
`tabSales Invoice Item`, '"[0]'
`tabGST HSN Code`, )
`tabSales Taxes and Charges` ) * count(
where distinct `tabSales Taxes and Charges`.name
`tabSales Invoice`.name = `tabSales Invoice Item`.parent ) as tax_rate
and `tabSales Taxes and Charges`.parent = `tabSales Invoice`.name FROM
and `tabSales Invoice`.docstatus = 1 `tabSales Invoice`
and `tabSales Invoice Item`.gst_hsn_code is not NULL INNER JOIN
and `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name %s %s `tabSales Invoice Item` ON `tabSales Invoice`.name = `tabSales Invoice Item`.parent
group by INNER JOIN
`tabGST HSN Code` ON `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name % s % s
LEFT JOIN
`tabSales Taxes and Charges` ON `tabSales Taxes and Charges`.parent = `tabSales Invoice`.name
WHERE
`tabSales Invoice`.docstatus = 1
AND
`tabSales Invoice Item`.gst_hsn_code is not NULL
GROUP BY
`tabSales Invoice Item`.parent, `tabSales Invoice Item`.parent,
`tabSales Invoice Item`.item_code `tabSales Invoice Item`.item_code,
`tabSales Invoice Item`.gst_hsn_code,
`tabSales Invoice Item`.uom
ORDER BY
`tabSales Invoice Item`.gst_hsn_code,
`tabSales Invoice Item`.uom
""" """
% (conditions, match_conditions), % (conditions, match_conditions),
filters, filters,