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: Item-wise Sales and Purchase register with no item codes #41373 (backport #41424) #41829

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 9, 2024

  1. There was a mismatch in the Sales Register and Item-wise Sales Register Report as the Sales Invoices which does not have the item codes in the Sales Invoice Item table were not displaying in the item-wise Sales Register.

Screenshot for the Sales Register:
SR

Screenshots for the Item-wise Sales Register
Before:
Item-wise_SR_Before
After:
Now the Item-wise Sales Register Displays the Sales Invoices which does not have the Item Code.
Item-wise_SR_After

  1. There was a mismatch in the Purchase Register and Item-wise Purchase Register Report as the Purchase Invoices which does not have the item codes were not displaying in the item-wise Purchase Register.

Screenshot for the Purchase Register:
Purchase Register

Screenshots for the Item-wise Purchase Register
Before:
Item-wise-PR_before

After:
Now the Item-wise Purchase Register Displays the Purchase Invoices which does not have the Item Code.
Item-wise_PR_After


This is an automatic backport of pull request #41424 done by [Mergify](https://mergify.com).

Poorvi and others added 6 commits June 9, 2024 14:13
(cherry picked from commit c90185f)
(cherry picked from commit 1b45ecf)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit 76073ae)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit eafa88b)

# Conflicts:
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit d2af36e)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit 8ec364d)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner June 9, 2024 14:13
@mergify mergify bot added the conflicts label Jun 9, 2024
@mergify mergify bot requested a review from ruthra-kumar as a code owner June 9, 2024 14:13
Copy link
Contributor Author

mergify bot commented Jun 9, 2024

Cherry-pick of 1b45ecf has failed:

On branch mergify/bp/version-14-hotfix/pr-41424
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1b45ecfcae.
  (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/report/purchase_register/purchase_register.py
	modified:   erpnext/accounts/report/sales_register/sales_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
	both modified:   erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

Cherry-pick of 76073ae has failed:

On branch mergify/bp/version-14-hotfix/pr-41424
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 76073ae228.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of eafa88b has failed:

On branch mergify/bp/version-14-hotfix/pr-41424
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit eafa88b8e9.
  (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/report/item_wise_purchase_register/item_wise_purchase_register.py
	modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	modified:   erpnext/accounts/report/sales_register/sales_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

Cherry-pick of d2af36e has failed:

On branch mergify/bp/version-14-hotfix/pr-41424
Your branch is ahead of 'origin/version-14-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d2af36e1eb.
  (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/report/item_wise_sales_register/item_wise_sales_register.js
	modified:   erpnext/accounts/report/purchase_register/purchase_register.py
	modified:   erpnext/accounts/report/sales_register/sales_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
	both modified:   erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

Cherry-pick of 8ec364d has failed:

On branch mergify/bp/version-14-hotfix/pr-41424
Your branch is ahead of 'origin/version-14-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8ec364df6f.
  (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/report/item_wise_sales_register/item_wise_sales_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 9, 2024
@deepeshgarg007 deepeshgarg007 merged commit 625aa4e into version-14-hotfix Jun 9, 2024
10 checks passed
@deepeshgarg007 deepeshgarg007 deleted the mergify/bp/version-14-hotfix/pr-41424 branch June 9, 2024 17:08
@deepeshgarg007
Copy link
Member

@Mergifyio backport version-14

Copy link
Contributor Author

mergify bot commented Jun 10, 2024

backport version-14

✅ Backports have been created

@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.70.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants