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: allow to change incoming rate manually in case of stand-alone credit note #27036

Merged
merged 3 commits into from
Aug 26, 2021
Merged

fix: allow to change incoming rate manually in case of stand-alone credit note #27036

merged 3 commits into from
Aug 26, 2021

Conversation

rohitwaghchaure
Copy link
Collaborator

@rohitwaghchaure rohitwaghchaure commented Aug 19, 2021 •
edited by marination
Loading

Use case:

There is an issue reported by customer that the Price List Rate defined in the sales invoice is not reflecting in the Stock Asset account when they create the stand-alone credit note with update stock enabled.
Users think that the Price List Rate and Inventory Costing is the same.
We have incoming rate field already in the sales invoice item table, but that field is not editable.

Fix:
Now user able to edit the rate in case of stand-alone credit note

@rohitwaghchaure rohitwaghchaure changed the title fix: allow to change rate manually in case of stand-alone credit note fix: allow to change incoming rate manually in case of stand-alone credit note Aug 19, 2021
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-allow-to-set-incoming-rate-manually branch from ebc0b6b to 6706ea8 Compare August 19, 2021 11:25
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-allow-to-set-incoming-rate-manually branch from 6706ea8 to 90d0bfb Compare August 25, 2021 07:12
@rohitwaghchaure rohitwaghchaure added backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. labels Aug 25, 2021
@coveralls
Copy link

coveralls commented Aug 25, 2021 •
edited
Loading

Coverage Status

Coverage decreased (-0.03%) to 51.356% when pulling 2f3069f on rohitwaghchaure:fixed-allow-to-set-incoming-rate-manually into 642b4c8 on frappe:develop.

@mergify
Copy link
Contributor

mergify bot commented Aug 25, 2021

@coveralls is not allowed to run commands

Hey, I reacted but my real name is @Mergifyio

marination
marination previously approved these changes Aug 25, 2021
View reviewed changes
@marination marination added the CI-failing Unit tests or patch tests are failing. label Aug 25, 2021
@marination
Copy link
Collaborator

@rohitwaghchaure travis failing

@rohitwaghchaure rohitwaghchaure force-pushed the fixed-allow-to-set-incoming-rate-manually branch from 0487789 to 51ceba3 Compare August 25, 2021 17:29
@marination marination removed the CI-failing Unit tests or patch tests are failing. label Aug 26, 2021
@marination marination merged commit fe4540d into frappe:develop Aug 26, 2021
frappe-pr-bot pushed a commit to frappe-pr-bot/erpnext that referenced this pull request Aug 26, 2021
@rohitwaghchaure @frappe-bot
fix: allow to change rate manually in case of stand-alone credit note (…
fe34689 
…frappe#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit fe4540d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@frappe-pr-bot frappe-pr-bot mentioned this pull request Aug 26, 2021
Merged
marination pushed a commit that referenced this pull request Aug 26, 2021
@frappe-pr-bot @rohitwaghchaure @ankush
fix: allow to change incoming rate manually in case of stand-alone cr…
c3b1376 
…edit note (#27164)

* fix: allow to change rate manually in case of stand-alone credit note (#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit fe4540d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: resolve conflicts

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
nabinhait added a commit that referenced this pull request Aug 26, 2021
@rohitwaghchaure @18alantom
@marination @nabinhait @nextchamp-saqib @frappe-pr-bot @ankush @ruchamahabal
chore: merge branch 'version-13-hotfix' into 'version-13-pre-release' (…
7c31e1f 
…#27173)

* feat: add provision for process loss in manufac

* feat: add is process loss autoset and validation

* fix: add warehouse and unset is scrap for process loss items

* refactor: shift auto entry of is process loss check, update validations

* test: add bom tests for process loss val, add se test for qty calc

* fix: add more validations, remove source wh req for pl item

* fix: sider

* refactor: polyfill ??

* fix: sider

* refactor: validation error message formatting

* test: check manufacture completion qty in se and wo

* fix: wo tests, sider, account for pl in se validation

* fix: reword error messages, fix test values

* feat: add procss_loss_qty field in work order

* feat: process loss report, fix set pl query condition

* fix: correct value in test

* fix: get filters to work
- reorder and rename columns
- add work order filter

* fix: Shopping cart Exchange rate validation (#27050)

* fix: Shopping cart Exchange rate validation

- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed

* chore: Comment out obsolete test

- Modifying this test means considering extreme edge cases, which seems pointless now

* fix: Remove snippet that got in due to cherry-pick from `develop`

- This snippet is not present in v13-hotfix. Via #26520

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* feat: initialize party link for customer & suppliers

* feat: toggle to enable common party accounting

* feat: auto create advance entry on invoice submission

* test: creation of advance entry on invoice submission

* fix: remove unwanted filter query

* feat: validate multiple links

* fix: party link permissions

* perf: reduce number of queries to get party link

* fix: cost center & naming series

* fix: cost center in test_sales_invoice_against_supplier

* fix: Don't create inward SLE against SI unless is internal customer enabled (#27086)

* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note

(cherry picked from commit f4dc9ee)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* fix: prevent over riding scrap table values, name kwargs, set currency

* fix(regional): minor fixes and test for South Africa VAT report (#26933) (#27162)

* fix: allow to change incoming rate manually in case of stand-alone credit note (#27164)

* fix: allow to change rate manually in case of stand-alone credit note (#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit fe4540d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: resolve conflicts

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

* fix: Fee Validity fixes (#27161)

* fix: Fee Validity fixes (#27156)

* chore: update Fee Validity form labels

* fix: first appointment should not be considered for Fee Validity

* fix: Fee Validity test cases

* fix: appointment test case

(cherry picked from commit 642b4c8)

* fix: overlapping appointments

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

* fix: Merge conflicts and place internal customer creation util in test_customer.py

* fix: internal customer util returns 'str' not doc object

* fix: negative qty validation on stock reco cancellation (#27170) (#27171)

* test: negative stock validation on SR cancel

* fix: negative stock setting ignored in stock reco

In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.

* test: typo and minor refactor

(cherry picked from commit e7109c1)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

Co-authored-by: 18alantom <2.alan.tom@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Frappe PR Bot <frappe.pr.bot@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
@rohitwaghchaure rohitwaghchaure mentioned this pull request Sep 15, 2021
Merged
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
@rohitwaghchaure @marination
fix: allow to change rate manually in case of stand-alone credit note (…
73d651d 
…frappe#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
@ankush ankush mentioned this pull request Jan 16, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marination marination marination left review comments

@ankush ankush Awaiting requested review from ankush

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007

@nextchamp-saqib nextchamp-saqib Awaiting requested review from nextchamp-saqib

Assignees

@marination marination

Labels
backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rohitwaghchaure @coveralls @marination