Skip to content
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: deferred accounting entries on accounts frozen #35978

Merged

Conversation

GursheenK
Copy link
Member

@GursheenK GursheenK commented Jul 3, 2023

Problem
When the Accounts Frozen Till Date was set to a particular date, any deferred accounting entries with posting date before the frozen date do not get posted.

Accounts Frozen upto 31-05-2023
Screenshot 2023-07-04 at 2 46 42 PM


Purchase Invoice created for Deferred Expense Item
Screenshot 2023-07-04 at 2 44 26 PM

The start date is set before the Accounts Frozen Date
Screenshot 2023-07-04 at 2 44 10 PM

On creation of Process Deferred Accounting document with following details -
Screenshot 2023-07-04 at 2 51 35 PM

Previously only one entry for 30-06-2023 got created
Screenshot 2023-07-04 at 2 50 43 PM

Solution
In case of frozen accounts, the deferred accounting entries now get posted with the posting date being the last date of the previous month.
Screenshot 2023-07-04 at 2 54 55 PM

no-docs

@codecov
Copy link

codecov bot commented Jul 4, 2023

Codecov Report

Merging #35978 (285f8cd) into develop (dedb5e2) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #35978      +/-   ##
===========================================
+ Coverage    64.20%   64.22%   +0.02%     
===========================================
  Files          785      785              
  Lines        60620    60649      +29     
===========================================
+ Hits         38920    38953      +33     
+ Misses       21700    21696       -4     
Impacted Files Coverage Δ
erpnext/accounts/deferred_revenue.py 76.47% <100.00%> (+0.50%) ⬆️

... and 1 file with indirect coverage changes

@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Jul 9, 2023
@deepeshgarg007 deepeshgarg007 merged commit 674af15 into frappe:develop Jul 9, 2023
mergify bot pushed a commit that referenced this pull request Jul 9, 2023
* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen

(cherry picked from commit 674af15)

# Conflicts:
#	erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
deepeshgarg007 added a commit that referenced this pull request Jul 10, 2023
* fix: deferred accounting entries on accounts frozen (#35978)

* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen

(cherry picked from commit 674af15)

# Conflicts:
#	erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py

* chore: resolve conflicts

* fix: test for deferred accounting

* chore: Linting Issues

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jul 11, 2023
# [14.30.0](v14.29.2...v14.30.0) (2023-07-11)

### Bug Fixes

* accepted warehouse and rejected warehouse can't be same ([5d77e3c](5d77e3c))
* also check on_hold ([#35910](#35910)) ([59b3277](59b3277))
* conflicts ([e55a264](e55a264))
* conflicts ([79f9785](79f9785))
* conflicts ([a178e66](a178e66))
* conflicts ([6459c28](6459c28))
* deferred accounting entries on accounts frozen ([#35978](#35978)) ([573183c](573183c))
* Delivery Note return valuation ([296f312](296f312))
* German translations ([#35990](#35990)) ([b7b864e](b7b864e))
* incorrect status in MR created from PP (backport [#36085](#36085)) ([#36086](#36086)) ([6dc7a19](6dc7a19))
* incorrect TCS amount while customer has advance payment ([#35397](#35397)) ([2a4bbf3](2a4bbf3))
* labels and translations ([#35963](#35963)) ([04b1d45](04b1d45))
* Opening balance in presentation currency in Trial Balance report ([#36036](#36036)) ([39e38bf](39e38bf))
* payment entry `voucher_type` error ([#35779](#35779)) ([f3af0b2](f3af0b2))
* **Payment Entry:** compare rounded amount ([#36011](#36011)) ([d80b0aa](d80b0aa))
* possible type error on ERR creation ([0569899](0569899))
* precision causing outstanding issue on partly paid invoices ([#36030](#36030)) ([3e711e8](3e711e8))
* Share ledger showing cancelled docs ([#35993](#35993)) ([5102d0c](5102d0c))
* Validate for missing expense account ([#36078](#36078)) ([f4f886c](f4f886c))
* Vietnamese translation of "Company" ([#35887](#35887)) ([e443e6c](e443e6c))

### Features

* Closing balance for period closing and reporting ([#34257](#34257)) ([ebf3c01](ebf3c01))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants