fix: company wise deferred accounting fields in item #37023
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
deepeshgarg007
requested changes
Sep 13, 2023
erpnext/stock/get_item_details.py
Outdated
| @@ -696,7 +696,11 @@ def get_default_discount_account(args, item): | |||
| def get_default_deferred_account(args, item, fieldname=None): | |||
| if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"): | |||
| return ( | |||
| item.get(fieldname) | |||
| frappe.db.get_value( | |||
There was a problem hiding this comment.
Suggested change
| frappe.db.get_value( | |
| frappe.db.get_value( |
Suggested change
| frappe.db.get_value( | |
| frappe.db.get_cached_value( |
Codecov Report
@@ Coverage Diff @@
## develop #37023 +/- ##
========================================
Coverage 66.49% 66.50%
========================================
Files 793 793
Lines 62435 62432 -3
========================================
- Hits 41519 41518 -1
+ Misses 20916 20914 -2
|
mergify bot
pushed a commit
that referenced
this pull request
Sep 16, 2023
* fix: move deferred accounts in accounting section * fix: move deferred check boxes in item accounting * fix: show company wise acc in filters * fix: fetch item deferred account from child table * fix: tests using deferred acc * refactor: use cached value * fix: cached value call * feat: patch to migrate deferred acc * fix: hardcode education module doctypes in patch * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 099468e) # Conflicts: # erpnext/patches.txt # erpnext/patches/v14_0/delete_education_doctypes.py # erpnext/stock/doctype/item/item.json
deepeshgarg007
added a commit
that referenced
this pull request
Sep 18, 2023
* fix: company wise deferred accounting fields in item (#37023) * fix: move deferred accounts in accounting section * fix: move deferred check boxes in item accounting * fix: show company wise acc in filters * fix: fetch item deferred account from child table * fix: tests using deferred acc * refactor: use cached value * fix: cached value call * feat: patch to migrate deferred acc * fix: hardcode education module doctypes in patch * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 099468e) # Conflicts: # erpnext/patches.txt # erpnext/patches/v14_0/delete_education_doctypes.py # erpnext/stock/doctype/item/item.json * chore: resolve conflicts * chore: resolve conflicts --------- 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
Sep 20, 2023
# [14.40.0](v14.39.0...v14.40.0) (2023-09-20) ### Bug Fixes * + btn not appearing for delivery note connection (backport [#36980](#36980)) ([#37070](#37070)) ([c2a0c1e](c2a0c1e)) * accepted warehouse and rejected warehouse can't be same (backport [#36973](#36973)) ([#37071](#37071)) ([b56c9b9](b56c9b9)) * after applying coupon code, field in_words not updated ([#37133](#37133)) ([1cb8c64](1cb8c64)) * Apply dimension filter, irrespective of dimesion columns ([9bc44a3](9bc44a3)) * asset validation misfire on debit notes ([b33db6c](b33db6c)) * company wise deferred accounting fields in item ([#37023](#37023)) ([13aaff3](13aaff3)) * Don't allow merging accounts with different currency ([#37074](#37074)) ([c41cb39](c41cb39)) * don't set from warehouse for purchase material request ([#37132](#37132)) ([e62b783](e62b783)) * Duplicate Serial Nos validation in POS ([#36927](#36927)) ([366325c](366325c)) * fetch logic for repay_from_salary in loan_repayment [v14] ([#37135](#37135)) ([480a0ca](480a0ca)) * ignore user permissions for `Source Warehouse` in MR (backport [#37102](#37102)) ([#37110](#37110)) ([727dcc5](727dcc5)) * incorrect stock ledger entries in DN (backport [#36944](#36944)) ([#37066](#37066)) ([699ad80](699ad80)) * packed item using expired price ([413b40f](413b40f)) * POS opening Issue if Product Bundle is available ([#37138](#37138)) ([af05864](af05864)) * precision issue and column name ([#37073](#37073)) ([f2395a9](f2395a9)) * Purchase Receipt Provisional Accounting GL Entries (backport [#37046](#37046)) ([#37068](#37068)) ([8772e40](8772e40)) * Remove redundant code ([#37001](#37001)) ([3ecdf02](3ecdf02)) * **ux:** move `get_route_options_for_new_doc` to `refresh` ([#37092](#37092)) ([a563fed](a563fed)) * validate duplicate serial no in DN ([fffa13f](fffa13f)) ### Features * provision to create RIV from `Stock Ledger Invariant Check` report (backport [#37115](#37115)) ([#37147](#37147)) ([29ff0ce](29ff0ce))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Problem
For a particular Item, the fields to enable deferred accounting and set the default deferred account for that particular Item are available in the Purchasing and Sales tabs in the Item Master. However, these are set for that particular Item for all the companies. If one needs to set different deferred accounts for the same Item in different companies, this cannot be achieved from the Item master.
Solution
Moved the deferred accounting fields to the Accounting Tab.
Show the
deferred_expense_accountanddeferred_revenue_accountfields in the Item Defaults table (which is company wise) depending on whether Deferred Accounting is enabled for the particular item.Closes #36841
no-docs