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

feat: Accounting Dimension updation in Payment Request and Entry #33411

Merged
merged 1 commit into from Dec 26, 2022

Conversation

deepeshgarg007
Copy link
Member

@deepeshgarg007 deepeshgarg007 commented Dec 21, 2022

When making a Payment Entry from a Payment Request the accounting dimensions mentioned in the Purchase Order were not copied over to the payment entry

  • Introduced Accounting Dimensions in Payment Request as well to handle such cases
  • Added a patch to handle this for existing installations
  • Also added a minor fix to copy the accounting dimensions directly from Order to Payment Entry

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 21, 2022
@codecov
Copy link

codecov bot commented Dec 21, 2022

Codecov Report

Merging #33411 (6f06af0) into develop (9dc1509) will decrease coverage by 0.00%.
The diff coverage is 62.96%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #33411      +/-   ##
===========================================
- Coverage    64.06%   64.06%   -0.01%     
===========================================
  Files          818      818              
  Lines        58663    58681      +18     
===========================================
+ Hits         37583    37594      +11     
- Misses       21080    21087       +7     
Impacted Files Coverage Δ
erpnext/accounts/report/cash_flow/cash_flow.py 41.34% <25.00%> (-1.52%) ⬇️
...ccounts/doctype/payment_request/payment_request.py 68.09% <76.92%> (+0.09%) ⬆️
...xt/accounts/doctype/payment_entry/payment_entry.py 72.58% <83.33%> (+0.03%) ⬆️
...cial_statement/consolidated_financial_statement.py 88.68% <0.00%> (+0.10%) ⬆️

@deepeshgarg007 deepeshgarg007 merged commit 8a79efa into frappe:develop Dec 26, 2022
@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Dec 26, 2022
mergify bot pushed a commit that referenced this pull request Dec 26, 2022
deepeshgarg007 added a commit that referenced this pull request Dec 27, 2022
* fix: typerror on multi warehouse in Packed Items

DN(with bundled item with varying warehouses)-> Sales Invoice.

(cherry picked from commit e684eb3)

* test: type error on bundled products with different warehouses

(cherry picked from commit 5918bb0)

* fix: payment terms and sales partner filter issue in AR/AP report

(cherry picked from commit 13c4420)

* fix: timeout error while submitting stock entry

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit a05c47e)

* fix: `shipping_address` in PO

(cherry picked from commit 7e1b6b3)

* refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33433)

* feat: Accounting Dimension updation in Payment Request and Entry (#33411)

* fix: `shipping_address` for non-drop shipping item

(cherry picked from commit 67a7ccf)

* fix: Random behaviour while picking items using picklist (backport #33449) (#33450)

fix: Random behaviour while picking items using picklist (#33449)

(cherry picked from commit 8263bf9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

* fix: Multiple rows for same warehouse and batches in pick list (backport #33456) (#33458)

fix: Multiple rows for same warehouse and batches in pick list (#33456)

(cherry picked from commit d2686ce)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

* fix: Default dimensions on fetching items from BOM (backport #33439) (#33459)

fix: Default dimensions on fetching items from BOM (#33439)

(cherry picked from commit 0b75aa5)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jan 4, 2023
# [14.12.0](v14.11.1...v14.12.0) (2023-01-04)

### Bug Fixes

* [concurrency issue] incorrect picked qty in sales order ([e7254fd](e7254fd))
* `fg_item_qty` in non-subcontracted PO ([6e15331](6e15331))
* `shipping_address` for non-drop shipping item ([a7a3654](a7a3654))
* `shipping_address` in PO ([448fbe5](448fbe5))
* add missing 'ordered_qty' to get_bin_details ([55e8e45](55e8e45))
* consider child nodes while getting bin details ([e296408](e296408))
* Conversion factor error for invoices without item code (petty expenses) ([#32714](#32714)) ([ba5a149](ba5a149))
* Customer Primary Contact (backport [#33424](#33424)) ([#33440](#33440)) ([73c9820](73c9820))
* Default dimensions on fetching items from BOM (backport [#33439](#33439)) ([#33459](#33459)) ([a332b22](a332b22))
* Deferred revenue date comparison ([#33515](#33515)) ([027510b](027510b))
* ERR journals reported in AR/AP ([823b352](823b352))
* Get payment entry button not visible in Bank Clearance doc (backport [#33518](#33518)) ([#33525](#33525)) ([fcf052d](fcf052d))
* Missing opening entry in general ledger (backport [#33519](#33519)) ([#33526](#33526)) ([8e375db](8e375db))
* Multi-currency issues in Bank Reconciliation Tool ([#33488](#33488)) ([d030852](d030852))
* Multiple rows for same warehouse and batches in pick list (backport [#33456](#33456)) ([#33458](#33458)) ([a166a76](a166a76))
* payment terms and sales partner filter issue in AR/AP report ([0f6790b](0f6790b))
* **pricing rule:** consider child tables in condition (backport [#33469](#33469)) ([#33470](#33470)) ([3bceb47](3bceb47))
* Random behaviour while picking items using picklist (backport [#33449](#33449)) ([#33450](#33450)) ([1edde9c](1edde9c))
* set `supplier` details while mapping SE(Send to Subcontractor) ([06e13b6](06e13b6))
* timeout error while submitting stock entry ([f30f77c](f30f77c))
* typerror on multi warehouse in Packed Items ([9b24940](9b24940))
* use base_net_amount in case of missing stock qty ([#33457](#33457)) ([88ca780](88ca780))

### Features

* Accounting Dimension updation in Payment Request and Entry ([#33411](#33411)) ([e7704b2](e7704b2))
@barredterra barredterra mentioned this pull request Mar 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant