Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] HSN calculation issue on gstr-2 summary

Browse Source
This commit is contained in:
Chinmayi Vyas 2018-04-27 13:20:00 +05:30
parent 97d6e4c58a
commit 4a9499557e
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/l10n_in_gst/report/gst_report.py
View File

@ -359,13 +359,18 @@ class GSTR1Report(models.AbstractModel):
result = [] result = []
list_product = [] list_product = []
acc_tax = self.env['account.tax'] acc_tax = self.env['account.tax']
hsn_invoice_line_ids = self.env['account.invoice.line'].search([ invoice_domain = [('invoice_id.date', '>=', data['from_date']),
('invoice_id.date', '>=', data['from_date']),
('invoice_id.date', '<=', data['to_date']), ('invoice_id.date', '<=', data['to_date']),
('invoice_id.state', 'not in', ['draft', 'cancel']), ('invoice_id.state', 'not in', ['draft', 'cancel']),
('invoice_id.company_id', '=', data['company_id']), ('invoice_id.company_id', '=', data['company_id'])]
('invoice_id.type', '=', 'out_invoice'), if data['summary_type'] == 'gstr1':
('invoice_id.gst_invoice', 'in', ('b2b', 'b2cl', 'b2cs'))]) invoice_domain += [('invoice_id.type', '=', 'out_invoice'),
('invoice_id.gst_invoice', 'in', ('b2b', 'b2cl', 'b2cs'))]
if data['summary_type'] == 'gstr2':
invoice_domain += [('invoice_id.type', '=', 'in_invoice'), (
'invoice_id.gst_invoice', 'in', ('b2b', 'b2bur'))]
hsn_invoice_line_ids = self.env['account.invoice.line'].search(
invoice_domain)
for line in hsn_invoice_line_ids: for line in hsn_invoice_line_ids:
igst_amount = cgst_amount = sgst_amount = cess_amount = 0.0 igst_amount = cgst_amount = sgst_amount = cess_amount = 0.0
if line.invoice_line_tax_ids: if line.invoice_line_tax_ids:
@ -582,8 +587,13 @@ class GSTR1Report(models.AbstractModel):
no_of_hsn += 1 no_of_hsn += 1
taxable_value_total += inv['taxable_value'] taxable_value_total += inv['taxable_value']
cess_amt_total += inv['cess_amount'] cess_amt_total += inv['cess_amount']
name = ''
if data['summary_type'] == 'gstr1':
name = _("HSN-Wise Summary of outward Supplies - 12")
elif data['summary_type'] == 'gstr2':
name = _("HSN-Wise Summary of inward Supplies - 13")
summary = { summary = {
"name": _("HSN-Wise Summary of outward Supplies - 12"), "name": name,
"no_of_invoices": "", "no_of_invoices": "",
"no_of_hsn": no_of_hsn, "no_of_hsn": no_of_hsn,
"taxable_value_total": taxable_value_total, "taxable_value_total": taxable_value_total,

2
addons/l10n_in_gst/static/src/xml/gst_report.xml
View File

@ -783,7 +783,7 @@
<h1>HSN-Wise Summary of outward Supplies - 12</h1> <h1>HSN-Wise Summary of outward Supplies - 12</h1>
</t> </t>
<t t-if="summary_type == 'gstr2'"> <t t-if="summary_type == 'gstr2'">
<h1>HSN-Wise Summary of outward Supplies - 13</h1> <h1>HSN-Wise Summary of inward Supplies - 13</h1>
</t> </t>
</div> </div>
</div> </div>