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) (backport #41829) #41832

Merged
merged 7 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 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).
This is an automatic backport of pull request #41829 done by [Mergify](https://mergify.com).

Poorvi and others added 7 commits June 10, 2024 04:53
(cherry picked from commit c90185f)
(cherry picked from commit 5d97c7c)
(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 bc24e75)
(cherry picked from commit 76073ae)

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

# Conflicts:
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit ab90b81)
(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 e94e152)
(cherry picked from commit 8ec364d)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit e79e9e9)
(cherry picked from commit e9b7d00)
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 10, 2024
@deepeshgarg007 deepeshgarg007 merged commit 5ba0082 into version-14 Jun 10, 2024
10 of 11 checks passed
@deepeshgarg007 deepeshgarg007 deleted the mergify/bp/version-14/pr-41829 branch June 10, 2024 04:54
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.70.5 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants