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

fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849) (backport #37850) #37938

Merged
merged 5 commits into from
Nov 7, 2023
Merged

fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849) (backport #37850) #37938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d730d6e
fix: remove voucher type and no for Item and Warehouse based repostin…
mergify[bot] Nov 2, 2023
30c6c18
chore: fix conflicts
rohitwaghchaure Nov 6, 2023
3463120
chore: fix conflicts
rohitwaghchaure Nov 6, 2023
1a843f7
chore: fix conflicts
rohitwaghchaure Nov 6, 2023
5747f09
fix: conflicts
rohitwaghchaure Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions erpnext/controllers/stock_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,8 +914,6 @@ def create_item_wise_repost_entries(voucher_type, voucher_no, allow_zero_rate=Fa

repost_entry = frappe.new_doc("Repost Item Valuation")
repost_entry.based_on = "Item and Warehouse"
repost_entry.voucher_type = voucher_type
repost_entry.voucher_no = voucher_no

repost_entry.item_code = sle.item_code
repost_entry.warehouse = sle.warehouse
Expand Down
4 changes: 3 additions & 1 deletion erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from unittest.mock import MagicMock, call

import frappe
from frappe.tests.utils import FrappeTestCase
from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import nowdate
from frappe.utils.data import add_to_date, today

Expand Down Expand Up @@ -173,6 +173,7 @@ def test_stock_freeze_validation(self):

riv.set_status("Skipped")

@change_settings("Stock Reposting Settings", {"item_based_reposting": 0})
def test_prevention_of_cancelled_transaction_riv(self):
frappe.flags.dont_execute_stock_reposts = True

Expand Down Expand Up @@ -295,6 +296,7 @@ def test_account_freeze_validation(self):
accounts_settings.acc_frozen_upto = ""
accounts_settings.save()

@change_settings("Stock Reposting Settings", {"item_based_reposting": 0})
def test_create_repost_entry_for_cancelled_document(self):
pr = make_purchase_receipt(
company="_Test Company with perpetual inventory",
Expand Down
1 change: 1 addition & 0 deletions erpnext/stock/doctype/stock_entry/test_stock_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,6 +1414,7 @@ def test_stock_entry_item_details(self):
self.assertEqual(se.items[0].item_name, item.item_name)
self.assertEqual(se.items[0].stock_uom, item.stock_uom)

@change_settings("Stock Reposting Settings", {"item_based_reposting": 0})
def test_reposting_for_depedent_warehouse(self):
from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import repost_sl_entries
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
Expand Down
6 changes: 3 additions & 3 deletions erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"label": "Limit timeslot for Stock Reposting"
},
{
"default": "0",
"default": "1",
"fieldname": "item_based_reposting",
"fieldtype": "Check",
"label": "Use Item based reposting"
Expand All @@ -57,7 +57,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2021-11-02 01:22:45.155841",
"modified": "2023-11-01 16:14:29.080697",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reposting Settings",
Expand All @@ -77,4 +77,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}
Loading