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

Merge branch 'develop' into sync_site_develop

Browse Source
This commit is contained in:
sahil28297 2019-05-09 14:48:39 +05:30 committed by GitHub
commit ce82e4fd54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,18 +227,18 @@ class GSTR3BReport(Document):
for d in inter_state_supply.get("Unregistered", []): for d in inter_state_supply.get("Unregistered", []):
self.report_dict["inter_sup"]["unreg_details"].append(d) self.report_dict["inter_sup"]["unreg_details"].append(d)
self.report_dict["sup_details"]["osup_det"]["txval"] += d["txval"] self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d["txval"], 2)
self.report_dict["sup_details"]["osup_det"]["iamt"] += d["iamt"] self.report_dict["sup_details"]["osup_det"]["iamt"] += flt(d["iamt"], 2)
for d in inter_state_supply.get("Registered Composition", []): for d in inter_state_supply.get("Registered Composition", []):
self.report_dict["inter_sup"]["comp_details"].append(d) self.report_dict["inter_sup"]["comp_details"].append(d)
self.report_dict["sup_details"]["osup_det"]["txval"] += d["txval"] self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d["txval"], 2)
self.report_dict["sup_details"]["osup_det"]["iamt"] += d["iamt"] self.report_dict["sup_details"]["osup_det"]["iamt"] += flt(d["iamt"], 2)
for d in inter_state_supply.get("UIN Holders", []): for d in inter_state_supply.get("UIN Holders", []):
self.report_dict["inter_sup"]["uin_details"].append(d) self.report_dict["inter_sup"]["uin_details"].append(d)
self.report_dict["sup_details"]["osup_det"]["txval"] += d["txval"] self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d["txval"], 2)
self.report_dict["sup_details"]["osup_det"]["iamt"] += d["iamt"] self.report_dict["sup_details"]["osup_det"]["iamt"] += flt(d["iamt"], 2)
def get_total_taxable_value(self, doctype, reverse_charge): def get_total_taxable_value(self, doctype, reverse_charge):

12
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -29,10 +29,10 @@ class Gstr1Report(object):
place_of_supply, place_of_supply,
ecommerce_gstin, ecommerce_gstin,
reverse_charge, reverse_charge,
gst_category, invoice_type,
return_against, return_against,
is_return, is_return,
gst_category, invoice_type,
export_type, export_type,
port_code, port_code,
shipping_bill_number, shipping_bill_number,
@ -324,8 +324,8 @@ class Gstr1Report(object):
"fieldtype": "Data" "fieldtype": "Data"
}, },
{ {
"fieldname": "gst_category", "fieldname": "invoice_type",
"label": "GST Category", "label": "Invoice Type",
"fieldtype": "Data" "fieldtype": "Data"
}, },
{ {
@ -577,7 +577,7 @@ def get_json():
download_json_file(report_name, filters["type_of_business"], gst_json) download_json_file(report_name, filters["type_of_business"], gst_json)
def get_b2b_json(res, gstin): def get_b2b_json(res, gstin):
inv_type, out = {"Registered Regular": "R", "Deemed Export": "DE", "URD": "URD", "SEZ": "SEZ"}, [] inv_type, out = {"Regular": "R", "Deemed Export": "DE", "URD": "URD", "SEZ": "SEZ"}, []
for gst_in in res: for gst_in in res:
b2b_item, inv = {"ctin": gst_in, "inv": []}, [] b2b_item, inv = {"ctin": gst_in, "inv": []}, []
if not gst_in: continue if not gst_in: continue
@ -586,7 +586,7 @@ def get_b2b_json(res, gstin):
inv_item = get_basic_invoice_detail(invoice[0]) inv_item = get_basic_invoice_detail(invoice[0])
inv_item["pos"] = "%02d" % int(invoice[0]["place_of_supply"].split('-')[0]) inv_item["pos"] = "%02d" % int(invoice[0]["place_of_supply"].split('-')[0])
inv_item["rchrg"] = invoice[0]["reverse_charge"] inv_item["rchrg"] = invoice[0]["reverse_charge"]
inv_item["inv_typ"] = inv_type.get(invoice[0].get("gst_category", ""),"") inv_item["inv_typ"] = inv_type.get(invoice[0].get("invoice_type", ""),"")
if inv_item["pos"]=="00": continue if inv_item["pos"]=="00": continue
inv_item["itms"] = [] inv_item["itms"] = []