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(pos): edge case while closing pos (backport #31748) #31893

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2022

This is an automatic backport of pull request #31748 done by Mergify.


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

* fix(pos): edge case while closing pos

* fix: linter

* fix: setting posting_time in pos invoice merge log

(cherry picked from commit 756fe4b)
@nextchamp-saqib nextchamp-saqib added the CI-failing Unit tests or patch tests are failing. label Aug 24, 2022
@nextchamp-saqib nextchamp-saqib merged commit 261405c into version-13-hotfix Aug 25, 2022
@nextchamp-saqib nextchamp-saqib removed the CI-failing Unit tests or patch tests are failing. label Aug 25, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31748 branch August 25, 2022 09:20
frappe-pr-bot pushed a commit that referenced this pull request Aug 30, 2022
# [13.37.0](v13.36.5...v13.37.0) (2022-08-30)

### Bug Fixes

* Add docstatus filter for voucher_no in Repost Item Valuation ([2cf2885](2cf2885))
* Cash and non trade discount calculation ([20e9599](20e9599))
* do not clear promotion/transfer details if doc is amended ([#32000](#32000)) ([074d484](074d484))
* filter leave types and render leave application dashboard w/o from date ([#32001](#32001)) ([7686c9e](7686c9e))
* Loan Write-off for term loans ([e64e812](e64e812))
* **minor:** don't print tax rate if its '0' ([#31838](#31838)) ([a46dca5](a46dca5))
* permissions for Task Type ([#32016](#32016)) ([1157bf8](1157bf8))
* **pos:** edge case while closing pos (backport [#31748](#31748)) ([#31893](#31893)) ([261405c](261405c))
* Purposes not set ([edfaf99](edfaf99))
* Route condition set for stock ledger (backport [#31935](#31935)) ([#31946](#31946)) ([34537c9](34537c9))
* Set the condition to create a purchase receipt ([b4c992d](b4c992d))
* Test cases ([7c85b48](7c85b48))

### Features

* In BOM,  Operation time can be fix (backport [#27063](#27063)) ([#31923](#31923)) ([c2b8d1b](c2b8d1b))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.37.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

dottenbr pushed a commit to newmatik/eso-erpnext that referenced this pull request Sep 6, 2022
dottenbr pushed a commit to newmatik/eso-erpnext that referenced this pull request Sep 6, 2022
# [13.37.0](frappe/erpnext@v13.36.5...v13.37.0) (2022-08-30)

### Bug Fixes

* Add docstatus filter for voucher_no in Repost Item Valuation ([2cf2885](frappe@2cf2885))
* Cash and non trade discount calculation ([20e9599](frappe@20e9599))
* do not clear promotion/transfer details if doc is amended ([frappe#32000](frappe#32000)) ([074d484](frappe@074d484))
* filter leave types and render leave application dashboard w/o from date ([frappe#32001](frappe#32001)) ([7686c9e](frappe@7686c9e))
* Loan Write-off for term loans ([e64e812](frappe@e64e812))
* **minor:** don't print tax rate if its '0' ([frappe#31838](frappe#31838)) ([a46dca5](frappe@a46dca5))
* permissions for Task Type ([frappe#32016](frappe#32016)) ([1157bf8](frappe@1157bf8))
* **pos:** edge case while closing pos (backport [frappe#31748](frappe#31748)) ([frappe#31893](frappe#31893)) ([261405c](frappe@261405c))
* Purposes not set ([edfaf99](frappe@edfaf99))
* Route condition set for stock ledger (backport [frappe#31935](frappe#31935)) ([frappe#31946](frappe#31946)) ([34537c9](frappe@34537c9))
* Set the condition to create a purchase receipt ([b4c992d](frappe@b4c992d))
* Test cases ([7c85b48](frappe@7c85b48))

### Features

* In BOM,  Operation time can be fix (backport [frappe#27063](frappe#27063)) ([frappe#31923](frappe#31923)) ([c2b8d1b](frappe@c2b8d1b))
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
# [13.37.0](frappe/erpnext@v13.36.5...v13.37.0) (2022-08-30)

### Bug Fixes

* Add docstatus filter for voucher_no in Repost Item Valuation ([2cf2885](frappe@2cf2885))
* Cash and non trade discount calculation ([20e9599](frappe@20e9599))
* do not clear promotion/transfer details if doc is amended ([frappe#32000](frappe#32000)) ([074d484](frappe@074d484))
* filter leave types and render leave application dashboard w/o from date ([frappe#32001](frappe#32001)) ([7686c9e](frappe@7686c9e))
* Loan Write-off for term loans ([e64e812](frappe@e64e812))
* **minor:** don't print tax rate if its '0' ([frappe#31838](frappe#31838)) ([a46dca5](frappe@a46dca5))
* permissions for Task Type ([frappe#32016](frappe#32016)) ([1157bf8](frappe@1157bf8))
* **pos:** edge case while closing pos (backport [frappe#31748](frappe#31748)) ([frappe#31893](frappe#31893)) ([261405c](frappe@261405c))
* Purposes not set ([edfaf99](frappe@edfaf99))
* Route condition set for stock ledger (backport [frappe#31935](frappe#31935)) ([frappe#31946](frappe#31946)) ([34537c9](frappe@34537c9))
* Set the condition to create a purchase receipt ([b4c992d](frappe@b4c992d))
* Test cases ([7c85b48](frappe@7c85b48))

### Features

* In BOM,  Operation time can be fix (backport [frappe#27063](frappe#27063)) ([frappe#31923](frappe#31923)) ([c2b8d1b](frappe@c2b8d1b))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants