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: incorrect gross profit on the quotation #40438

Conversation

rohitwaghchaure
Copy link
Collaborator

Issue

Screenshot 2024-03-13 at 5 32 04 PM

After Fix
Screenshot 2024-03-13 at 5 31 26 PM

@rohitwaghchaure rohitwaghchaure merged commit f4a945a into frappe:develop Mar 13, 2024
14 checks passed
mergify bot pushed a commit that referenced this pull request Mar 13, 2024
mergify bot pushed a commit that referenced this pull request Mar 13, 2024
rohitwaghchaure added a commit that referenced this pull request Mar 13, 2024
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
rohitwaghchaure added a commit that referenced this pull request Mar 13, 2024
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Mar 14, 2024
## [14.65.2](v14.65.1...v14.65.2) (2024-03-14)

### Bug Fixes

* added index for price_list column in Item Price ([d279e23](d279e23))
* Book depreciation until the asset disposal date and removed unwanted commits ([5fcf8c5](5fcf8c5))
* convert str to date ([34c3e75](34c3e75))
* flaky Accounts Receivable test case ([41bda58](41bda58))
* incorrect gross profit on the quotation (backport [#40438](#40438)) ([#40441](#40441)) ([fe54590](fe54590))
* linter issues ([ac0dd50](ac0dd50))
* linter issues ([668a931](668a931))
* linter issues ([acc0b2f](acc0b2f))
* minor fixes ([5cd9bf3](5cd9bf3))
* Patch to remove cancelled asset capitalization from asset ([23e256a](23e256a))
* Reload document on cancel to avoid document modified error ([c7ed854](c7ed854))
* **test:** manually filter rows and assert ([5fe200b](5fe200b))

### Performance Improvements

* Cache accounting dimension filter map ([e4bd173](e4bd173))
* Cached accounting dimensions details ([8cd8b8f](8cd8b8f))
* Caching in checking allowance for qty and amount ([8d682fa](8d682fa))
* Caching in gl entry ([b07769d](b07769d))
* Get bin details only for stock items ([6ff9e6e](6ff9e6e))
* Optimization for providional gl entries ([d7b738f](d7b738f))
* Optimzed code for merging similar gl entries ([aa75a60](aa75a60))
* Performance optimization for validating budget ([f204d81](f204d81))
* refactored handling provisional gl entries for non-stock items ([49c7436](49c7436))
* skip unnecessary validation while transaction  cancellation ([05385e4](05385e4))
* validate expense against budget only if budget exists ([c15b2d5](c15b2d5))
frappe-pr-bot pushed a commit that referenced this pull request Mar 20, 2024
## [15.17.2](v15.17.1...v15.17.2) (2024-03-20)

### Bug Fixes

* achieved targets for sales partners ([1ac8887](1ac8887))
* advance journal fetching logic in Advances section ([bfa78aa](bfa78aa))
* attribute error on Bank Statement Import retry ([a0bf22c](a0bf22c))
* auto-update due date for invoices via data import ([9cdde50](9cdde50))
* balance qty in the stock ledger report (backport [#40506](#40506)) ([#40507](#40507)) ([69f442d](69f442d))
* currency symbol for Landed Cost Voucher Amount (backport [#40550](#40550)) ([#40554](#40554)) ([1c90797](1c90797))
* Data too long for column 'stock_queue' (backport [#40436](#40436)) ([#40451](#40451)) ([ba6b856](ba6b856))
* don't validate for currency, if account is unavailable ([5729ee5](5729ee5))
* flaky Accounts Receivable test case ([0bb4a7d](0bb4a7d))
* incorrect gross profit on the quotation (backport [#40438](#40438)) ([#40442](#40442)) ([ce2626e](ce2626e))
* index error on Exchange Rate Revaluation creation ([ebd967d](ebd967d))
* invalid exchange loss booking on invoice againts base accounts ([72c9cd5](72c9cd5))
* missing range for ageing summary ([dacc69c](dacc69c))
* not able to delete cancelled delivery note (backport [#40508](#40508)) ([#40510](#40510)) ([917a21b](917a21b))
* rate changing while making PR (negative discount) (backport [#40539](#40539)) ([#40540](#40540)) ([0bdda12](0bdda12))
* Remove custom queries for customer ([3133505](3133505))
* serial and batch for internal transfer (backport [#40467](#40467)) ([#40477](#40477)) ([61d59b3](61d59b3))
* show correct variance for durations with no vouchers ([bc78bc3](bc78bc3))
* stock reco negative batch (backport [#40533](#40533)) ([#40535](#40535)) ([7f1f780](7f1f780))
* stopped mr showing in the popup (backport [#40478](#40478)) ([#40480](#40480)) ([74b30a6](74b30a6))
* **Supplier Quotation Comparison:** group by options ([1e16d2c](1e16d2c))
* Taxes not getting updated on change ([75b610d](75b610d))
* **test:** manually filter rows and assert ([df13517](df13517))
* Update Existing Price List Rate not working (backport [#40333](#40333)) ([#40527](#40527)) ([44bbf4b](44bbf4b))
* use in_import flag for checking imported records ([8242a9c](8242a9c))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 30, 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.

1 participant