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: payment term when creating PO from SO #41376

Merged
merged 4 commits into from
Jun 3, 2024

Conversation

Nihantra-Patel
Copy link
Contributor

Version 15 and 14,

fixes: #41369

Before:

before_so_to_po.mp4

After:

after_so_to_po.mp4

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label May 8, 2024
Copy link
Contributor

@IMS94 IMS94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick fix. Added a minor comment.

@@ -1239,11 +1239,18 @@ def set_missing_values(source, target):
target.discount_amount = 0.0
target.inter_company_order_reference = ""
target.shipping_rule = ""
target.tc_name = ""
target.terms = ""
target.payment_terms_template = ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the payment_schedule should be cleared. Only clearing the payment_terms_template didn't work for me. The payment_schedule still got copied.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only works properly in version 15. I think the issue will be in version 14, but I fixed it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@stale stale bot added the inactive label May 25, 2024
@frappe frappe deleted a comment from stale bot May 26, 2024
@nabinhait nabinhait merged commit 441596f into frappe:develop Jun 3, 2024
13 checks passed
mergify bot pushed a commit that referenced this pull request Jun 3, 2024
* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

(cherry picked from commit 441596f)
mergify bot pushed a commit that referenced this pull request Jun 3, 2024
* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

(cherry picked from commit 441596f)
nabinhait pushed a commit that referenced this pull request Jun 3, 2024
fix: payment term when creating PO from SO (#41376)

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

(cherry picked from commit 441596f)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
nabinhait pushed a commit that referenced this pull request Jun 3, 2024
fix: payment term when creating PO from SO (#41376)

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

(cherry picked from commit 441596f)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 5, 2024
## [14.70.4](v14.70.3...v14.70.4) (2024-06-05)

### Bug Fixes

* Filters in account balance report ([570985f](570985f))
* get assets received but not billed account only if any asset item is received ([#41734](#41734)) ([39885b2](39885b2))
* Ignore disabling default currency field while creating new company (backport [#41699](#41699)) ([#41760](#41760)) ([5ab5bd1](5ab5bd1))
* payment term when creating PO from SO (backport [#41376](#41376)) ([#41743](#41743)) ([dc32657](dc32657))
frappe-pr-bot pushed a commit that referenced this pull request Jun 5, 2024
# [15.27.0](v15.26.1...v15.27.0) (2024-06-05)

### Bug Fixes

* Auditor permissions (backport [#41659](#41659)) ([#41661](#41661)) ([27f3981](27f3981))
* bank account no fieldname mismatch (backport [#41778](#41778)) ([#41783](#41783)) ([b94a6f2](b94a6f2))
* batch selection issue (backport [#41692](#41692)) ([#41693](#41693)) ([24775db](24775db))
* **Company:** Allow Equity type account in unrealised exchange gain/loss account (backport [#41740](#41740)) ([#41747](#41747)) ([460ee5d](460ee5d))
* condition filter for transaction pricing rule ([e493b11](e493b11))
* convert percentage from str to float (backport [#41766](#41766)) ([#41776](#41776)) ([cd0852f](cd0852f))
* Copy depreciation schedule on asset split only if it exists (backport [#41775](#41775)) ([#41784](#41784)) ([03bf480](03bf480))
* filtered out data having none values in date field (backport [#41457](#41457)) ([#41765](#41765)) ([97b1b7f](97b1b7f))
* Filters in account balance report ([0b9d89b](0b9d89b))
* French chart of account the 4191 code must be of type Income Account ([797b718](797b718))
* get assets received but not billed account only if any asset item is received (backport [#41734](#41734)) ([#41735](#41735)) ([638c944](638c944))
* Ignore disabling default currency field while creating new company (backport [#41699](#41699)) ([#41761](#41761)) ([dc922ab](dc922ab))
* incorrect accumulated depr amount in asset depr ledger (backport [#41654](#41654)) ([#41763](#41763)) ([a93cd02](a93cd02))
* incorrect batch selection while sales return (backport [#41768](#41768)) ([#41772](#41772)) ([95c0dc9](95c0dc9))
* key error for stock ledger report (backport [#41700](#41700)) ([#41703](#41703)) ([b22d714](b22d714))
* link opportunity in prospect after creating opportunity from prospect (backport [#41769](#41769)) ([#41777](#41777)) ([d30aee5](d30aee5))
* local var referenced before assignment (backport [#41780](#41780)) ([#41782](#41782)) ([3777cae](3777cae))
* **minor:** corrected wrong filter condition (backport [#41755](#41755)) ([#41762](#41762)) ([a67fa68](a67fa68))
* payment term when creating PO from SO (backport [#41376](#41376)) ([#41744](#41744)) ([806ff5b](806ff5b))
* Select both account number and company in the account form (backport [#41731](#41731)) ([#41737](#41737)) ([c5d72cd](c5d72cd))
* show material to supplier button (backport [#41686](#41686)) ([#41688](#41688)) ([1a24914](1a24914))
* **stock settings:** Allowed any number in stock frozen upto days field (backport [#41736](#41736)) ([#41749](#41749)) ([278682f](278682f))
* test for pricing rule transaction with cond ([0823de8](0823de8))
* Transaction currency value in Journal Entry (backport [#41717](#41717)) ([#41720](#41720)) ([77f58ca](77f58ca))
* TypeError: 'float' object is not iterable (backport [#41758](#41758)) ([#41764](#41764)) ([12addb7](12addb7))
* Use full name instead of abbreviation ([#41759](#41759)) ([5448d5d](5448d5d))
* work order created message pops up if no items are selected (backport [#41677](#41677)) ([#41682](#41682)) ([4e9faf6](4e9faf6))

### Features

* optional to reconcile all serial nos / batches in stock reconciliation (backport [#41696](#41696)) ([#41713](#41713)) ([38249f4](38249f4))
earona pushed a commit to NovigoTechnology/erpnext that referenced this pull request Jun 6, 2024
## [15.0.1](v15.0.0-Novigo...v15.0.1-Novigo) (2024-06-06)

### Bug Fixes

* Add posting date to key for consolidated view ([2c164b4](2c164b4))
* bank account no fieldname mismatch ([frappe#41778](https://github.com/NovigoTechnology/erpnext/issues/41778)) ([d163dbe](d163dbe))
* **Company:** Allow Equity type account in unrealised exchange gain/loss account ([frappe#41740](https://github.com/NovigoTechnology/erpnext/issues/41740)) ([d30c797](d30c797))
* completed DC will not appear in a delivery trip ([frappe#41655](https://github.com/NovigoTechnology/erpnext/issues/41655)) ([4f0214d](4f0214d))
* convert percentage from str to float ([frappe#41766](https://github.com/NovigoTechnology/erpnext/issues/41766)) ([71f5470](71f5470))
* Copy depreciation schedule on asset split only if it exists ([frappe#41775](https://github.com/NovigoTechnology/erpnext/issues/41775)) ([689e1cf](689e1cf))
* correcting balance sheet calculation for zero liabilities and equity ([frappe#41497](https://github.com/NovigoTechnology/erpnext/issues/41497)) ([3c33135](3c33135))
* Do no apply pricing rule on qty change for mapped docs ([2b12421](2b12421))
* get assets received but not billed account only if any asset item is received (backport [frappe#41734](https://github.com/NovigoTechnology/erpnext/issues/41734)) ([frappe#41750](https://github.com/NovigoTechnology/erpnext/issues/41750)) ([c3ae5bc](c3ae5bc))
* Ignore disabling default currency field while creating new company ([frappe#41699](https://github.com/NovigoTechnology/erpnext/issues/41699)) ([80f6228](80f6228))
* incorrect accumulated depr amount in asset depr ledger ([frappe#41654](https://github.com/NovigoTechnology/erpnext/issues/41654)) ([a8fc32d](a8fc32d))
* incorrect batch selection while sales return ([frappe#41768](https://github.com/NovigoTechnology/erpnext/issues/41768)) ([cb6d8af](cb6d8af))
* link opportunity in prospect after creating opportunity from prospect ([frappe#41769](https://github.com/NovigoTechnology/erpnext/issues/41769)) ([12e48f0](12e48f0))
* local var referenced before assignment ([frappe#41780](https://github.com/NovigoTechnology/erpnext/issues/41780)) ([4ff3e6c](4ff3e6c))
* **minor:** corrected wrong filter condition ([frappe#41755](https://github.com/NovigoTechnology/erpnext/issues/41755)) ([60eb03a](60eb03a))
* payment term when creating PO from SO ([frappe#41376](https://github.com/NovigoTechnology/erpnext/issues/41376)) ([441596f](441596f))
* Select both account number and company in the account form ([frappe#41731](https://github.com/NovigoTechnology/erpnext/issues/41731)) ([5a75c84](5a75c84))
* set expense account as Assets RBNB only if it is booked in linked PR (backport [frappe#41368](https://github.com/NovigoTechnology/erpnext/issues/41368)) ([frappe#41733](https://github.com/NovigoTechnology/erpnext/issues/41733)) ([a2039ba](a2039ba))
* **stock settings:** Allowed any number in stock frozen upto days field ([frappe#41736](https://github.com/NovigoTechnology/erpnext/issues/41736)) ([740c495](740c495))
* TypeError: 'float' object is not iterable ([frappe#41758](https://github.com/NovigoTechnology/erpnext/issues/41758)) ([cf508ce](cf508ce))
* Use full name instead of abbreviation ([frappe#41738](https://github.com/NovigoTechnology/erpnext/issues/41738)) ([9a3569f](9a3569f))
* **Vehicle:** allow doc renaming and add test ([frappe#41729](https://github.com/NovigoTechnology/erpnext/issues/41729)) ([c76f466](c76f466))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 backport version-15-hotfix needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When creating a Purchase Order from a Sales Order, supplier's default payment terms template isn't being used
3 participants