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: force to do reposting for cancelled document (backport #35328) #35456

Merged
merged 2 commits into from
May 29, 2023
Merged

fix: force to do reposting for cancelled document (backport #35328) #35456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0228933
fix: force to do reposting for cancelled document
rohitwaghchaure May 16, 2023
44cb628
chore: `conflicts`
s-aga-r May 29, 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
7 changes: 5 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 @@ -678,7 +678,7 @@ def prepare_over_receipt_message(self, rule, values):
message += _("Please adjust the qty or edit {0} to proceed.").format(rule_link)
return message

def repost_future_sle_and_gle(self):
def repost_future_sle_and_gle(self, force=False):
args = frappe._dict(
{
"posting_date": self.posting_date,
Expand All @@ -689,7 +689,10 @@ def repost_future_sle_and_gle(self):
}
)

if future_sle_exists(args) or repost_required_for_queue(self):
if self.docstatus == 2:
force = True

if force or future_sle_exists(args) or repost_required_for_queue(self):
item_based_reposting = cint(
frappe.db.get_single_value("Stock Reposting Settings", "item_based_reposting")
)
Expand Down
16 changes: 16 additions & 0 deletions 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 @@ -294,3 +294,19 @@ def test_account_freeze_validation(self):
self.assertRaises(frappe.ValidationError, riv.save)
accounts_settings.acc_frozen_upto = ""
accounts_settings.save()

def test_create_repost_entry_for_cancelled_document(self):
pr = make_purchase_receipt(
company="_Test Company with perpetual inventory",
warehouse="Stores - TCP1",
get_multiple_items=True,
)

self.assertTrue(pr.docstatus == 1)
self.assertFalse(frappe.db.exists("Repost Item Valuation", {"voucher_no": pr.name}))

pr.load_from_db()

pr.cancel()
self.assertTrue(pr.docstatus == 2)
self.assertTrue(frappe.db.exists("Repost Item Valuation", {"voucher_no": pr.name}))