Skip to content

Commit

Permalink
Merge pull request #35456 from frappe/mergify/bp/version-13-hotfix/pr…
Browse files Browse the repository at this point in the history
…-35328

fix: force to do reposting for cancelled document (backport #35328)
  • Loading branch information
s-aga-r committed May 29, 2023
2 parents 139a193 + 44cb628 commit 3e95d56
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
7 changes: 5 additions & 2 deletions erpnext/controllers/stock_controller.py
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
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}))

0 comments on commit 3e95d56

Please sign in to comment.