-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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: FEC report for France accountancy #34781
Merged
Merged
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
…fix_export_fec
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #34781 +/- ##
========================================
Coverage 63.88% 63.88%
========================================
Files 810 810
Lines 59754 59751 -3
========================================
- Hits 38172 38171 -1
+ Misses 21582 21580 -2
|
barredterra
reviewed
Apr 11, 2023
...onal/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
Outdated
Show resolved
Hide resolved
97fec0b
to
ff7968e
Compare
barredterra
previously approved these changes
Apr 12, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't judge the content of the report, but code and UX is looking fine 👍🏼
...onal/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
Show resolved
Hide resolved
4166e62
to
e219502
Compare
barredterra
reviewed
Apr 14, 2023
...onal/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
Outdated
Show resolved
Hide resolved
barredterra
approved these changes
Apr 20, 2023
mergify bot
pushed a commit
that referenced
this pull request
Apr 21, 2023
* fix: FEC report for France Accountancy legal requirement * fix: FEC report for France Accountancy legal requirement * fix: change to query standard * fix: change to query standard * fix: columns to standard dict * fix: columns to standard dict * fix: columns to data * refactor: french report FEC * refactor: french report FEC (2) --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> (cherry picked from commit af8da53)
deepeshgarg007
pushed a commit
that referenced
this pull request
Apr 21, 2023
fix: FEC report for France accountancy (#34781) * fix: FEC report for France Accountancy legal requirement * fix: FEC report for France Accountancy legal requirement * fix: change to query standard * fix: change to query standard * fix: columns to standard dict * fix: columns to standard dict * fix: columns to data * refactor: french report FEC * refactor: french report FEC (2) --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> (cherry picked from commit af8da53) Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 25, 2023
# [14.23.0](v14.22.3...v14.23.0) (2023-04-25) ### Bug Fixes * `PermissionError` in Work Order ([a3568c1](a3568c1)) * Add company field to lower deduction certificate ([#34914](#34914)) ([d732083](d732083)) * add item-code filter for SCR supplied-items batch-no ([7c4f83e](7c4f83e)) * add limit for get_next_stock_reco ([#34937](#34937)) ([7131ff2](7131ff2)) * added validation for extra job card ([a5fde5d](a5fde5d)) * batch qty conversion factor issue fixed in pos transaction ([#34917](#34917)) ([56ef0ba](56ef0ba)) * broken 'set exchange gain/loss' btn in payment entry ([#34940](#34940)) ([00968ba](00968ba)) * Bulk Payment Entry from PO/SO ([#34942](#34942)) ([878d747](878d747)) * click handler should not attempt indexed access of empty array ([#35013](#35013)) ([06f204a](06f204a)) * Common party JV cost center ([#35008](#35008)) ([693007a](693007a)) * duplicate reposting entries of same voucher ([aeac43c](aeac43c)) * FEC report for France accountancy ([#34781](#34781)) ([6aabab2](6aabab2)) * filtering via batch no ([#34951](#34951)) ([3b23fc1](3b23fc1)), closes [#34950](#34950) * Incorrect difference value in Stock and Account Value Comparison report ([e7ca833](e7ca833)) * incorrect OR condition causing timeout error ([c020789](c020789)) * internal Purchase Receipt GL Entries ([f7e436f](f7e436f)) * item not showing in the BOM ([28cd79a](28cd79a)) * pass reference_doctype in link queries (backport [#35038](#35038)) ([#35039](#35039)) ([5cc3978](5cc3978)) * Payment entry with TDS in bank reco statement ([#34961](#34961)) ([f43ea0d](f43ea0d)) * per_billed condition for Payment Entry ([#34969](#34969)) ([f9f42c7](f9f42c7)) * process_loss_percentage in BOM ([4418862](4418862)) * removed depends on for the Employee Detail section ([9d17d3f](9d17d3f)) * respect title_field from doctype to bulk transactions ([#34928](#34928)) ([29aa4a0](29aa4a0)) * set `frappe.flags.company` to call regional code accurately ([789dfd6](789dfd6)) * simplify `erpnext.get_region` ([87595bd](87595bd)) * SLA permissions (backport [#34981](#34981)) ([#34986](#34986)) ([83a1b83](83a1b83)) * stock entry type issue ([33a1608](33a1608)) * **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([2ad157b](2ad157b)) * **test:** `test_internal_pr_gl_entries` ([7740ceb](7740ceb)) * Unable to allocate advance against invoice ([#35007](#35007)) ([5045ad6](5045ad6)) * use `functools.wraps` to preserve doc signature ([2ec18eb](2ec18eb)) * use CombineDatetime instead of Timestamp in QB queries ([55da91c](55da91c)) * use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [#35031](#35031)) ([#35035](#35035)) ([5630e81](5630e81)) * Use set instead of db_set as it is called from validate ([#34967](#34967)) ([6650212](6650212)) * v14, Bank Reconcile Tools not cover case JV debit bank ([#35000](#35000)) ([82d8379](82d8379)) * validation for internal transfer entry ([a582354](a582354)) * value of depreciable assets not updating after manual depr entry [v14] ([#35010](#35010)) ([3c75e55](3c75e55)) * wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([#34726](#34726)) ([47df41f](47df41f)) ### Features * Reconcile Payments in background ([#34596](#34596)) ([5923a80](5923a80)) ### Performance Improvements * Journal Entries (backport [#34918](#34918)) ([#35054](#35054)) ([39b5147](39b5147)) ### Reverts * Revert "fix: Rate from LDC in TDS reports (#33699)" ([f44a79f](f44a79f)), closes [#33699](#33699)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport version-14-hotfix
backport to version 14
squash
Meant to tell reviewers that this PR should be squashed into a single commit while merging.
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.
In previous version tabMember and tabSudent were hard-coded in the query and give error as this DocType do not exists in core
I've change to use new db query standard and remove member and student doctype usage in the query
If the PR is merge could you add label backport to version-14