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: Data too long for column 'serial_no' at row 1 (backport #40098) #40139

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2024

This is an automatic backport of pull request #40098 done by Mergify.
Cherry-pick of 08caa7c has failed:

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

You are currently cherry-picking commit 08caa7cfa1.
  (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_invoice_item/pos_invoice_item.json
	modified:   erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.py
	modified:   erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
	modified:   erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py
	modified:   erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
	modified:   erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.py
	modified:   erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
	modified:   erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
	modified:   erpnext/stock/doctype/stock_settings/stock_settings.json
	modified:   erpnext/stock/doctype/stock_settings/stock_settings.py
	modified:   erpnext/stock/serial_batch_bundle.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.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


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

(cherry picked from commit 08caa7c)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@rohitwaghchaure rohitwaghchaure merged commit 9d19ec4 into version-15-hotfix Feb 26, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-40098 branch February 26, 2024 17:30
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2024
# [15.15.0](v15.14.7...v15.15.0) (2024-02-28)

### Bug Fixes

* add flags for repost to ensure correct accounting from India Compliance App ([7d14ecf](7d14ecf))
* amount label according to party type ([d541ba3](d541ba3))
* Cannot read properties of undefined (backport [#40081](#40081)) ([#40083](#40083)) ([53d943e](53d943e))
* capacity planning issue in the job card (backport [#40092](#40092)) ([#40101](#40101)) ([27703b5](27703b5))
* change label name ([824df72](824df72))
* check for pricing rules on item ([32d9642](32d9642))
* check_credit_limit on_update_after_submit of Sales Order ([83d7111](83d7111))
* communication_date in party dashboards (backport [#40005](#40005)) ([#40021](#40021)) ([4269ef8](4269ef8))
* Completed Work Orders report not working ([ca03e9c](ca03e9c))
* Cr/Dr notes with POS Payments ([2e07b03](2e07b03))
* currency symbol in landed cost voucher and material request (backport [#40138](#40138)) ([#40141](#40141)) ([57bb031](57bb031))
* Data too long for column 'serial_no' at row 1 (backport [#40098](#40098)) ([#40139](#40139)) ([9d19ec4](9d19ec4))
* default taxable value for item not found in item list ([7e43f6b](7e43f6b))
* delete PLE containing invoice in against ([190bd45](190bd45))
* do not make MR against raw materials of available sub assemblies (backport [#40085](#40085)) ([#40087](#40087)) ([cf5fa21](cf5fa21))
* Fiscal Year exception on demo data setup ([56ee843](56ee843))
* incorrect item name in MR (backport [#40018](#40018)) ([#40024](#40024)) ([9f8f3db](9f8f3db))
* Issues regarding asset cancellation and deletion ([8eb2f67](8eb2f67))
* negative stock error while making stock reconciliation (backport [#40016](#40016)) ([#40026](#40026)) ([c964c45](c964c45))
* on unreconciliation, update advance paid ([4d1f56c](4d1f56c))
* only check for delinked PLEs ([a75a69a](a75a69a))
* only consider contributed qty towards achieved targets ([194f46b](194f46b))
* parent warehouse checks in the production plan for sub-assemblies (backport [#40150](#40150)) ([#40157](#40157)) ([4784117](4784117))
* remove cancelled payment entry from Payment Period Based On Invoice Date ([72da308](72da308))
* remove cancelled payment entry from PPBOID report ([0be5203](0be5203))
* remove config for default bank account in test ([36b442a](36b442a))
* remove microsecond from posting datetime (backport [#40017](#40017)) ([#40022](#40022)) ([eaa3849](eaa3849))
* removed unwanted patch ([ee2d108](ee2d108))
* resolved conflict ([6928674](6928674))
* resolved conflict ([a0c0ab7](a0c0ab7))
* skip max discount validation for rate adjustment ([3b96aae](3b96aae))
* skip SO & DN validation for debit note ([cd42089](cd42089))
* Supplier users not able to see RFQ on the Portal (backport [#40161](#40161)) ([#40165](#40165)) ([6a63a6c](6a63a6c))
* timesheet per billed state edge case (backport [#40010](#40010)) ([#40029](#40029)) ([a543bf4](a543bf4))
* translatable columns in Sales Pipeline Analytics report ([1c5a7e2](1c5a7e2))
* type error for missing frm obj ([6b5e1cf](6b5e1cf))
* unique gl account for plaid bank accounts ([65853da](65853da))
* use correct variable name on hotfix branches ([0694fd1](0694fd1))
* use frm instead of cur_frm ([341f903](341f903))
* use serial batch fields for packed items (backport [#40140](#40140)) ([#40142](#40142)) ([1860399](1860399))

### Features

* show contributed qty in transaction summary ([38abfdb](38abfdb))
* update billed amount in PO and PR ([e7e8149](e7e8149))

### Performance Improvements

* new column Posting Datetime in SLE to optimize stock ledger related queries (backport [#39800](#39800)) ([#40004](#40004)) ([b9181e8](b9181e8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.15.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 Mar 18, 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.

2 participants