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: serial and batch bundle for POS Invoice (backport #41491) #42396

Merged
merged 2 commits into from
Jul 20, 2024
Merged

fix: serial and batch bundle for POS Invoice (backport #41491) #42396

merged 2 commits into from
Jul 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2024

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

@rohitwaghchaure @mergify
fix: serial and batch bundle for POS Invoice (#41491)
1ac6d49 
(cherry picked from commit e5dfc5e)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@mergify mergify bot requested a review from rohitwaghchaure as a code owner July 18, 2024 14:25
@mergify mergify bot added the conflicts label Jul 18, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner July 18, 2024 14:25
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jul 18, 2024

Cherry-pick of e5dfc5e has failed:

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

You are currently cherry-picking commit e5dfc5e545.
  (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/pos_closing_entry/test_pos_closing_entry.py
	modified:   erpnext/accounts/doctype/pos_invoice/pos_invoice.py
	modified:   erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
	modified:   erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
	modified:   erpnext/selling/page/point_of_sale/pos_controller.js
	modified:   erpnext/selling/page/point_of_sale/pos_item_details.js
	modified:   erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
	modified:   erpnext/stock/serial_batch_bundle.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json

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 stock label Jul 18, 2024
@rohitwaghchaure rohitwaghchaure merged commit 555be2b into version-15-hotfix Jul 20, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-41491 branch July 20, 2024 18:30
frappe-pr-bot pushed a commit that referenced this pull request Jul 24, 2024
@frappe-bot
chore(release): Bumped to Version 15.31.0
e28c1e9 
# [15.31.0](v15.30.0...v15.31.0) (2024-07-24)

### Bug Fixes

* Consider adding warranty period to serial nos (backport [#42051](#42051)) ([#42182](#42182)) ([8da28dc](8da28dc))
* correct validation for depreciation posting date ([ffacf42](ffacf42))
* Don't allow negative amount on Payment Request [#41905](#41905) ([aee2cc2](aee2cc2))
* missing cr/dr notes on payment reconciliation ([0a41ccd](0a41ccd))
* not able to save QC (backport [#42371](#42371)) ([#42373](#42373)) ([18500b8](18500b8))
* provide initial value for `.reduce()` call ([72bc539](72bc539))
* Purchase Order Analysis Report Data (backport [#42387](#42387)) ([#42394](#42394)) ([709be13](709be13))
* qty in the 'Serial No Ledger' report (backport [#42429](#42429)) ([#42433](#42433)) ([926fd41](926fd41))
* remove proprietorship and update it with individual ([527781a](527781a))
* rounding issue causing incorrect quantity in SE (backport [#42380](#42380)) ([#42395](#42395)) ([54791e9](54791e9))
* serial and batch bundle for POS Invoice (backport [#41491](#41491)) ([#42396](#42396)) ([555be2b](555be2b))
* set filter to show only submitted asset ([29fc975](29fc975))
* Show the rows in AR/AP report where outstanding equals to 0.01 ([886256c](886256c))

### Features

* add make_regional_gl_entries override for Sales Invoice ([#42399](#42399)) ([22b17de](22b17de))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.31.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r s-aga-r is a code owner

Assignees

@rohitwaghchaure rohitwaghchaure

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @rohitwaghchaure