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

fix: Group nil exempted and non gst items separately

Browse Source
This commit is contained in:
Deepesh Garg 2021-03-17 18:00:08 +05:30
parent a5987782bd
commit f9519c7e13
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
View File

@ -349,14 +349,15 @@ class GSTR3BReport(Document):
return inter_state_supply_details return inter_state_supply_details
def get_inward_nil_exempt(self, state): def get_inward_nil_exempt(self, state):
print("@@@@@@@@@@@@")
inward_nil_exempt = frappe.db.sql(""" select p.place_of_supply, sum(i.base_amount) as base_amount, inward_nil_exempt = frappe.db.sql(""" select p.place_of_supply, sum(i.base_amount) as base_amount,
i.is_nil_exempt, i.is_non_gst from `tabPurchase Invoice` p , `tabPurchase Invoice Item` i i.is_nil_exempt, i.is_non_gst from `tabPurchase Invoice` p , `tabPurchase Invoice Item` i
where p.docstatus = 1 and p.name = i.parent where p.docstatus = 1 and p.name = i.parent
and (i.is_nil_exempt = 1 or i.is_non_gst = 1) and and (i.is_nil_exempt = 1 or i.is_non_gst = 1) and
month(p.posting_date) = %s and year(p.posting_date) = %s and p.company = %s and p.company_gstin = %s month(p.posting_date) = %s and year(p.posting_date) = %s and p.company = %s and p.company_gstin = %s
group by p.place_of_supply """, (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1) group by p.place_of_supply, i.is_nil_exempt, i.is_non_gst""", (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
print(inward_nil_exempt, "$#$#$#$")
inward_nil_exempt_details = { inward_nil_exempt_details = {
"gst": { "gst": {
"intra": 0.0, "intra": 0.0,