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: disable partial payment in pos (backport #45752) #45945

Merged
merged 5 commits into from
Feb 17, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 17, 2025

Disable partial payment in POS Invoice.


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

* fix: disable partial payment in pos

* test: disable partial payment

* test: removed print statement

* test: using save method to auto calculate paid_amount

* test: paid_amount calculation using save method

* test: added save method to calculate paid_amount

* test: outstanding amount

* test: added test for partial payments in pos invoice

* fix: custom validation error for partial payment

* test: using partial payment validation

* fix: validate only on submit

(cherry picked from commit d948020)

# Conflicts:
#	erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
Copy link
Contributor Author

mergify bot commented Feb 17, 2025

Cherry-pick of d948020 has failed:

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

You are currently cherry-picking commit d94802067b.
  (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/pos_invoice.py
	modified:   erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
	both modified:   erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.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

@diptanilsaha diptanilsaha merged commit 38edc46 into version-15-hotfix Feb 17, 2025
11 checks passed
@diptanilsaha diptanilsaha deleted the mergify/bp/version-15-hotfix/pr-45752 branch February 17, 2025 11:31
frappe-pr-bot pushed a commit that referenced this pull request Feb 19, 2025
# [15.53.0](v15.52.0...v15.53.0) (2025-02-19)

### Bug Fixes

* add accounting dimensions section in sales order item ([b32e4da](b32e4da))
* add is_new in if condition ([fc2ec7c](fc2ec7c))
* add validate to allow equity account and party_type shareholder ([bb3eb81](bb3eb81))
* allow scrap item with zero qty ([abe5384](abe5384))
* auto create asset due to message error (backport [#45934](#45934)) ([#45952](#45952)) ([830edb8](830edb8))
* check if employee is currently working on another workstation ([22eaa14](22eaa14))
* disable partial payment in pos (backport [#45752](#45752)) ([#45945](#45945)) ([38edc46](38edc46))
* do not reschedule depreciation for fully depreciated asset on scrap ([1e7c5ec](1e7c5ec))
* fetch child account data for selected parent ([#45904](#45904)) ([e36b860](e36b860))
* handle division by zero error (backport [#45966](#45966)) ([#46015](#46015)) ([15106b4](15106b4))
* include missing payment_gateway parameter in Payment Request URL ([18f9476](18f9476))
* letter head for quality inspection ([c289fef](c289fef))
* link correct row item of purchase doc ([87f337b](87f337b))
* make purchase_receipt_item and purchase_invoice_item fields of data type ([281431e](281431e))
* millisecond issue for posting datetime ([4292365](4292365))
* patch for creating asset depreciation schedule records ([f043b46](f043b46))
* pos accounting dimension fieldname error (backport [#45899](#45899)) ([#45921](#45921)) ([e998f06](e998f06))
* **pos profile:** check company while validating mandatory accounting dimension ([#45974](#45974)) ([6a57743](6a57743))
* pos return validation on v15 ([#45951](#45951)) ([dd34bbe](dd34bbe))
* provision to enable naming series for SABB ([8fbfe14](8fbfe14))
* **quotation:** fetch exchange rate on currency change ([bd89c19](bd89c19))
* remove party type from validate ([0d21151](0d21151))
* remove public access to list items (backport [#45838](#45838)) ([#46018](#46018)) ([eead6d4](eead6d4))
* remove unused code ([dd5d144](dd5d144))
* **report:** add options to multiselectlist fields ([7e85a12](7e85a12))
* reset location only if there is value in row item location field ([a509568](a509568))
* resolved conflicts ([84647a1](84647a1))
* round sum amount in JE auditing PF ([#45961](#45961)) ([44e1ca9](44e1ca9))
* **send_message:** escape HTML in the text ([cbec989](cbec989))
* serial no status for internal transfer delivery note ([2b80c00](2b80c00))
* set default value to 0 as per new logic ([1abe1a1](1abe1a1))
* set sco_qty field of PO to non negative ([567fb8a](567fb8a))
* slow query ([8306d6f](8306d6f))
* stock reservation for sales invoice ([1fb5586](1fb5586))
* stock reservation not working for sales invoice with update stock ([7d871f6](7d871f6))
* tests ([f63a9db](f63a9db))
* throw correct exception ([5bccf9f](5bccf9f))
* validate if no matching item found ([6183b38](6183b38))
* validate payment request total of partly paid invoice ([c8881a9](c8881a9))

### Features

* added ability to use custom html format for process statement of accounts (copy [#45746](#45746)) ([#46012](#46012)) ([1a4297a](1a4297a))
* added option to enforce free item qty in pricing rule ([8fb9228](8fb9228))
* disable auto setting grand total to default mode of payment (backport [#45591](#45591)) ([#45917](#45917)) ([e271a5c](e271a5c))
0xD0M1M0 pushed a commit to 0xD0M1M0/erpnext that referenced this pull request Feb 21, 2025
…5945)

* fix: disable partial payment in pos (frappe#45752)

* fix: disable partial payment in pos

* test: disable partial payment

* test: removed print statement

* test: using save method to auto calculate paid_amount

* test: paid_amount calculation using save method

* test: added save method to calculate paid_amount

* test: outstanding amount

* test: added test for partial payments in pos invoice

* fix: custom validation error for partial payment

* test: using partial payment validation

* fix: validate only on submit

(cherry picked from commit d948020)

# Conflicts:
#	erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py

* chore: resolve conflict

* chore: resolve conflict

* chore: resolve linter issue

* test: fixed failing test

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant