fix: group by voucher consolidated showing incorrect data for deferred entries #18778
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
nabinhait
requested changes
Aug 19, 2019
| @@ -305,12 +298,22 @@ def update_value_in_dict(data, key, gle): | |||
| update_value_in_dict(totals, 'total', gle) | |||
| if filters.get("group_by") != _('Group by Voucher (Consolidated)'): | |||
| gle_map[gle.get(group_by)].entries.append(gle) | |||
| elif filters.get("group_by") == _('Group by Voucher (Consolidated)'): | |||
| key = (gle.get("posting_date"), gle.get("voucher_type"), | |||
There was a problem hiding this comment.
why posting_date should be part of the key?
rohitwaghchaure
force-pushed
the
voucher_by_consolidated_not_working_for_deferred_expense_v11
branch
from
432ebf1
to
c8d7d7a
Compare
nabinhait
requested changes
Aug 19, 2019
| if key not in consolidated_gle: | ||
| consolidated_gle.setdefault(key, gle) | ||
| else: | ||
| update_value_in_dict(consolidated_gle, key, gle) | ||
| else: |
nabinhait
requested changes
Aug 19, 2019
erpnext/public/node_modules
Outdated
| @@ -0,0 +1 @@ | |||
| /Users/rohitwaghchaure/Documents/erpnext_new/frappe-bench/apps/erpnext/node_modules | |||
rohitwaghchaure
force-pushed
the
voucher_by_consolidated_not_working_for_deferred_expense_v11
branch
from
c8d7d7a
to
427653c
Compare
nabinhait
approved these changes
Aug 20, 2019
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.
No description provided.