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(ux): make PR and PI Item rate field readonly based on Maintain Same Rate #38942

Merged
merged 3 commits into from
Dec 26, 2023
Merged

fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate #38942

merged 3 commits into from
Dec 26, 2023

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Dec 25, 2023

@s-aga-r s-aga-r changed the title fix(ux): make PI Item rate field editable fix(ux): make PI Item rate field readonly based on Maintain Same Rate Dec 25, 2023
@s-aga-r s-aga-r changed the title fix(ux): make PI Item rate field readonly based on Maintain Same Rate fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate Dec 25, 2023
@rtdany10

This comment was marked as resolved.

Sign in to view
@s-aga-r
Copy link
Contributor Author

s-aga-r commented Dec 26, 2023

Even though rate field is made read only, altering the price list rate or adding item wise margin/discount can trigger a rate change 😅 Maybe we should make those fields also read only(?)

P.S Thank you for the quick action on the earlier comment!

Even though rate field is made read only, altering the price list rate or adding item wise margin/discount can trigger a rate change

np with that, the server validation is already there.

@s-aga-r
Copy link
Contributor Author

s-aga-r commented Dec 26, 2023

Unrelated failing tests.

@s-aga-r s-aga-r marked this pull request as ready for review December 26, 2023 04:50
@s-aga-r s-aga-r merged commit e560029 into frappe:develop Dec 26, 2023
11 of 13 checks passed
This was referenced Dec 26, 2023
Merged
Merged
s-aga-r added a commit that referenced this pull request Dec 26, 2023
@mergify @s-aga-r
fix(ux): make PR and PI Item rate field readonly based on `Maintain S…
f704ccb 
…ame Rate` (backport #38942) (#38944)

* fix(ux): make PI Item rate field editable

(cherry picked from commit eb5bb9f)

* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit cb91144)

* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit b1ba210)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
s-aga-r added a commit that referenced this pull request Dec 26, 2023
@mergify @s-aga-r
fix(ux): make PR and PI Item rate field readonly based on `Maintain S…
1eee203 
…ame Rate` (backport #38942) (#38943)

* fix(ux): make PI Item rate field editable

(cherry picked from commit eb5bb9f)

* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit cb91144)

* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit b1ba210)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
@frappe-bot
chore(release): Bumped to Version 14.57.0
6e479f9 
# [14.57.0](v14.56.0...v14.57.0) (2023-12-27)

### Bug Fixes

* allow to set rate manually for service item in BOM ([#38880](#38880)) ([c2f692a](c2f692a))
* display all item rate stop messages ([226d0e0](226d0e0))
* do not reset the basic rate for the material receipt stock entry ([#38896](#38896)) ([98bfcc4](98bfcc4))
* first name error on customer creation ([#38927](#38927)) ([28f052d](28f052d))
* german translations for Lost Quotations ([#38435](#38435)) ([81b5e6c](81b5e6c))
* groups for current accounts in German CoAs ([39aa36e](39aa36e))
* incorrect price list in customer-wise item price report ([7577706](7577706))
* min order qty optional in production plan (backport [#38956](#38956)) ([#38957](#38957)) ([f6f2712](f6f2712))
* remove rows with zero consumed qty ([f2f4100](f2f4100))
* reposting not fixing valuation rate for sales return using movin… ([#38895](#38895)) ([3a668bb](3a668bb))
* reset the incoming rate on changing of the warehouse ([#38909](#38909)) ([2770ca1](2770ca1))
* skip jvs against bank accounts ([98198d3](98198d3))
* **test:** expect account currency when party account is specified. ([30cb218](30cb218))
* unset discount amount from coupon discounts ([87e8dd0](87e8dd0))
* use party account currency when party account is specified ([d9e0d55](d9e0d55))
* **ux:** make PR and PI Item rate field readonly based on `Maintain Same Rate` (backport [#38942](#38942)) ([#38943](#38943)) ([1eee203](1eee203))

### Features

* in_party_currency option for AR/AP reports ([3c717db](3c717db))
* total_asset_cost field (backport [#38879](#38879)) ([#38886](#38886)) ([8169c7d](8169c7d))

### Performance Improvements

* Drop unused/duplicate/sub-optimal indexes (backport [#38884](#38884)) ([#38912](#38912)) ([b254a72](b254a72))
* use estimated rows instead of actual rows (backport [#38830](#38830)) ([#38875](#38875)) ([4d1ccd9](4d1ccd9))
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
@frappe-bot
chore(release): Bumped to Version 15.8.0
f3ab5a3 
# [15.8.0](v15.7.0...v15.8.0) (2023-12-27)

### Bug Fixes

* `Reserved Stock` report (backport [#38922](#38922)) ([#38924](#38924)) ([8f643f0](8f643f0))
* allow to set rate manually for service item in BOM (backport [#38880](#38880)) (backport [#38882](#38882)) ([#38885](#38885)) ([74606dc](74606dc))
* do not make serial batch bundle for zero qty (backport [#38949](#38949)) ([#38954](#38954)) ([a41cf62](a41cf62))
* do not reset the basic rate for the material receipt stock entry (backport [#38896](#38896)) ([#38899](#38899)) ([f6eb2b5](f6eb2b5))
* incorrect price list in customer-wise item price report ([e0dbb57](e0dbb57))
* incorrect qty in serial batch bundle against pick list (backport [#38964](#38964)) ([#38966](#38966)) ([5874be0](5874be0))
* local reference error in BOM (backport [#38850](#38850)) ([#38877](#38877)) ([e3be9c1](e3be9c1))
* min order qty optional in production plan (backport [#38956](#38956)) ([#38958](#38958)) ([ab9fce3](ab9fce3))
* not able to import serial batch bundle using csv (backport [#38950](#38950)) ([#38955](#38955)) ([0e48ef7](0e48ef7))
* reposting not fixing valuation rate for sales return using movin… (backport [#38895](#38895)) (backport [#38897](#38897)) ([#38901](#38901)) ([eabb956](eabb956))
* reset the incoming rate on changing of the warehouse (backport [#38925](#38925)) ([#38926](#38926)) ([82960e3](82960e3))
* **test:** expect account currency when party account is specified. ([2d9a0a8](2d9a0a8))
* typeerror on pos order summary to new order screen ([bf98a8f](bf98a8f))
* typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport [#38870](#38870)) ([#38871](#38871)) ([d75ac13](d75ac13))
* use party account currency when party account is specified ([32d3d4e](32d3d4e))
* **ux:** make PR and PI Item rate field readonly based on `Maintain Same Rate` (backport [#38942](#38942)) ([#38944](#38944)) ([f704ccb](f704ccb))

### Features

* in_party_currency option for AR/AP reports ([a65bc77](a65bc77))
* provision to add items in Stock Reservation dialog (backport [#38558](#38558)) ([#38920](#38920)) ([8c2c90f](8c2c90f))
* total_asset_cost field (backport [#38879](#38879)) ([#38887](#38887)) ([58f1df5](58f1df5))

### Performance Improvements

* Drop unused/duplicate/sub-optimal indexes (backport [#38884](#38884)) ([#38913](#38913)) ([308c6ff](308c6ff))
* use estimated rows instead of actual rows (backport [#38830](#38830)) ([#38876](#38876)) ([648f275](648f275))
@s-aga-r s-aga-r mentioned this pull request Jan 5, 2024
Merged
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 10, 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

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

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees
No one assigned
Labels
backport version-14-hotfix backport to version 14 backport version-15-hotfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@s-aga-r @rtdany10