-
Notifications
You must be signed in to change notification settings - Fork 143
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: validate for cess non-advol #2009
Merged
vorasmit
merged 4 commits into
resilient-tech:develop
from
Sanket322:validate_cess-non-advol
Apr 11, 2024
Merged
fix: validate for cess non-advol #2009
vorasmit
merged 4 commits into
resilient-tech:develop
from
Sanket322:validate_cess-non-advol
Apr 11, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vorasmit
reviewed
Apr 11, 2024
india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py
Outdated
Show resolved
Hide resolved
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #2009 +/- ##
===========================================
- Coverage 64.40% 62.23% -2.18%
===========================================
Files 102 104 +2
Lines 8366 8714 +348
===========================================
+ Hits 5388 5423 +35
- Misses 2978 3291 +313 ☔ View full report in Codecov by Sentry. |
mergify bot
pushed a commit
that referenced
this pull request
Apr 11, 2024
* fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> (cherry picked from commit e0b7be6)
mergify bot
pushed a commit
that referenced
this pull request
Apr 11, 2024
* fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> (cherry picked from commit e0b7be6)
This was referenced Apr 11, 2024
vorasmit
added a commit
that referenced
this pull request
Apr 11, 2024
…tfix/pr-2009 fix: validate for cess non-advol (backport #2009)
vorasmit
added a commit
that referenced
this pull request
Apr 11, 2024
…tfix/pr-2009 fix: validate for cess non-advol (backport #2009)
india-compliance-bot
added a commit
that referenced
this pull request
Apr 11, 2024
## [15.7.2](v15.7.1...v15.7.2) (2024-04-11) ### Bug Fixes * add overlaping invoice count summary to overview ([42bb359](42bb359)) * B2C(Others) and B2C(Large) category and subcategory assignment ([#1957](#1957)) ([469f3c9](469f3c9)) * group overview in GST sales register beta by category ([#2002](#2002)) ([d00fc4a](d00fc4a)) * group tax values and amounts for invoice print formats ([fd18236](fd18236)) * Handle If `response_json` Is `None` ([#1968](#1968)) ([43cae15](43cae15)) * **minor:** allow 673 like pin code for puducherry ([741b7a9](741b7a9)) * **minor:** better way to override totals in gst sales beta report ([#2022](#2022)) ([cdf08a0](cdf08a0)) * **minor:** correct function call for js ([a8ec056](a8ec056)) * missing gst amounts in hsn json ([d558ff6](d558ff6)) * overlap count for nil-rated , non-gst and exempted invoices ([120ebb0](120ebb0)) * ReferenceError: taxes_table is not defined in Journal Entry ([f3ef20a](f3ef20a)) * rounding of other charges for e-Invoice ([#1980](#1980)) ([78838a7](78838a7)) * uom as per gst ([#2019](#2019)) ([8cdf609](8cdf609)) * **ux:** better error message ([1262798](1262798)) * validate for cess non-advol ([#2009](#2009)) ([d3d6997](d3d6997))
vorasmit
added a commit
that referenced
this pull request
Apr 12, 2024
* feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (#2022) * fix: uom as per gst (#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]>
india-compliance-bot
added a commit
that referenced
this pull request
Apr 29, 2024
## [14.26.4](v14.26.3...v14.26.4) (2024-04-29) ### Bug Fixes * **auto-rcm:** tds getting overwritten where rcm template was reset ([#2056](#2056)) ([0c77750](0c77750)) * avoid_duplicate in address ([#2041](#2041)) ([5b0cc69](5b0cc69)) * avoiding addition of TDS rates for past financial year ([#2077](#2077)) ([e30ba31](e30ba31)), closes [#2068](#2068) * cancel sales invoice if e-Invoice is cancelled ([#2045](#2045)) ([2ba6807](2ba6807)) * correct condition for GST Invoice in case of supply to SEZ ([937ed11](937ed11)) * correct outward supply details using gst treatment ([#2067](#2067)) ([f4df0be](f4df0be)) * do not throw on "ignore_gst_validations" ([bb59e09](bb59e09)) * Document Type as `CHL` in case of return Invoice with Nil-rated ([#2028](#2028)) ([a331778](a331778)) * **excel:** remove default bg colors from excel export ([54f959b](54f959b)) * handle on cancel for reco tool ([#2046](#2046)) ([b9b9257](b9b9257)) * **minor:** better way to override totals in gst sales beta report ([#2022](#2022)) ([7751af2](7751af2)) * on trash update status dynamically ([9bb6b5d](9bb6b5d)) * remove check digit validation for transporter id ([193c1a8](193c1a8)) * remove extra inward supplies and unlink invoice ([9b363f0](9b363f0)) * support tax collector as customer ([#2066](#2066)) ([c6c33ab](c6c33ab)) * uom as per gst ([#2019](#2019)) ([2caf9e6](2caf9e6)) * validate for cess non-advol ([#2009](#2009)) ([41acfdd](41acfdd)) ### Performance Improvements * dont create address copy ([e74d04a](e74d04a))
vorasmit
added a commit
that referenced
this pull request
Jun 8, 2024
* feat: gstr-1 filed log * fix: gstr-1 apis * fix: GSTR-1 Mapping * feat: GSTR-1 UI (#1910) * feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (#2022) * fix: uom as per gst (#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> * feat: gstr-1 filed log (#2034) * refactor: bring all puzzles together * style: tree-view spacing * fix(ui): expand datatable upto borders * style: improvment of datatable * fix(ui): setup listeners * fix: gst settings for gstr-1 * fix: don't sub-categorise nil exempt and non-gst * fix: nil expempt data for js and trial data * fix: variable display of data based on status of return and gst settings * fix: OTP workflow for gstr-1 beta to authenticate APIs * chore: updated comments * fix: return status API integration * fix: gstr-1 mapping refactor * fix: download APIs setup * fix: mapping of data for AT and TXP * fix: tuple key changed to f-string * fix: tuple keys converted to string in gstr-1 json mapping * fix: working data pieces * fix: month and quarter depending on gst settings * fix: transaction type for all invoices * fix: summarize filed data * fix: no of records in summarize filed data * fix: gstr-1 json map refactor and guess customer name * chore: update comments, minor refactor in js * fix: reconcile books and gov data * fix: mapped-data data format refactor * fix: reconcile books vs returns * chore: cleanup unused page * fix: summarize data * fix: add supecom category * fix: totals for gstr-1 summary * fix: month or quarter options as per selected year * fix: better reconciliation and summarization * fix: minor changes to date selection * fix: refactor columns and consistent categories * fix: supecom mapping and format date * fix: working report with actual data * wip: gst ledger difference * fix: compute index in HSN and DOC_ISSUE Summary while converting to gov json * fix: fix e-Invoice tab * fix: difference in output gst ledger , collapse and expand button , computed on * fix: minor changes while testing (#19) * fix: e-Invoice data => unfiled data * fix(ux): correct totals for books summary with missing records * fix: subtitle for tabs * fix: detail view for reconcile data * refactorr: gstr_1 reconcile html template * fix: output gst ledger called multiple times * fix: changes to ledger data, etc * fix: summarize return-summary data * fix: summarize returns data with amendments * wip: endpoint for json export with options * fix: round books value, default blank table message * fix: changes as per review * fix: check gstr-1 filed upto and review js * fix: highlight difference if there * fix: validate and update latest data * refactor: class name, circular import * chore: update todos * fix: compute item index while converting to gov json format * fix: creation time for the report * fix: recompute books data * fix: download excel for books data * fix: download gstr-1 json * fix: gstr-1 upload errors resolved * fix: ignore str in json generation * fix: load data after all existing requests are complete * fix: update todos, show report from filed log * fix: action mark as filed * fix: generate summary for apis disabled * fix: download reconcile excel and refactor download books excel * fix: download json causing errror * fix: excel headers as per review * fix: colour for header and data * fix: download filed excel --------- Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> * fix: file naming and sheet naming * fix: Sheet naming as per mapping * fix: changes required to make it work * fix: excel column widths * fix: width for specific column in books and recncile excel download * fix: export gstr-1 excel * fix: as per review * fix: default formatting changes in excel format * fix: excel-export refactor * fix: don't send ecommerce gstin info to gov in regular sections * fix: b2b invoice types and enum * fix: refactor aggregate_invoices in NilRated GSTR-1 Mapping * fix: delete flag instead of zero values to handle missing in books * fix: check for production api's enabled for gstr-1 * refactor: file and code blocks restructuring * refactor: indentation to spaces * fix: remove unrequired data * fix: fixed failing test cases and re-arranged fields in Gov excel export as per Gov format * fix: set flag for otp_requested * fix: default permissions and update mark as filed * fix: save gstr1 filed upto in gstin doc * fix: minor codacy issues * fix: semgrep rules * fix: more fixes for codacy * refactor: gstr-1 generation and summarization * fix: correct empty state text * fix: default frequency to monthly * fix: readonly fields for filed log * chore: correct function name * refactor: enum names * refactor: data export and comminify utilities * refactor: common columns for reconcile * chore: linters * fix: ecommerce data summary conversion * fix: fallback for legacy summary data. * fix: process additional returns information after commit * fix: show gstr_1 beta alert on existing report * refactor: gstr-1 beta js * fix: codacy issues * chore: comments and todos * fix: gstr-1 json map doc-string added * fix: consistent data conversion, brief comments * fix: buttons based on API status * fix: modified docstring in gstr_1_json_map and fixed test cases * fix: non-mandatory fields in backend (single doctype), year options set dynamically * chore: formatting changes * chore: mark fields as mandatory * fix: return filed upto from db * fix: test cases and update ignored categories for overview * fix: re-compute if files are missing * fix: support delete permissions for beta * fix: changes as per review * fix: correct data computation for nil exempt * fix: show aggregated data for filing * refactor: renamed to GSTR-1 log * fix: minor enhancements to ui * fix: load normalized data in download_gstr1_json and fixed test cases * fix: support dynamic filters for detailed view * fix: disabled detail view * fix: ignore tax rate when getting difference * fix: changes as per review * fix: save aggregated data in books data * fix: delete unfiled files after return is filed * fix: update books json after aggregate data * fix: back button setup for detailed view * fix: aggregation, Inter vs Intra based on company gstin * fix: export positive values for select sections * chore: remove print statement * fix: b2cs data processing for books excel consistently * test: rename variable in test case * fix: json export, upload, sync test * fix: show only required columns in details view * fix: update dashboard for other report --------- Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: Divyam Mistry <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]>
mergify bot
pushed a commit
that referenced
this pull request
Jun 8, 2024
* feat: gstr-1 filed log * fix: gstr-1 apis * fix: GSTR-1 Mapping * feat: GSTR-1 UI (#1910) * feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (#2022) * fix: uom as per gst (#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> * feat: gstr-1 filed log (#2034) * refactor: bring all puzzles together * style: tree-view spacing * fix(ui): expand datatable upto borders * style: improvment of datatable * fix(ui): setup listeners * fix: gst settings for gstr-1 * fix: don't sub-categorise nil exempt and non-gst * fix: nil expempt data for js and trial data * fix: variable display of data based on status of return and gst settings * fix: OTP workflow for gstr-1 beta to authenticate APIs * chore: updated comments * fix: return status API integration * fix: gstr-1 mapping refactor * fix: download APIs setup * fix: mapping of data for AT and TXP * fix: tuple key changed to f-string * fix: tuple keys converted to string in gstr-1 json mapping * fix: working data pieces * fix: month and quarter depending on gst settings * fix: transaction type for all invoices * fix: summarize filed data * fix: no of records in summarize filed data * fix: gstr-1 json map refactor and guess customer name * chore: update comments, minor refactor in js * fix: reconcile books and gov data * fix: mapped-data data format refactor * fix: reconcile books vs returns * chore: cleanup unused page * fix: summarize data * fix: add supecom category * fix: totals for gstr-1 summary * fix: month or quarter options as per selected year * fix: better reconciliation and summarization * fix: minor changes to date selection * fix: refactor columns and consistent categories * fix: supecom mapping and format date * fix: working report with actual data * wip: gst ledger difference * fix: compute index in HSN and DOC_ISSUE Summary while converting to gov json * fix: fix e-Invoice tab * fix: difference in output gst ledger , collapse and expand button , computed on * fix: minor changes while testing (#19) * fix: e-Invoice data => unfiled data * fix(ux): correct totals for books summary with missing records * fix: subtitle for tabs * fix: detail view for reconcile data * refactorr: gstr_1 reconcile html template * fix: output gst ledger called multiple times * fix: changes to ledger data, etc * fix: summarize return-summary data * fix: summarize returns data with amendments * wip: endpoint for json export with options * fix: round books value, default blank table message * fix: changes as per review * fix: check gstr-1 filed upto and review js * fix: highlight difference if there * fix: validate and update latest data * refactor: class name, circular import * chore: update todos * fix: compute item index while converting to gov json format * fix: creation time for the report * fix: recompute books data * fix: download excel for books data * fix: download gstr-1 json * fix: gstr-1 upload errors resolved * fix: ignore str in json generation * fix: load data after all existing requests are complete * fix: update todos, show report from filed log * fix: action mark as filed * fix: generate summary for apis disabled * fix: download reconcile excel and refactor download books excel * fix: download json causing errror * fix: excel headers as per review * fix: colour for header and data * fix: download filed excel --------- Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> * fix: file naming and sheet naming * fix: Sheet naming as per mapping * fix: changes required to make it work * fix: excel column widths * fix: width for specific column in books and recncile excel download * fix: export gstr-1 excel * fix: as per review * fix: default formatting changes in excel format * fix: excel-export refactor * fix: don't send ecommerce gstin info to gov in regular sections * fix: b2b invoice types and enum * fix: refactor aggregate_invoices in NilRated GSTR-1 Mapping * fix: delete flag instead of zero values to handle missing in books * fix: check for production api's enabled for gstr-1 * refactor: file and code blocks restructuring * refactor: indentation to spaces * fix: remove unrequired data * fix: fixed failing test cases and re-arranged fields in Gov excel export as per Gov format * fix: set flag for otp_requested * fix: default permissions and update mark as filed * fix: save gstr1 filed upto in gstin doc * fix: minor codacy issues * fix: semgrep rules * fix: more fixes for codacy * refactor: gstr-1 generation and summarization * fix: correct empty state text * fix: default frequency to monthly * fix: readonly fields for filed log * chore: correct function name * refactor: enum names * refactor: data export and comminify utilities * refactor: common columns for reconcile * chore: linters * fix: ecommerce data summary conversion * fix: fallback for legacy summary data. * fix: process additional returns information after commit * fix: show gstr_1 beta alert on existing report * refactor: gstr-1 beta js * fix: codacy issues * chore: comments and todos * fix: gstr-1 json map doc-string added * fix: consistent data conversion, brief comments * fix: buttons based on API status * fix: modified docstring in gstr_1_json_map and fixed test cases * fix: non-mandatory fields in backend (single doctype), year options set dynamically * chore: formatting changes * chore: mark fields as mandatory * fix: return filed upto from db * fix: test cases and update ignored categories for overview * fix: re-compute if files are missing * fix: support delete permissions for beta * fix: changes as per review * fix: correct data computation for nil exempt * fix: show aggregated data for filing * refactor: renamed to GSTR-1 log * fix: minor enhancements to ui * fix: load normalized data in download_gstr1_json and fixed test cases * fix: support dynamic filters for detailed view * fix: disabled detail view * fix: ignore tax rate when getting difference * fix: changes as per review * fix: save aggregated data in books data * fix: delete unfiled files after return is filed * fix: update books json after aggregate data * fix: back button setup for detailed view * fix: aggregation, Inter vs Intra based on company gstin * fix: export positive values for select sections * chore: remove print statement * fix: b2cs data processing for books excel consistently * test: rename variable in test case * fix: json export, upload, sync test * fix: show only required columns in details view * fix: update dashboard for other report --------- Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: Divyam Mistry <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> (cherry picked from commit e2f1f3e) # Conflicts: # india_compliance/gst_india/doctype/gst_settings/gst_settings.json # india_compliance/gst_india/doctype/gstin/gstin.json # india_compliance/gst_india/overrides/transaction.py # india_compliance/gst_india/utils/gstr/__init__.py # india_compliance/gst_india/utils/gstr/gstr_1_download.py # india_compliance/gst_india/utils/gstr/gstr_1_json_map.py # india_compliance/gst_india/utils/gstr/test_gstr_1_json_map.py # india_compliance/gst_india/utils/gstr_utils.py
mergify bot
pushed a commit
that referenced
this pull request
Jun 8, 2024
* feat: gstr-1 filed log * fix: gstr-1 apis * fix: GSTR-1 Mapping * feat: GSTR-1 UI (#1910) * feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (#2022) * fix: uom as per gst (#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> * feat: gstr-1 filed log (#2034) * refactor: bring all puzzles together * style: tree-view spacing * fix(ui): expand datatable upto borders * style: improvment of datatable * fix(ui): setup listeners * fix: gst settings for gstr-1 * fix: don't sub-categorise nil exempt and non-gst * fix: nil expempt data for js and trial data * fix: variable display of data based on status of return and gst settings * fix: OTP workflow for gstr-1 beta to authenticate APIs * chore: updated comments * fix: return status API integration * fix: gstr-1 mapping refactor * fix: download APIs setup * fix: mapping of data for AT and TXP * fix: tuple key changed to f-string * fix: tuple keys converted to string in gstr-1 json mapping * fix: working data pieces * fix: month and quarter depending on gst settings * fix: transaction type for all invoices * fix: summarize filed data * fix: no of records in summarize filed data * fix: gstr-1 json map refactor and guess customer name * chore: update comments, minor refactor in js * fix: reconcile books and gov data * fix: mapped-data data format refactor * fix: reconcile books vs returns * chore: cleanup unused page * fix: summarize data * fix: add supecom category * fix: totals for gstr-1 summary * fix: month or quarter options as per selected year * fix: better reconciliation and summarization * fix: minor changes to date selection * fix: refactor columns and consistent categories * fix: supecom mapping and format date * fix: working report with actual data * wip: gst ledger difference * fix: compute index in HSN and DOC_ISSUE Summary while converting to gov json * fix: fix e-Invoice tab * fix: difference in output gst ledger , collapse and expand button , computed on * fix: minor changes while testing (#19) * fix: e-Invoice data => unfiled data * fix(ux): correct totals for books summary with missing records * fix: subtitle for tabs * fix: detail view for reconcile data * refactorr: gstr_1 reconcile html template * fix: output gst ledger called multiple times * fix: changes to ledger data, etc * fix: summarize return-summary data * fix: summarize returns data with amendments * wip: endpoint for json export with options * fix: round books value, default blank table message * fix: changes as per review * fix: check gstr-1 filed upto and review js * fix: highlight difference if there * fix: validate and update latest data * refactor: class name, circular import * chore: update todos * fix: compute item index while converting to gov json format * fix: creation time for the report * fix: recompute books data * fix: download excel for books data * fix: download gstr-1 json * fix: gstr-1 upload errors resolved * fix: ignore str in json generation * fix: load data after all existing requests are complete * fix: update todos, show report from filed log * fix: action mark as filed * fix: generate summary for apis disabled * fix: download reconcile excel and refactor download books excel * fix: download json causing errror * fix: excel headers as per review * fix: colour for header and data * fix: download filed excel --------- Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> * fix: file naming and sheet naming * fix: Sheet naming as per mapping * fix: changes required to make it work * fix: excel column widths * fix: width for specific column in books and recncile excel download * fix: export gstr-1 excel * fix: as per review * fix: default formatting changes in excel format * fix: excel-export refactor * fix: don't send ecommerce gstin info to gov in regular sections * fix: b2b invoice types and enum * fix: refactor aggregate_invoices in NilRated GSTR-1 Mapping * fix: delete flag instead of zero values to handle missing in books * fix: check for production api's enabled for gstr-1 * refactor: file and code blocks restructuring * refactor: indentation to spaces * fix: remove unrequired data * fix: fixed failing test cases and re-arranged fields in Gov excel export as per Gov format * fix: set flag for otp_requested * fix: default permissions and update mark as filed * fix: save gstr1 filed upto in gstin doc * fix: minor codacy issues * fix: semgrep rules * fix: more fixes for codacy * refactor: gstr-1 generation and summarization * fix: correct empty state text * fix: default frequency to monthly * fix: readonly fields for filed log * chore: correct function name * refactor: enum names * refactor: data export and comminify utilities * refactor: common columns for reconcile * chore: linters * fix: ecommerce data summary conversion * fix: fallback for legacy summary data. * fix: process additional returns information after commit * fix: show gstr_1 beta alert on existing report * refactor: gstr-1 beta js * fix: codacy issues * chore: comments and todos * fix: gstr-1 json map doc-string added * fix: consistent data conversion, brief comments * fix: buttons based on API status * fix: modified docstring in gstr_1_json_map and fixed test cases * fix: non-mandatory fields in backend (single doctype), year options set dynamically * chore: formatting changes * chore: mark fields as mandatory * fix: return filed upto from db * fix: test cases and update ignored categories for overview * fix: re-compute if files are missing * fix: support delete permissions for beta * fix: changes as per review * fix: correct data computation for nil exempt * fix: show aggregated data for filing * refactor: renamed to GSTR-1 log * fix: minor enhancements to ui * fix: load normalized data in download_gstr1_json and fixed test cases * fix: support dynamic filters for detailed view * fix: disabled detail view * fix: ignore tax rate when getting difference * fix: changes as per review * fix: save aggregated data in books data * fix: delete unfiled files after return is filed * fix: update books json after aggregate data * fix: back button setup for detailed view * fix: aggregation, Inter vs Intra based on company gstin * fix: export positive values for select sections * chore: remove print statement * fix: b2cs data processing for books excel consistently * test: rename variable in test case * fix: json export, upload, sync test * fix: show only required columns in details view * fix: update dashboard for other report --------- Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: Divyam Mistry <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> (cherry picked from commit e2f1f3e) # Conflicts: # india_compliance/gst_india/doctype/gst_settings/gst_settings.json # india_compliance/gst_india/doctype/gstin/gstin.json # india_compliance/gst_india/utils/gstr/__init__.py # india_compliance/gst_india/utils/gstr/gstr_1_download.py # india_compliance/gst_india/utils/gstr/gstr_1_json_map.py # india_compliance/gst_india/utils/gstr/test_gstr_1_json_map.py # india_compliance/gst_india/utils/gstr_utils.py
vorasmit
added a commit
to vorasmit/ic
that referenced
this pull request
Jun 8, 2024
* feat: gstr-1 filed log * fix: gstr-1 apis * fix: GSTR-1 Mapping * feat: GSTR-1 UI (resilient-tech#1910) * feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (resilient-tech#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (resilient-tech#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (resilient-tech#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (resilient-tech#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (resilient-tech#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (resilient-tech#2022) * fix: uom as per gst (resilient-tech#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> * feat: gstr-1 filed log (resilient-tech#2034) * refactor: bring all puzzles together * style: tree-view spacing * fix(ui): expand datatable upto borders * style: improvment of datatable * fix(ui): setup listeners * fix: gst settings for gstr-1 * fix: don't sub-categorise nil exempt and non-gst * fix: nil expempt data for js and trial data * fix: variable display of data based on status of return and gst settings * fix: OTP workflow for gstr-1 beta to authenticate APIs * chore: updated comments * fix: return status API integration * fix: gstr-1 mapping refactor * fix: download APIs setup * fix: mapping of data for AT and TXP * fix: tuple key changed to f-string * fix: tuple keys converted to string in gstr-1 json mapping * fix: working data pieces * fix: month and quarter depending on gst settings * fix: transaction type for all invoices * fix: summarize filed data * fix: no of records in summarize filed data * fix: gstr-1 json map refactor and guess customer name * chore: update comments, minor refactor in js * fix: reconcile books and gov data * fix: mapped-data data format refactor * fix: reconcile books vs returns * chore: cleanup unused page * fix: summarize data * fix: add supecom category * fix: totals for gstr-1 summary * fix: month or quarter options as per selected year * fix: better reconciliation and summarization * fix: minor changes to date selection * fix: refactor columns and consistent categories * fix: supecom mapping and format date * fix: working report with actual data * wip: gst ledger difference * fix: compute index in HSN and DOC_ISSUE Summary while converting to gov json * fix: fix e-Invoice tab * fix: difference in output gst ledger , collapse and expand button , computed on * fix: minor changes while testing (#19) * fix: e-Invoice data => unfiled data * fix(ux): correct totals for books summary with missing records * fix: subtitle for tabs * fix: detail view for reconcile data * refactorr: gstr_1 reconcile html template * fix: output gst ledger called multiple times * fix: changes to ledger data, etc * fix: summarize return-summary data * fix: summarize returns data with amendments * wip: endpoint for json export with options * fix: round books value, default blank table message * fix: changes as per review * fix: check gstr-1 filed upto and review js * fix: highlight difference if there * fix: validate and update latest data * refactor: class name, circular import * chore: update todos * fix: compute item index while converting to gov json format * fix: creation time for the report * fix: recompute books data * fix: download excel for books data * fix: download gstr-1 json * fix: gstr-1 upload errors resolved * fix: ignore str in json generation * fix: load data after all existing requests are complete * fix: update todos, show report from filed log * fix: action mark as filed * fix: generate summary for apis disabled * fix: download reconcile excel and refactor download books excel * fix: download json causing errror * fix: excel headers as per review * fix: colour for header and data * fix: download filed excel --------- Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> * fix: file naming and sheet naming * fix: Sheet naming as per mapping * fix: changes required to make it work * fix: excel column widths * fix: width for specific column in books and recncile excel download * fix: export gstr-1 excel * fix: as per review * fix: default formatting changes in excel format * fix: excel-export refactor * fix: don't send ecommerce gstin info to gov in regular sections * fix: b2b invoice types and enum * fix: refactor aggregate_invoices in NilRated GSTR-1 Mapping * fix: delete flag instead of zero values to handle missing in books * fix: check for production api's enabled for gstr-1 * refactor: file and code blocks restructuring * refactor: indentation to spaces * fix: remove unrequired data * fix: fixed failing test cases and re-arranged fields in Gov excel export as per Gov format * fix: set flag for otp_requested * fix: default permissions and update mark as filed * fix: save gstr1 filed upto in gstin doc * fix: minor codacy issues * fix: semgrep rules * fix: more fixes for codacy * refactor: gstr-1 generation and summarization * fix: correct empty state text * fix: default frequency to monthly * fix: readonly fields for filed log * chore: correct function name * refactor: enum names * refactor: data export and comminify utilities * refactor: common columns for reconcile * chore: linters * fix: ecommerce data summary conversion * fix: fallback for legacy summary data. * fix: process additional returns information after commit * fix: show gstr_1 beta alert on existing report * refactor: gstr-1 beta js * fix: codacy issues * chore: comments and todos * fix: gstr-1 json map doc-string added * fix: consistent data conversion, brief comments * fix: buttons based on API status * fix: modified docstring in gstr_1_json_map and fixed test cases * fix: non-mandatory fields in backend (single doctype), year options set dynamically * chore: formatting changes * chore: mark fields as mandatory * fix: return filed upto from db * fix: test cases and update ignored categories for overview * fix: re-compute if files are missing * fix: support delete permissions for beta * fix: changes as per review * fix: correct data computation for nil exempt * fix: show aggregated data for filing * refactor: renamed to GSTR-1 log * fix: minor enhancements to ui * fix: load normalized data in download_gstr1_json and fixed test cases * fix: support dynamic filters for detailed view * fix: disabled detail view * fix: ignore tax rate when getting difference * fix: changes as per review * fix: save aggregated data in books data * fix: delete unfiled files after return is filed * fix: update books json after aggregate data * fix: back button setup for detailed view * fix: aggregation, Inter vs Intra based on company gstin * fix: export positive values for select sections * chore: remove print statement * fix: b2cs data processing for books excel consistently * test: rename variable in test case * fix: json export, upload, sync test * fix: show only required columns in details view * fix: update dashboard for other report --------- Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: Divyam Mistry <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]>
vorasmit
added a commit
to vorasmit/ic
that referenced
this pull request
Jun 8, 2024
* feat: gstr-1 filed log * fix: gstr-1 apis * fix: GSTR-1 Mapping * feat: GSTR-1 UI (resilient-tech#1910) * feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (resilient-tech#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (resilient-tech#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (resilient-tech#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (resilient-tech#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (resilient-tech#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (resilient-tech#2022) * fix: uom as per gst (resilient-tech#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> * feat: gstr-1 filed log (resilient-tech#2034) * refactor: bring all puzzles together * style: tree-view spacing * fix(ui): expand datatable upto borders * style: improvment of datatable * fix(ui): setup listeners * fix: gst settings for gstr-1 * fix: don't sub-categorise nil exempt and non-gst * fix: nil expempt data for js and trial data * fix: variable display of data based on status of return and gst settings * fix: OTP workflow for gstr-1 beta to authenticate APIs * chore: updated comments * fix: return status API integration * fix: gstr-1 mapping refactor * fix: download APIs setup * fix: mapping of data for AT and TXP * fix: tuple key changed to f-string * fix: tuple keys converted to string in gstr-1 json mapping * fix: working data pieces * fix: month and quarter depending on gst settings * fix: transaction type for all invoices * fix: summarize filed data * fix: no of records in summarize filed data * fix: gstr-1 json map refactor and guess customer name * chore: update comments, minor refactor in js * fix: reconcile books and gov data * fix: mapped-data data format refactor * fix: reconcile books vs returns * chore: cleanup unused page * fix: summarize data * fix: add supecom category * fix: totals for gstr-1 summary * fix: month or quarter options as per selected year * fix: better reconciliation and summarization * fix: minor changes to date selection * fix: refactor columns and consistent categories * fix: supecom mapping and format date * fix: working report with actual data * wip: gst ledger difference * fix: compute index in HSN and DOC_ISSUE Summary while converting to gov json * fix: fix e-Invoice tab * fix: difference in output gst ledger , collapse and expand button , computed on * fix: minor changes while testing (#19) * fix: e-Invoice data => unfiled data * fix(ux): correct totals for books summary with missing records * fix: subtitle for tabs * fix: detail view for reconcile data * refactorr: gstr_1 reconcile html template * fix: output gst ledger called multiple times * fix: changes to ledger data, etc * fix: summarize return-summary data * fix: summarize returns data with amendments * wip: endpoint for json export with options * fix: round books value, default blank table message * fix: changes as per review * fix: check gstr-1 filed upto and review js * fix: highlight difference if there * fix: validate and update latest data * refactor: class name, circular import * chore: update todos * fix: compute item index while converting to gov json format * fix: creation time for the report * fix: recompute books data * fix: download excel for books data * fix: download gstr-1 json * fix: gstr-1 upload errors resolved * fix: ignore str in json generation * fix: load data after all existing requests are complete * fix: update todos, show report from filed log * fix: action mark as filed * fix: generate summary for apis disabled * fix: download reconcile excel and refactor download books excel * fix: download json causing errror * fix: excel headers as per review * fix: colour for header and data * fix: download filed excel --------- Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> * fix: file naming and sheet naming * fix: Sheet naming as per mapping * fix: changes required to make it work * fix: excel column widths * fix: width for specific column in books and recncile excel download * fix: export gstr-1 excel * fix: as per review * fix: default formatting changes in excel format * fix: excel-export refactor * fix: don't send ecommerce gstin info to gov in regular sections * fix: b2b invoice types and enum * fix: refactor aggregate_invoices in NilRated GSTR-1 Mapping * fix: delete flag instead of zero values to handle missing in books * fix: check for production api's enabled for gstr-1 * refactor: file and code blocks restructuring * refactor: indentation to spaces * fix: remove unrequired data * fix: fixed failing test cases and re-arranged fields in Gov excel export as per Gov format * fix: set flag for otp_requested * fix: default permissions and update mark as filed * fix: save gstr1 filed upto in gstin doc * fix: minor codacy issues * fix: semgrep rules * fix: more fixes for codacy * refactor: gstr-1 generation and summarization * fix: correct empty state text * fix: default frequency to monthly * fix: readonly fields for filed log * chore: correct function name * refactor: enum names * refactor: data export and comminify utilities * refactor: common columns for reconcile * chore: linters * fix: ecommerce data summary conversion * fix: fallback for legacy summary data. * fix: process additional returns information after commit * fix: show gstr_1 beta alert on existing report * refactor: gstr-1 beta js * fix: codacy issues * chore: comments and todos * fix: gstr-1 json map doc-string added * fix: consistent data conversion, brief comments * fix: buttons based on API status * fix: modified docstring in gstr_1_json_map and fixed test cases * fix: non-mandatory fields in backend (single doctype), year options set dynamically * chore: formatting changes * chore: mark fields as mandatory * fix: return filed upto from db * fix: test cases and update ignored categories for overview * fix: re-compute if files are missing * fix: support delete permissions for beta * fix: changes as per review * fix: correct data computation for nil exempt * fix: show aggregated data for filing * refactor: renamed to GSTR-1 log * fix: minor enhancements to ui * fix: load normalized data in download_gstr1_json and fixed test cases * fix: support dynamic filters for detailed view * fix: disabled detail view * fix: ignore tax rate when getting difference * fix: changes as per review * fix: save aggregated data in books data * fix: delete unfiled files after return is filed * fix: update books json after aggregate data * fix: back button setup for detailed view * fix: aggregation, Inter vs Intra based on company gstin * fix: export positive values for select sections * chore: remove print statement * fix: b2cs data processing for books excel consistently * test: rename variable in test case * fix: json export, upload, sync test * fix: show only required columns in details view * fix: update dashboard for other report --------- Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: Divyam Mistry <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]>
mergify bot
pushed a commit
that referenced
this pull request
Jun 8, 2024
* feat: gstr-1 filed log * fix: gstr-1 apis * fix: GSTR-1 Mapping * feat: GSTR-1 UI (#1910) * feat: make GSTR-1 page * fix: minor changes in data * wip: gstr_1 beta * wip: gstr-1 beta ui * fix: working UI with dummy data * refactor: public js folder structure * fix: setup base for building columns * chore: update demo data * fix: consistent keys for sub categories * style: dynmic name for `File` tab * fix: overlap count for nil-rated , non-gst and exempted invoices * test: test cases for `update item after submit` in Sales Order and Purchase Order (#1979) * fix: group tax values and amounts for invoice print formats * fix: missing gst amounts in hsn json * chore: update compatible version * chore: use similar color for all number cards * fix: add overlaping invoice count summary to overview * fix: group overview in GST sales register beta by category (#2002) * fix: group overview in GST sales register beta by category * fix: better way to override datatable totals * chore: mapped data for gstr1 * fix: setup columns for gstr 1 beta * fix: add totals row for the summary * fix(minor): row width and checkbox for datatable * wip: category and sub-category filtering * fix: changes as per review * fix: validate for cess non-advol (#2009) * fix: validate for cess non-advol * fix: remove duplicate code * fix: changes as per view * chore: fix type, less nesting --------- Co-authored-by: ljain112 <[email protected]> * test: test cases for gst sales register beta report (#1965) * test: test cases for gst sales register beta report * fix: linters and item_code * fix: remove gst_treatement and posting date while creating invoices * fix: remove gst_treatement and posting date while creating invoices * fix: modified test cases * test: super setup to cleanup data post tests * refactor: test cases for sales register and modified required orderby in sales register beta report * fix: test cases and utility function for appending items in sales invoice * test: update similar treatment for original test cases * test: modified test output for overview --------- * test: test-cases for regional_overrides (#2006) * fix: test-cases for regional_overrides * refactor: test case placement and only required test cases --------- Co-authored-by: Smit Vora <[email protected]> * fix(minor): better way to override totals in gst sales beta report (#2022) * fix: uom as per gst (#2019) * fix: uom as per gst * chore: refactor and wrap original function --------- * refactor: seperate gstr_1 utilities * refactor: commanify gstr_utils and make gstr_2 independent * fix: prepare mapped data for hsn summary * fix: added document issued summary in mapped data * fix: reverse charge as "Y" or "N" * style: basic tree view for summary * fix: changed variable name --------- Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Smit Vora <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> * feat: gstr-1 filed log (#2034) * refactor: bring all puzzles together * style: tree-view spacing * fix(ui): expand datatable upto borders * style: improvment of datatable * fix(ui): setup listeners * fix: gst settings for gstr-1 * fix: don't sub-categorise nil exempt and non-gst * fix: nil expempt data for js and trial data * fix: variable display of data based on status of return and gst settings * fix: OTP workflow for gstr-1 beta to authenticate APIs * chore: updated comments * fix: return status API integration * fix: gstr-1 mapping refactor * fix: download APIs setup * fix: mapping of data for AT and TXP * fix: tuple key changed to f-string * fix: tuple keys converted to string in gstr-1 json mapping * fix: working data pieces * fix: month and quarter depending on gst settings * fix: transaction type for all invoices * fix: summarize filed data * fix: no of records in summarize filed data * fix: gstr-1 json map refactor and guess customer name * chore: update comments, minor refactor in js * fix: reconcile books and gov data * fix: mapped-data data format refactor * fix: reconcile books vs returns * chore: cleanup unused page * fix: summarize data * fix: add supecom category * fix: totals for gstr-1 summary * fix: month or quarter options as per selected year * fix: better reconciliation and summarization * fix: minor changes to date selection * fix: refactor columns and consistent categories * fix: supecom mapping and format date * fix: working report with actual data * wip: gst ledger difference * fix: compute index in HSN and DOC_ISSUE Summary while converting to gov json * fix: fix e-Invoice tab * fix: difference in output gst ledger , collapse and expand button , computed on * fix: minor changes while testing (#19) * fix: e-Invoice data => unfiled data * fix(ux): correct totals for books summary with missing records * fix: subtitle for tabs * fix: detail view for reconcile data * refactorr: gstr_1 reconcile html template * fix: output gst ledger called multiple times * fix: changes to ledger data, etc * fix: summarize return-summary data * fix: summarize returns data with amendments * wip: endpoint for json export with options * fix: round books value, default blank table message * fix: changes as per review * fix: check gstr-1 filed upto and review js * fix: highlight difference if there * fix: validate and update latest data * refactor: class name, circular import * chore: update todos * fix: compute item index while converting to gov json format * fix: creation time for the report * fix: recompute books data * fix: download excel for books data * fix: download gstr-1 json * fix: gstr-1 upload errors resolved * fix: ignore str in json generation * fix: load data after all existing requests are complete * fix: update todos, show report from filed log * fix: action mark as filed * fix: generate summary for apis disabled * fix: download reconcile excel and refactor download books excel * fix: download json causing errror * fix: excel headers as per review * fix: colour for header and data * fix: download filed excel --------- Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> * fix: file naming and sheet naming * fix: Sheet naming as per mapping * fix: changes required to make it work * fix: excel column widths * fix: width for specific column in books and recncile excel download * fix: export gstr-1 excel * fix: as per review * fix: default formatting changes in excel format * fix: excel-export refactor * fix: don't send ecommerce gstin info to gov in regular sections * fix: b2b invoice types and enum * fix: refactor aggregate_invoices in NilRated GSTR-1 Mapping * fix: delete flag instead of zero values to handle missing in books * fix: check for production api's enabled for gstr-1 * refactor: file and code blocks restructuring * refactor: indentation to spaces * fix: remove unrequired data * fix: fixed failing test cases and re-arranged fields in Gov excel export as per Gov format * fix: set flag for otp_requested * fix: default permissions and update mark as filed * fix: save gstr1 filed upto in gstin doc * fix: minor codacy issues * fix: semgrep rules * fix: more fixes for codacy * refactor: gstr-1 generation and summarization * fix: correct empty state text * fix: default frequency to monthly * fix: readonly fields for filed log * chore: correct function name * refactor: enum names * refactor: data export and comminify utilities * refactor: common columns for reconcile * chore: linters * fix: ecommerce data summary conversion * fix: fallback for legacy summary data. * fix: process additional returns information after commit * fix: show gstr_1 beta alert on existing report * refactor: gstr-1 beta js * fix: codacy issues * chore: comments and todos * fix: gstr-1 json map doc-string added * fix: consistent data conversion, brief comments * fix: buttons based on API status * fix: modified docstring in gstr_1_json_map and fixed test cases * fix: non-mandatory fields in backend (single doctype), year options set dynamically * chore: formatting changes * chore: mark fields as mandatory * fix: return filed upto from db * fix: test cases and update ignored categories for overview * fix: re-compute if files are missing * fix: support delete permissions for beta * fix: changes as per review * fix: correct data computation for nil exempt * fix: show aggregated data for filing * refactor: renamed to GSTR-1 log * fix: minor enhancements to ui * fix: load normalized data in download_gstr1_json and fixed test cases * fix: support dynamic filters for detailed view * fix: disabled detail view * fix: ignore tax rate when getting difference * fix: changes as per review * fix: save aggregated data in books data * fix: delete unfiled files after return is filed * fix: update books json after aggregate data * fix: back button setup for detailed view * fix: aggregation, Inter vs Intra based on company gstin * fix: export positive values for select sections * chore: remove print statement * fix: b2cs data processing for books excel consistently * test: rename variable in test case * fix: json export, upload, sync test * fix: show only required columns in details view * fix: update dashboard for other report --------- Co-authored-by: Vishakh Desai <[email protected]> Co-authored-by: Divyam Mistry <[email protected]> Co-authored-by: Abdeali Chharchhodawala <[email protected]> Co-authored-by: priyanshshah2442 <[email protected]> Co-authored-by: Priyansh Shah <[email protected]> Co-authored-by: Sanket322 <[email protected]> Co-authored-by: ljain112 <[email protected]> (cherry picked from commit 90202d6) # Conflicts: # india_compliance/gst_india/overrides/transaction.py
india-compliance-bot
added a commit
that referenced
this pull request
Jun 9, 2024
# [14.27.0](v14.26.6...v14.27.0) (2024-06-09) ### Bug Fixes * checks existence of "is_nil_exempt" field before executing gst_treatment patch ([8265c1e](8265c1e)) * correct upload stautus for GSTR-1 books ([d8a784a](d8a784a)) * Dynamic Link for Purchase Doc in Purchase Reco ([adf5fd7](adf5fd7)) * handle cases where public key is invalided ([9c6c746](9c6c746)) * ineligible ITC due to Pos value in GSTR3b ([#2197](#2197)) ([1bdeb98](1bdeb98)) * more readable settings, generate without creds ([ae135c7](ae135c7)) * round all value fields for gstr-1 json ([12e8e64](12e8e64)) * **ui:** changes for v14 ([fa225f1](fa225f1)) ### Features * GSTR-1 Beta for filing ([#2112](#2112)) ([b8a2aaf](b8a2aaf)), closes [#1910](#1910) [#1979](#1979) [#2002](#2002) [#2009](#2009)
india-compliance-bot
added a commit
that referenced
this pull request
Jun 9, 2024
# [15.8.0](v15.7.5...v15.8.0) (2024-06-09) ### Bug Fixes * checks existence of "is_nil_exempt" field before executing gst_treatment patch ([3f70180](3f70180)) * correct upload stautus for GSTR-1 books ([fd96578](fd96578)) * Dynamic Link for Purchase Doc in Purchase Reco ([6a1cca1](6a1cca1)) * handle cases where public key is invalided ([6fdcc5e](6fdcc5e)) * ineligible ITC due to Pos value in GSTR3b ([#2197](#2197)) ([c5a919f](c5a919f)) * more readable settings, generate without creds ([74a0aea](74a0aea)) * round all value fields for gstr-1 json ([37974a4](37974a4)) ### Features * GSTR-1 Beta for filing ([#2112](#2112)) ([90202d6](90202d6)), closes [#1910](#1910) [#1979](#1979) [#2002](#2002) [#2009](#2009)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Validation for cess non-advol where charge type is actual.
closes #1884