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: Conversion factor error for invoices without item code (petty expenses) #32714

Merged
merged 5 commits into from
Dec 29, 2022
Merged

fix: Conversion factor error for invoices without item code (petty expenses) #32714

merged 5 commits into from
Dec 29, 2022

Conversation

deepeshgarg007
Copy link
Member

Fixes: #24641

@deepeshgarg007 deepeshgarg007 mentioned this pull request Oct 28, 2022
Closed
@deepeshgarg007 deepeshgarg007 changed the title fix: Set default uom conversion factor to 1 for invoices fix: Conversion factor error for invoices without item code (petty expenses) Dec 28, 2022
@codecov
Copy link

codecov bot commented Dec 28, 2022 •
edited

Codecov Report

Merging #32714 (7a17924) into develop (d2686ce) will decrease coverage by 0.00%.
The diff coverage is 58.82%.

❗ Current head 7a17924 differs from pull request most recent head dff80f7. Consider uploading reports for the commit dff80f7 to get more accurate results

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop   #32714      +/-   ##
===========================================
- Coverage    64.08%   64.07%   -0.01%     
===========================================
  Files          818      818              
  Lines        58724    58743      +19     
===========================================
+ Hits         37631    37642      +11     
- Misses       21093    21101       +8
Impacted Files Coverage Δ
erpnext/erpnext_integrations/exotel_integration.py 68.04% <46.15%> (-3.73%) ⬇️
erpnext/controllers/accounts_controller.py 85.04% <100.00%> (+0.03%) ⬆️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 81.75% <0.00%> (-0.09%) ⬇️
...xt/buying/doctype/purchase_order/purchase_order.py 78.27% <0.00%> (+0.26%) ⬆️

@deepeshgarg007 deepeshgarg007 merged commit 6175183 into frappe:develop Dec 29, 2022
@mergify mergify bot mentioned this pull request Dec 29, 2022
Merged
mergify bot pushed a commit that referenced this pull request Dec 29, 2022
@deepeshgarg007 @mergify
fix: Conversion factor error for invoices without item code (petty ex…
084f10e 
…penses) (#32714)

* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 6175183)
mergify bot pushed a commit that referenced this pull request Dec 29, 2022
@deepeshgarg007 @mergify
fix: Conversion factor error for invoices without item code (petty ex…
acf8b46 
…penses) (#32714)

* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 6175183)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@mergify mergify bot mentioned this pull request Dec 29, 2022
Merged
deepeshgarg007 added a commit that referenced this pull request Dec 30, 2022
@mergify @deepeshgarg007
fix: Conversion factor error for invoices without item code (petty ex…
ba5a149 
…penses) (#32714)

fix: Conversion factor error for invoices without item code (petty expenses) (#32714)

* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 6175183)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
deepeshgarg007 added a commit that referenced this pull request Dec 31, 2022
@deepeshgarg007
Merge pull request #33478 from frappe/mergify/bp/version-13-hotfix/pr…
6ab9134 
…-32714

fix: Conversion factor error for invoices without item code (petty expenses) (backport #32714)
frappe-pr-bot pushed a commit that referenced this pull request Jan 4, 2023
@frappe-bot
chore(release): Bumped to Version 14.12.0
aab856c 
# [14.12.0](v14.11.1...v14.12.0) (2023-01-04)

### Bug Fixes

* [concurrency issue] incorrect picked qty in sales order ([e7254fd](e7254fd))
* `fg_item_qty` in non-subcontracted PO ([6e15331](6e15331))
* `shipping_address` for non-drop shipping item ([a7a3654](a7a3654))
* `shipping_address` in PO ([448fbe5](448fbe5))
* add missing 'ordered_qty' to get_bin_details ([55e8e45](55e8e45))
* consider child nodes while getting bin details ([e296408](e296408))
* Conversion factor error for invoices without item code (petty expenses) ([#32714](#32714)) ([ba5a149](ba5a149))
* Customer Primary Contact (backport [#33424](#33424)) ([#33440](#33440)) ([73c9820](73c9820))
* Default dimensions on fetching items from BOM (backport [#33439](#33439)) ([#33459](#33459)) ([a332b22](a332b22))
* Deferred revenue date comparison ([#33515](#33515)) ([027510b](027510b))
* ERR journals reported in AR/AP ([823b352](823b352))
* Get payment entry button not visible in Bank Clearance doc (backport [#33518](#33518)) ([#33525](#33525)) ([fcf052d](fcf052d))
* Missing opening entry in general ledger (backport [#33519](#33519)) ([#33526](#33526)) ([8e375db](8e375db))
* Multi-currency issues in Bank Reconciliation Tool ([#33488](#33488)) ([d030852](d030852))
* Multiple rows for same warehouse and batches in pick list (backport [#33456](#33456)) ([#33458](#33458)) ([a166a76](a166a76))
* payment terms and sales partner filter issue in AR/AP report ([0f6790b](0f6790b))
* **pricing rule:** consider child tables in condition (backport [#33469](#33469)) ([#33470](#33470)) ([3bceb47](3bceb47))
* Random behaviour while picking items using picklist (backport [#33449](#33449)) ([#33450](#33450)) ([1edde9c](1edde9c))
* set `supplier` details while mapping SE(Send to Subcontractor) ([06e13b6](06e13b6))
* timeout error while submitting stock entry ([f30f77c](f30f77c))
* typerror on multi warehouse in Packed Items ([9b24940](9b24940))
* use base_net_amount in case of missing stock qty ([#33457](#33457)) ([88ca780](88ca780))

### Features

* Accounting Dimension updation in Payment Request and Entry ([#33411](#33411)) ([e7704b2](e7704b2))
frappe-pr-bot pushed a commit that referenced this pull request Jan 4, 2023
@frappe-bot
chore(release): Bumped to Version 13.43.0
3efa521 
# [13.43.0](v13.42.7...v13.43.0) (2023-01-04)

### Bug Fixes

* `shipping_address` for non-drop shipping item ([19feebb](19feebb))
* `shipping_address` in PO ([1068d0e](1068d0e))
* add missing 'ordered_qty' to get_bin_details ([66ba098](66ba098))
* conflicts ([8521e12](8521e12))
* conflicts ([1c7c591](1c7c591))
* conflicts ([c18a451](c18a451))
* consider child nodes while getting bin details ([c9bf062](c9bf062))
* Conversion factor error for invoices without item code (petty expenses) ([#32714](#32714)) ([acf8b46](acf8b46))
* debit note not pulled on reconciliation tool ([cf133b2](cf133b2))
* Deferred revenue date comparison (backport [#33515](#33515)) ([#33517](#33517)) ([ea99ac9](ea99ac9))
* **ecommerce:** remove query parameters from referrer (backport [#33269](#33269)) ([#33513](#33513)) ([6516e80](6516e80))
* ERR journals reported in AR/AP ([c850635](c850635))
* linter ([f0475e9](f0475e9))
* Missing opening entry in general ledger (backport [#33519](#33519)) ([#33527](#33527)) ([865f233](865f233))
* Multi-currency issues in Bank Reconciliation Tool (backport [#33488](#33488)) ([#33493](#33493)) ([4ba2f1e](4ba2f1e))
* No permission to read doctype ([8e1c0cd](8e1c0cd))
* patch ([7b813d6](7b813d6))
* provision to set tax_deducted_till_date after document is subnmmited ([64454e0](64454e0))
* reconciled credit notes being fetched again in Payment Reconciliation tool ([#33471](#33471)) ([5ec11ba](5ec11ba))
* Tax withheld vouchers naming rule ([#33467](#33467)) ([334219e](334219e))
* **test:** holiday list dates in attendance test setup ([8df1151](8df1151))
* **test:** monthly attendance sheet ([e5a187e](e5a187e))
* typerror on multi warehouse in Packed Items ([6a394c5](6a394c5))
* use base_net_amount in case of missing stock qty ([#33457](#33457)) ([6e363a6](6e363a6))
* use get_all instead of get_value as get_value api dont supports between condition ([bc04e05](bc04e05))

### Features

* explicit time period for mark attendance ([d2f86ea](d2f86ea))
* provision to setup opening balances for earnings and deductions while creating SSA ([c3b9059](c3b9059))
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
@deepeshgarg007 @developmentforpeople
fix: Conversion factor error for invoices without item code (petty ex…
ff7df96 
…penses) (frappe#32714)

* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 6175183)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
@frappe-bot @developmentforpeople
chore(release): Bumped to Version 13.43.0
979d454 
# [13.43.0](frappe/erpnext@v13.42.7...v13.43.0) (2023-01-04)

### Bug Fixes

* `shipping_address` for non-drop shipping item ([19feebb](frappe@19feebb))
* `shipping_address` in PO ([1068d0e](frappe@1068d0e))
* add missing 'ordered_qty' to get_bin_details ([66ba098](frappe@66ba098))
* conflicts ([8521e12](frappe@8521e12))
* conflicts ([1c7c591](frappe@1c7c591))
* conflicts ([c18a451](frappe@c18a451))
* consider child nodes while getting bin details ([c9bf062](frappe@c9bf062))
* Conversion factor error for invoices without item code (petty expenses) ([frappe#32714](frappe#32714)) ([acf8b46](frappe@acf8b46))
* debit note not pulled on reconciliation tool ([cf133b2](frappe@cf133b2))
* Deferred revenue date comparison (backport [frappe#33515](frappe#33515)) ([frappe#33517](frappe#33517)) ([ea99ac9](frappe@ea99ac9))
* **ecommerce:** remove query parameters from referrer (backport [frappe#33269](frappe#33269)) ([frappe#33513](frappe#33513)) ([6516e80](frappe@6516e80))
* ERR journals reported in AR/AP ([c850635](frappe@c850635))
* linter ([f0475e9](frappe@f0475e9))
* Missing opening entry in general ledger (backport [frappe#33519](frappe#33519)) ([frappe#33527](frappe#33527)) ([865f233](frappe@865f233))
* Multi-currency issues in Bank Reconciliation Tool (backport [frappe#33488](frappe#33488)) ([frappe#33493](frappe#33493)) ([4ba2f1e](frappe@4ba2f1e))
* No permission to read doctype ([8e1c0cd](frappe@8e1c0cd))
* patch ([7b813d6](frappe@7b813d6))
* provision to set tax_deducted_till_date after document is subnmmited ([64454e0](frappe@64454e0))
* reconciled credit notes being fetched again in Payment Reconciliation tool ([frappe#33471](frappe#33471)) ([5ec11ba](frappe@5ec11ba))
* Tax withheld vouchers naming rule ([frappe#33467](frappe#33467)) ([334219e](frappe@334219e))
* **test:** holiday list dates in attendance test setup ([8df1151](frappe@8df1151))
* **test:** monthly attendance sheet ([e5a187e](frappe@e5a187e))
* typerror on multi warehouse in Packed Items ([6a394c5](frappe@6a394c5))
* use base_net_amount in case of missing stock qty ([frappe#33457](frappe#33457)) ([6e363a6](frappe@6e363a6))
* use get_all instead of get_value as get_value api dont supports between condition ([bc04e05](frappe@bc04e05))

### Features

* explicit time period for mark attendance ([d2f86ea](frappe@d2f86ea))
* provision to setup opening balances for earnings and deductions while creating SSA ([c3b9059](frappe@c3b9059))
@barredterra barredterra mentioned this pull request Mar 7, 2023
Closed
BevanTony1 pushed a commit to BevanTony1/eso-erpnext that referenced this pull request Mar 23, 2023
@frappe-bot @BevanTony1
chore(release): Bumped to Version 13.43.0
8a9ea1e 
# [13.43.0](frappe/erpnext@v13.42.7...v13.43.0) (2023-01-04)

### Bug Fixes

* `shipping_address` for non-drop shipping item ([19feebb](frappe@19feebb))
* `shipping_address` in PO ([1068d0e](frappe@1068d0e))
* add missing 'ordered_qty' to get_bin_details ([66ba098](frappe@66ba098))
* conflicts ([8521e12](frappe@8521e12))
* conflicts ([1c7c591](frappe@1c7c591))
* conflicts ([c18a451](frappe@c18a451))
* consider child nodes while getting bin details ([c9bf062](frappe@c9bf062))
* Conversion factor error for invoices without item code (petty expenses) ([frappe#32714](frappe#32714)) ([acf8b46](frappe@acf8b46))
* debit note not pulled on reconciliation tool ([cf133b2](frappe@cf133b2))
* Deferred revenue date comparison (backport [frappe#33515](frappe#33515)) ([frappe#33517](frappe#33517)) ([ea99ac9](frappe@ea99ac9))
* **ecommerce:** remove query parameters from referrer (backport [frappe#33269](frappe#33269)) ([frappe#33513](frappe#33513)) ([6516e80](frappe@6516e80))
* ERR journals reported in AR/AP ([c850635](frappe@c850635))
* linter ([f0475e9](frappe@f0475e9))
* Missing opening entry in general ledger (backport [frappe#33519](frappe#33519)) ([frappe#33527](frappe#33527)) ([865f233](frappe@865f233))
* Multi-currency issues in Bank Reconciliation Tool (backport [frappe#33488](frappe#33488)) ([frappe#33493](frappe#33493)) ([4ba2f1e](frappe@4ba2f1e))
* No permission to read doctype ([8e1c0cd](frappe@8e1c0cd))
* patch ([7b813d6](frappe@7b813d6))
* provision to set tax_deducted_till_date after document is subnmmited ([64454e0](frappe@64454e0))
* reconciled credit notes being fetched again in Payment Reconciliation tool ([frappe#33471](frappe#33471)) ([5ec11ba](frappe@5ec11ba))
* Tax withheld vouchers naming rule ([frappe#33467](frappe#33467)) ([334219e](frappe@334219e))
* **test:** holiday list dates in attendance test setup ([8df1151](frappe@8df1151))
* **test:** monthly attendance sheet ([e5a187e](frappe@e5a187e))
* typerror on multi warehouse in Packed Items ([6a394c5](frappe@6a394c5))
* use base_net_amount in case of missing stock qty ([frappe#33457](frappe#33457)) ([6e363a6](frappe@6e363a6))
* use get_all instead of get_value as get_value api dont supports between condition ([bc04e05](frappe@bc04e05))

### Features

* explicit time period for mark attendance ([d2f86ea](frappe@d2f86ea))
* provision to setup opening balances for earnings and deductions while creating SSA ([c3b9059](frappe@c3b9059))
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

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

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

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

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

Successfully merging this pull request may close these issues.

UOM Conversion Factor for manual (no item_code) Sales Invoice lines should default to one not zero
1 participant
@deepeshgarg007