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: GL Entries for receiving non CWIP assets using Purchase Receipt (backport #37660) #38122

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 16, 2023

This is an automatic backport of pull request #37660 done by Mergify.
Cherry-pick of 80774e2 has failed:

On branch mergify/bp/version-15-hotfix/pr-37660
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 80774e2da1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
	modified:   erpnext/accounts/general_ledger.py
	modified:   erpnext/assets/doctype/asset/test_asset.py
	modified:   erpnext/manufacturing/doctype/bom/bom.py
	deleted:    erpnext/patches/v12_0/set_expense_account_in_landed_cost_voucher_taxes.py
	modified:   erpnext/setup/doctype/company/company.js
	modified:   erpnext/setup/doctype/company/company.py
	modified:   erpnext/stock/doctype/stock_entry/test_stock_entry.py
	modified:   erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
	both modified:   erpnext/buying/doctype/purchase_order/purchase_order.py
	both modified:   erpnext/controllers/stock_controller.py
	both modified:   erpnext/setup/doctype/company/company.json
	both modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
	both modified:   erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…37660)

* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* fix: rearrange functions

* chore: rearrange functions

* chore: rearrange functions

* fix: Purchase Invoice GL entires for assets

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* chore: make `Reserve Stock` checkbox visible in SO

* refactor: rename field `Auto Reserve Stock for Sales Order`

* feat: add fields to hold SO and SO Item ref in PR Item

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* refactor: Remove expense included in valuation accounts

* chore: Add back default in transit warehousefield

---------

Co-authored-by: s-aga-r <[email protected]>
(cherry picked from commit 80774e2)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/controllers/stock_controller.py
#	erpnext/setup/doctype/company/company.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@mergify mergify bot requested a review from deepeshgarg007 as a code owner November 16, 2023 05:44
@mergify mergify bot added the conflicts label Nov 16, 2023
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-37660 branch November 16, 2023 05:45
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant