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.

Sign up for GitHub

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

Jump to bottom

fix(general_ledger): Order by in case Group by Account #28093

Merged
merged 3 commits into from
Oct 27, 2021
Merged

fix(general_ledger): Order by in case Group by Account #28093

merged 3 commits into from
Oct 27, 2021

Conversation

zeta17
Copy link
Contributor

@zeta17 zeta17 commented Oct 27, 2021

Fix order_by_statement if filter group by: Group by Account

@zeta17
Update general_ledger.py
4c1ab7e 
Fix order_by_statement if filter group by: Group by Account
@ankush ankush changed the title Update general_ledger.py fix(general_ledger): Order by in case Group by Account Oct 27, 2021
@ankush ankush added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Oct 27, 2021
@codecov
Copy link

codecov bot commented Oct 27, 2021 •
edited
Loading

Codecov Report

Merging #28093 (37b63c7) into develop (af9ead8) will increase coverage by 0.10%.
The diff coverage is 50.00%.

@@             Coverage Diff             @@
##           develop   #28093      +/-   ##
===========================================
+ Coverage    55.14%   55.25%   +0.10%     
===========================================
  Files         1255     1255              
  Lines        67927    67929       +2     
===========================================
+ Hits         37458    37533      +75     
+ Misses       30469    30396      -73
Impacted Files Coverage Δ
...t/accounts/report/general_ledger/general_ledger.py 21.52% <50.00%> (+0.19%) ⬆️
...eorder_level/itemwise_recommended_reorder_level.py 92.45% <0.00%> (-1.89%) ⬇️
...ctype/accounting_dimension/accounting_dimension.py 64.34% <0.00%> (-1.56%) ⬇️
...e/period_closing_voucher/period_closing_voucher.py 88.23% <0.00%> (-1.48%) ⬇️
...ice_creation_tool/opening_invoice_creation_tool.py 60.41% <0.00%> (-0.70%) ⬇️
erpnext/payroll/doctype/salary_slip/salary_slip.py 83.75% <0.00%> (-0.27%) ⬇️
erpnext/stock/doctype/serial_no/serial_no.py 78.66% <0.00%> (-0.26%) ⬇️
erpnext/portal/utils.py 30.00% <0.00%> (ø)
.../report/stock_projected_qty/stock_projected_qty.py 88.31% <0.00%> (ø)
...ext/payroll/doctype/payroll_entry/payroll_entry.py 71.09% <0.00%> (+0.23%) ⬆️
... and 18 more

@AfshanKhan
Copy link
Contributor

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2021

backport version-13-hotfix

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@AfshanKhan AfshanKhan merged commit f24ed67 into frappe:develop Oct 27, 2021
mergify bot pushed a commit that referenced this pull request Oct 27, 2021
@zeta17
fix(general_ledger): Order by in case Group by Account (#28093)
a830f6c 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f24ed67)
@mergify mergify bot mentioned this pull request Oct 27, 2021
Merged
@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2021

backport version-13-hotfix

✅ Backports have been created

AfshanKhan pushed a commit that referenced this pull request Oct 27, 2021
@mergify @zeta17
fix(general_ledger): Order by in case Group by Account (#28093) (#28106)
e757970 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f24ed67)

Co-authored-by: hendrik <hendrik.zeta@gmail.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
@mergify @zeta17
fix(general_ledger): Order by in case Group by Account (frappe#28093) (…
fade347 
…frappe#28106)

* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f24ed67)

Co-authored-by: hendrik <hendrik.zeta@gmail.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ankush ankush ankush left review comments

@AfshanKhan AfshanKhan AfshanKhan approved these changes

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007

@nextchamp-saqib nextchamp-saqib Awaiting requested review from nextchamp-saqib

Assignees
No one assigned
Labels
squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zeta17 @AfshanKhan @ankush