-
Notifications
You must be signed in to change notification settings - Fork 7.1k
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: per_billed for return DN #30868
Merged
ankush
merged 3 commits into
frappe:develop
from
s-aga-r:delivery-note/issues/per-billed
May 11, 2022
Merged
fix: per_billed for return DN #30868
ankush
merged 3 commits into
frappe:develop
from
s-aga-r:delivery-note/issues/per-billed
May 11, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s-aga-r
requested review from
deepeshgarg007,
nextchamp-saqib,
marination,
ankush and
rohitwaghchaure
as code owners
May 2, 2022 09:17
s-aga-r
force-pushed
the
delivery-note/issues/per-billed
branch
from
May 2, 2022 23:04
ce5ac7f
to
7e43725
Compare
s-aga-r
force-pushed
the
delivery-note/issues/per-billed
branch
from
May 3, 2022 00:29
7e43725
to
6c27f9d
Compare
ankush
reviewed
May 10, 2022
Codecov Report
@@ Coverage Diff @@
## develop #30868 +/- ##
===========================================
+ Coverage 62.74% 62.98% +0.24%
===========================================
Files 983 983
Lines 67103 67106 +3
===========================================
+ Hits 42102 42266 +164
+ Misses 25001 24840 -161
|
ankush
approved these changes
May 11, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
mergify bot
pushed a commit
that referenced
this pull request
May 11, 2022
* fix: per_billed for return DN * chore: move patch from v14 to v13 (cherry picked from commit 1a70701) # Conflicts: # erpnext/patches.txt
mergify bot
added a commit
that referenced
this pull request
May 11, 2022
This is a semi-automatic backport of pull request #30868 done by [Mergify](https://mergify.com).
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 17, 2022
# [13.30.0](v13.29.2...v13.30.0) (2022-05-17) ### Bug Fixes * `set_missing_values` in SE and re-use the same on all SE mappings ([fe52c1f](fe52c1f)) * Add validation for SEZ and Export invoices without payment of taxes ([cb8453d](cb8453d)) * allow to use formatting for the field to_discuss in opportunity ([e126d4e](e126d4e)) * Block 0 Qty via Update Items to be consistent with form validation ([5647875](5647875)) * Calculate totals even though pricing rule is not applied on mapped doc ([678a01d](678a01d)) * **charts:** Pass fieldtype for chart data in selling reports ([917e7c3](917e7c3)) * conflicts ([87fd933](87fd933)) * conflicts ([fb62bbf](fb62bbf)) * disable pricing rules for internal transfers (backport [#31034](#31034)) ([#31036](#31036)) ([d5eb9fb](d5eb9fb)) * discount ledger entry in case of multicurrency invoice ([#31047](#31047)) ([c3417e4](c3417e4)) * dont fail repost for recoverable errors (backport [#30979](#30979)) ([#31023](#31023)) ([a019cb6](a019cb6)) * **Employee Advance:** Return/Deduction from Salary button visibility (backport [#31011](#31011)) ([#31012](#31012)) ([5b1d85e](5b1d85e)) * Failing accounting dimension patch ([b14a7b8](b14a7b8)) * german translations for Employee ([b9bda04](b9bda04)) * gl entry validation for miniscule loan penalty ([e958ef2](e958ef2)) * hide template items from sales/purchase order ([8b99f43](8b99f43)) * IN time not captured in Attendance through Employee Checkin (backport [#31029](#31029)) ([#31031](#31031)) ([477bbcc](477bbcc)) * Item rate reset on changing posting date ([#30990](#30990)) ([8ef649f](8ef649f)) * Just add one rate in GST HSN Code ([ed76687](ed76687)) * Merge Conflicts ([3abf264](3abf264)) * Multiple fixes in GSTR-1 report ([f2cbb70](f2cbb70)) * **patch:** avoid checking for return field if it doesnt exits (backport [#30995](#30995)) ([#30997](#30997)) ([a94b5c0](a94b5c0)) * per_billed for return DN (backport [#30868](#30868)) ([#30971](#30971)) ([97ea1f5](97ea1f5)) * precision loss when transferring (backport [#30834](#30834)) ([#31032](#31032)) ([fc80a50](fc80a50)) * precision of total penalty paid ([ad21853](ad21853)) * precision of total penalty paid ([5c45737](5c45737)) * prevent bypassing forced valuation rate (backport [#30987](#30987)) ([#31020](#31020)) ([706c19d](706c19d)) * pro rata calculation for monthly depreciation ([#30989](#30989)) ([408d952](408d952)) * remove item attribute limit from variant selector (backport [#31026](#31026)) ([#31028](#31028)) ([1f016e9](1f016e9)) * Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`) ([30b0aee](30b0aee)) * stock analytics report shows incorrect data there's no stock movement in a period (backport [#30945](#30945)) ([#30980](#30980)) ([295ffb3](295ffb3)) * translation for status filter ([e5f8231](e5f8231)) * **translations:** Update ru translations ([#30992](#30992)) ([f797005](f797005)) * TypeError in add_indicator_for_multicompany (backport [#31042](#31042)) ([#31048](#31048)) ([e24bb1d](e24bb1d)) * unlink Attendance from Employee Checkins on cancellation (backport [#31045](#31045)) ([#31049](#31049)) ([e03fe97](e03fe97)) * UOM in HSN-wise summary of outward supply ([cd7d5cd](cd7d5cd)) * user can select disabled accounts in taxes table ([047c879](047c879)) * validate disabled accounts before posting ledger entries ([515e49b](515e49b)) * validate on hold purchase invoices in payment entry ([9fbd170](9fbd170)) ### Features * add Employee Status filter in leave balance reports ([716b525](716b525)) * add Link to Opportunity ([#30614](#30614)) ([bc23bc7](bc23bc7)) * request_for_quotation ([db4e264](db4e264)) * request_for_quotation - refactor ([b6a3e69](b6a3e69)) * select multiple values for accounting dimension (backport [#31015](#31015)) ([#31041](#31041)) ([9c21eb5](9c21eb5))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Source/Reference: ISS-21-22-10746
Issue(s): Delivery Note
Steps to replicate
Create = Save + Submit
Problem and Proposed Solution
Problem:
Proposed Solution:
Images/GIF
Before:
https://user-images.githubusercontent.com/63660334/166216659-52924f8a-74ca-4bb0-bcde-1816ebfec6cc.mov
After:
https://user-images.githubusercontent.com/63660334/166216692-04768235-bd45-44c8-a678-f72c41c64099.mov