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: billed amount in delivery note items #29290

Merged
merged 8 commits into from
Feb 1, 2022
Merged

fix: billed amount in delivery note items #29290

merged 8 commits into from
Feb 1, 2022

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Jan 14, 2022 •
edited
Loading

Source/Reference: ISS-21-22-09729

Issue(s): Delivery Note

Problem:

  • Billed amount becomes "0" if we create a Delivery Note from a Sales Order after a Sales Return.

Proposed Solution:

  • Consider returned quantity at the time of submitting the delivery note and update the billed amount for every item.

Steps to Reproduce:

  • Create Sales Order
  • Create Sales Invoice
  • Create Delivery Note(from Sales Order)
  • Create Sales Return(from Delivery Note)
  • Again Create a Delivery Note(from Sales Order)
Images/GIF

Before:

Screen.Recording.2022-01-31.at.6.54.07.PM.mov

After:

Screen.Recording.2022-01-31.at.6.56.15.PM.mov

@s-aga-r s-aga-r requested a review from marination January 14, 2022 11:07
@deepeshgarg007 deepeshgarg007 self-assigned this Jan 14, 2022
@s-aga-r s-aga-r force-pushed the fix/delivery-note/billed-amount branch from c6181d3 to 0a9ec9f Compare January 14, 2022 13:53
@s-aga-r s-aga-r requested a review from nabinhait January 18, 2022 05:51
@deepeshgarg007
Copy link
Member

@Mergifyio backport develop

@mergify
Copy link
Contributor

mergify bot commented Feb 1, 2022

backport develop

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@deepeshgarg007 deepeshgarg007 merged commit 038f949 into frappe:version-13-hotfix Feb 1, 2022
@mergify mergify bot mentioned this pull request Feb 1, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Feb 1, 2022

backport develop

✅ Backports have been created

@s-aga-r s-aga-r deleted the fix/delivery-note/billed-amount branch February 4, 2022 17:08
deepeshgarg007 added a commit that referenced this pull request Feb 7, 2022
@deepeshgarg007
Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290
2280ae5 
fix: billed amount in delivery note items (backport #29290)
s-aga-r added a commit that referenced this pull request Feb 14, 2022
@s-aga-r
Revert "fix: billed amount in delivery note items (backport #29290)"
0f3de72
@s-aga-r s-aga-r restored the fix/delivery-note/billed-amount branch February 14, 2022 08:21
s-aga-r added a commit to s-aga-r/erpnext that referenced this pull request Feb 14, 2022
@s-aga-r
Revert "Merge pull request frappe#29290 from s-aga-r/fix/delivery-not…
2531513 
…e/billed-amount"

This reverts commit 038f949, reversing
changes made to c7b4918.
@s-aga-r s-aga-r mentioned this pull request Feb 14, 2022
Merged
ankush pushed a commit that referenced this pull request Feb 14, 2022
@s-aga-r
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/bil…
7fa46f7 
…led-amount" (#29782)

* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f949, reversing
changes made to c7b4918.

* fix: linter
mergify bot pushed a commit that referenced this pull request Feb 15, 2022
@s-aga-r
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/bil…
33e850a 
…led-amount" (#29782)

* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f949, reversing
changes made to c7b4918.

* fix: linter

(cherry picked from commit 7fa46f7)

# Conflicts:
#	erpnext/patches.txt
@s-aga-r s-aga-r deleted the fix/delivery-note/billed-amount branch February 18, 2022 08:11
@s-aga-r s-aga-r restored the fix/delivery-note/billed-amount branch February 18, 2022 08:11
@rohitwaghchaure rohitwaghchaure mentioned this pull request Feb 21, 2022
Merged
@commit-lint commit-lint bot mentioned this pull request Mar 8, 2022
Merged
ankush pushed a commit that referenced this pull request Mar 11, 2022
@mergify @s-aga-r
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/bil…
b085e96 
…led-amount" (#29782) (#29807)

* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f949, reversing
changes made to c7b4918.

* fix: linter

(cherry picked from commit 7fa46f7)

# Conflicts:
#	erpnext/patches.txt

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
@s-aga-r s-aga-r added bug and removed accounts labels Sep 21, 2022
@s-aga-r s-aga-r deleted the fix/delivery-note/billed-amount branch April 15, 2023 09:59
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 deepeshgarg007 approved these changes

@marination marination Awaiting requested review from marination

@ankush ankush Awaiting requested review from ankush

@nabinhait nabinhait Awaiting requested review from nabinhait

Assignees

@deepeshgarg007 deepeshgarg007

Labels
bug
Projects
None yet
Milestone
No milestone
Development

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