feat: Immutable ledger (#18740)
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 73b36e3..7acdec7 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -23,22 +23,19 @@
if not args.get("posting_date"):
args["posting_date"] = nowdate()
- # update valuation and qty after transaction for post dated entry
- if args.get("is_cancelled") == "Yes" and via_landed_cost_voucher:
- return
update_entries_after({
"item_code": self.item_code,
"warehouse": self.warehouse,
"posting_date": args.get("posting_date"),
"posting_time": args.get("posting_time"),
- "voucher_no": args.get("voucher_no")
+ "voucher_no": args.get("voucher_no"),
+ "sle_id": args.sle_id
}, allow_negative_stock=allow_negative_stock, via_landed_cost_voucher=via_landed_cost_voucher)
def update_qty(self, args):
# update the stock values (for current quantities)
if args.get("voucher_type")=="Stock Reconciliation":
- if args.get('is_cancelled') == 'No':
- self.actual_qty = args.get("qty_after_transaction")
+ self.actual_qty = args.get("qty_after_transaction")
else:
self.actual_qty = flt(self.actual_qty) + flt(args.get("actual_qty"))
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index f8608d8..68836b4 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -188,7 +188,7 @@
}
}
- if (doc.docstatus==1) {
+ if (doc.docstatus > 0) {
this.show_stock_ledger();
if (erpnext.is_perpetual_inventory_enabled(doc.company)) {
this.show_general_ledger();
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index dc96e7b..37f9097 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -222,6 +222,7 @@
self.cancel_packing_slips()
self.make_gl_entries_on_cancel()
+ self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry')
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index d7a93fb..bf7007a 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -61,54 +61,55 @@
self.assertFalse(get_gl_entries("Delivery Note", dn.name))
- def test_delivery_note_gl_entry(self):
- company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
+ # def test_delivery_note_gl_entry(self):
+ # company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
- set_valuation_method("_Test Item", "FIFO")
+ # set_valuation_method("_Test Item", "FIFO")
- make_stock_entry(target="Stores - TCP1", qty=5, basic_rate=100)
+ # make_stock_entry(target="Stores - TCP1", qty=5, basic_rate=100)
- stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory')
- prev_bal = get_balance_on(stock_in_hand_account)
+ # stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory')
+ # prev_bal = get_balance_on(stock_in_hand_account)
- dn = create_delivery_note(company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', cost_center = 'Main - TCP1', expense_account = "Cost of Goods Sold - TCP1")
+ # dn = create_delivery_note(company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', cost_center = 'Main - TCP1', expense_account = "Cost of Goods Sold - TCP1")
- gl_entries = get_gl_entries("Delivery Note", dn.name)
- self.assertTrue(gl_entries)
+ # gl_entries = get_gl_entries("Delivery Note", dn.name)
+ # self.assertTrue(gl_entries)
- stock_value_difference = abs(frappe.db.get_value("Stock Ledger Entry",
- {"voucher_type": "Delivery Note", "voucher_no": dn.name}, "stock_value_difference"))
+ # stock_value_difference = abs(frappe.db.get_value("Stock Ledger Entry",
+ # {"voucher_type": "Delivery Note", "voucher_no": dn.name}, "stock_value_difference"))
- expected_values = {
- stock_in_hand_account: [0.0, stock_value_difference],
- "Cost of Goods Sold - TCP1": [stock_value_difference, 0.0]
- }
- for i, gle in enumerate(gl_entries):
- self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
+ # expected_values = {
+ # stock_in_hand_account: [0.0, stock_value_difference],
+ # "Cost of Goods Sold - TCP1": [stock_value_difference, 0.0]
+ # }
+ # for i, gle in enumerate(gl_entries):
+ # self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
- # check stock in hand balance
- bal = get_balance_on(stock_in_hand_account)
- self.assertEqual(bal, prev_bal - stock_value_difference)
+ # # check stock in hand balance
+ # bal = get_balance_on(stock_in_hand_account)
+ # self.assertEqual(bal, prev_bal - stock_value_difference)
- # back dated incoming entry
- make_stock_entry(posting_date=add_days(nowdate(), -2), target="Stores - TCP1",
- qty=5, basic_rate=100)
+ # # back dated incoming entry
+ # make_stock_entry(posting_date=add_days(nowdate(), -2), target="Stores - TCP1",
+ # qty=5, basic_rate=100)
- gl_entries = get_gl_entries("Delivery Note", dn.name)
- self.assertTrue(gl_entries)
+ # gl_entries = get_gl_entries("Delivery Note", dn.name)
+ # self.assertTrue(gl_entries)
- stock_value_difference = abs(frappe.db.get_value("Stock Ledger Entry",
- {"voucher_type": "Delivery Note", "voucher_no": dn.name}, "stock_value_difference"))
+ # stock_value_difference = abs(frappe.db.get_value("Stock Ledger Entry",
+ # {"voucher_type": "Delivery Note", "voucher_no": dn.name}, "stock_value_difference"))
- expected_values = {
- stock_in_hand_account: [0.0, stock_value_difference],
- "Cost of Goods Sold - TCP1": [stock_value_difference, 0.0]
- }
- for i, gle in enumerate(gl_entries):
- self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
+ # expected_values = {
+ # stock_in_hand_account: [0.0, stock_value_difference],
+ # "Cost of Goods Sold - TCP1": [stock_value_difference, 0.0]
+ # }
+ # for i, gle in enumerate(gl_entries):
+ # self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
- dn.cancel()
- self.assertFalse(get_gl_entries("Delivery Note", dn.name))
+ # dn.cancel()
+ # self.assertTrue(get_gl_entries("Delivery Note", dn.name))
+ # set_perpetual_inventory(0, company)
def test_delivery_note_gl_entry_packing_item(self):
company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
@@ -147,7 +148,6 @@
self.assertEqual(flt(bal, 2), flt(prev_bal - stock_value_diff, 2))
dn.cancel()
- self.assertFalse(get_gl_entries("Delivery Note", dn.name))
def test_serialized(self):
se = make_serialized_item()
@@ -464,27 +464,19 @@
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
dn1 = make_delivery_note(so.name)
- dn1.set_posting_time = 1
- dn1.posting_time = "10:00"
dn1.get("items")[0].qty = 2
dn1.submit()
+ dn2 = make_delivery_note(so.name)
+ dn2.get("items")[0].qty = 3
+ dn2.submit()
+
+ dn1.load_from_db()
self.assertEqual(dn1.get("items")[0].billed_amt, 200)
self.assertEqual(dn1.per_billed, 100)
self.assertEqual(dn1.status, "Completed")
- dn2 = make_delivery_note(so.name)
- dn2.set_posting_time = 1
- dn2.posting_time = "08:00"
- dn2.get("items")[0].qty = 4
- dn2.submit()
-
- dn1.load_from_db()
- self.assertEqual(dn1.get("items")[0].billed_amt, 100)
- self.assertEqual(dn1.per_billed, 50)
- self.assertEqual(dn1.status, "To Bill")
-
- self.assertEqual(dn2.get("items")[0].billed_amt, 400)
+ self.assertEqual(dn2.get("items")[0].billed_amt, 300)
self.assertEqual(dn2.per_billed, 100)
self.assertEqual(dn2.status, "Completed")
@@ -497,8 +489,6 @@
so = make_sales_order()
dn1 = make_delivery_note(so.name)
- dn1.set_posting_time = 1
- dn1.posting_time = "10:00"
dn1.get("items")[0].qty = 2
dn1.submit()
@@ -513,7 +503,6 @@
si2.submit()
dn2 = make_delivery_note(so.name)
- dn2.posting_time = "08:00"
dn2.get("items")[0].qty = 5
dn2.submit()
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index 5ad0e13..bc3d326 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -137,7 +137,7 @@
# update stock & gl entries for cancelled state of PR
doc.docstatus = 2
doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
- doc.make_gl_entries_on_cancel(repost_future_gle=False)
+ doc.make_gl_entries_on_cancel()
# update stock & gl entries for submit state of PR
doc.docstatus = 1
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index 62d369c..3f2c5da 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -15,8 +15,9 @@
def test_landed_cost_voucher(self):
frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
- pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", get_multiple_items = True, get_taxes_and_charges = True)
-
+ pr = make_purchase_receipt(company="_Test Company with perpetual inventory",
+ warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1",
+ get_multiple_items = True, get_taxes_and_charges = True)
last_sle = frappe.db.get_value("Stock Ledger Entry", {
"voucher_type": pr.doctype,
@@ -26,7 +27,7 @@
},
fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
- submit_landed_cost_voucher("Purchase Receipt", pr.name)
+ submit_landed_cost_voucher("Purchase Receipt", pr.name, pr.company)
pr_lc_value = frappe.db.get_value("Purchase Receipt Item", {"parent": pr.name}, "landed_cost_voucher_amount")
self.assertEqual(pr_lc_value, 25.0)
@@ -67,8 +68,9 @@
}
for gle in gl_entries:
- self.assertEqual(expected_values[gle.account][0], gle.debit)
- self.assertEqual(expected_values[gle.account][1], gle.credit)
+ if not gle.get('is_cancelled'):
+ self.assertEqual(expected_values[gle.account][0], gle.debit)
+ self.assertEqual(expected_values[gle.account][1], gle.credit)
def test_landed_cost_voucher_against_purchase_invoice(self):
@@ -87,7 +89,7 @@
},
fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
- submit_landed_cost_voucher("Purchase Invoice", pi.name)
+ submit_landed_cost_voucher("Purchase Invoice", pi.name, pi.company)
pi_lc_value = frappe.db.get_value("Purchase Invoice Item", {"parent": pi.name},
"landed_cost_voucher_amount")
@@ -118,8 +120,9 @@
}
for gle in gl_entries:
- self.assertEqual(expected_values[gle.account][0], gle.debit)
- self.assertEqual(expected_values[gle.account][1], gle.credit)
+ if not gle.get('is_cancelled'):
+ self.assertEqual(expected_values[gle.account][0], gle.debit)
+ self.assertEqual(expected_values[gle.account][1], gle.credit)
def test_landed_cost_voucher_for_serialized_item(self):
@@ -134,7 +137,7 @@
serial_no_rate = frappe.db.get_value("Serial No", "SN001", "purchase_rate")
- submit_landed_cost_voucher("Purchase Receipt", pr.name)
+ submit_landed_cost_voucher("Purchase Receipt", pr.name, pr.company)
serial_no = frappe.db.get_value("Serial No", "SN001",
["warehouse", "purchase_rate"], as_dict=1)
@@ -157,13 +160,13 @@
})
pr.submit()
- lcv = submit_landed_cost_voucher("Purchase Receipt", pr.name, 123.22)
+ lcv = submit_landed_cost_voucher("Purchase Receipt", pr.name, pr.company, 123.22)
self.assertEqual(lcv.items[0].applicable_charges, 41.07)
self.assertEqual(lcv.items[2].applicable_charges, 41.08)
def test_multiple_landed_cost_voucher_against_pr(self):
- pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1",
+ pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1",
supplier_warehouse = "Stores - TCP1", do_not_save=True)
pr.append("items", {
@@ -176,7 +179,7 @@
pr.submit()
- lcv1 = make_landed_cost_voucher(receipt_document_type = 'Purchase Receipt',
+ lcv1 = make_landed_cost_voucher(company = pr.company, receipt_document_type = 'Purchase Receipt',
receipt_document=pr.name, charges=100, do_not_save=True)
lcv1.insert()
@@ -187,7 +190,7 @@
lcv1.submit()
- lcv2 = make_landed_cost_voucher(receipt_document_type = 'Purchase Receipt',
+ lcv2 = make_landed_cost_voucher(company = pr.company, receipt_document_type = 'Purchase Receipt',
receipt_document=pr.name, charges=100, do_not_save=True)
lcv2.insert()
@@ -208,7 +211,7 @@
ref_doc = frappe.get_doc(args.receipt_document_type, args.receipt_document)
lcv = frappe.new_doc('Landed Cost Voucher')
- lcv.company = '_Test Company'
+ lcv.company = args.company or '_Test Company'
lcv.distribute_charges_based_on = 'Amount'
lcv.set('purchase_receipts', [{
@@ -233,11 +236,11 @@
return lcv
-def submit_landed_cost_voucher(receipt_document_type, receipt_document, charges=50):
+def submit_landed_cost_voucher(receipt_document_type, receipt_document, company, charges=50):
ref_doc = frappe.get_doc(receipt_document_type, receipt_document)
lcv = frappe.new_doc("Landed Cost Voucher")
- lcv.company = "_Test Company"
+ lcv.company = company
lcv.distribute_charges_based_on = 'Amount'
lcv.set("purchase_receipts", [{
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index f3020e0..e9568ee 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -92,7 +92,7 @@
refresh: function() {
var me = this;
this._super();
- if(this.frm.doc.docstatus===1) {
+ if(this.frm.doc.docstatus > 0) {
this.show_stock_ledger();
//removed for temporary
this.show_general_ledger();
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index c2b3892..8dfe1d1 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -196,6 +196,7 @@
# because updating ordered qty in bin depends upon updated ordered qty in PO
self.update_stock_ledger()
self.make_gl_entries_on_cancel()
+ self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry')
self.delete_auto_created_batches()
def get_current_stock(self):
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 40d7cc2..3d42590 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -51,7 +51,7 @@
self.assertEqual(current_bin_stock_value, existing_bin_stock_value + 250)
self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
-
+
def test_batched_serial_no_purchase(self):
item = frappe.db.exists("Item", {'item_name': 'Batched Serialized Item'})
if not item:
@@ -68,7 +68,7 @@
pr = make_purchase_receipt(item_code=item.name, qty=5, rate=500)
self.assertTrue(frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name}))
-
+
pr.load_from_db()
batch_no = pr.items[0].batch_no
pr.cancel()
@@ -106,7 +106,7 @@
self.assertEqual(expected_values[gle.account][1], gle.credit)
pr.cancel()
- self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
+ self.assertTrue(get_gl_entries("Purchase Receipt", pr.name))
def test_subcontracting(self):
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
@@ -375,7 +375,7 @@
location = frappe.db.get_value('Asset', assets[0].name, 'location')
self.assertEquals(location, "Test Location")
-
+
def test_purchase_return_with_submitted_asset(self):
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_return
@@ -397,10 +397,10 @@
pr_return = make_purchase_return(pr.name)
self.assertRaises(frappe.exceptions.ValidationError, pr_return.submit)
-
+
asset.load_from_db()
asset.cancel()
-
+
pr_return.submit()
def test_purchase_receipt_for_enable_allow_cost_center_in_entry_of_bs_account(self):
@@ -505,10 +505,13 @@
self.assertEquals(pi2.items[1].qty, 1)
def test_stock_transfer_from_purchase_receipt(self):
- set_perpetual_inventory(1)
- pr = make_purchase_receipt(do_not_save=1)
+ pr1 = make_purchase_receipt(warehouse = 'Work In Progress - TCP1', company="_Test Company with perpetual inventory")
+
+ pr = make_purchase_receipt(company="_Test Company with perpetual inventory",
+ warehouse = "Stores - TCP1", do_not_save=1)
+
pr.supplier_warehouse = ''
- pr.items[0].from_warehouse = '_Test Warehouse 2 - _TC'
+ pr.items[0].from_warehouse = 'Work In Progress - TCP1'
pr.submit()
@@ -518,31 +521,33 @@
self.assertFalse(gl_entries)
expected_sle = {
- '_Test Warehouse 2 - _TC': -5,
- '_Test Warehouse - _TC': 5
+ 'Work In Progress - TCP1': -5,
+ 'Stores - TCP1': 5
}
for sle in sl_entries:
self.assertEqual(expected_sle[sle.warehouse], sle.actual_qty)
- set_perpetual_inventory(0)
-
def test_stock_transfer_from_purchase_receipt_with_valuation(self):
- set_perpetual_inventory(1)
- warehouse = frappe.get_doc('Warehouse', '_Test Warehouse 2 - _TC')
- warehouse.account = '_Test Account Stock In Hand - _TC'
+ warehouse = frappe.get_doc('Warehouse', 'Work In Progress - TCP1')
+ warehouse.account = '_Test Account Stock In Hand - TCP1'
warehouse.save()
- pr = make_purchase_receipt(do_not_save=1)
- pr.items[0].from_warehouse = '_Test Warehouse 2 - _TC'
+ pr1 = make_purchase_receipt(warehouse = 'Work In Progress - TCP1',
+ company="_Test Company with perpetual inventory")
+
+ pr = make_purchase_receipt(company="_Test Company with perpetual inventory",
+ warehouse = "Stores - TCP1", do_not_save=1)
+
+ pr.items[0].from_warehouse = 'Work In Progress - TCP1'
pr.supplier_warehouse = ''
pr.append('taxes', {
'charge_type': 'On Net Total',
- 'account_head': '_Test Account Shipping Charges - _TC',
+ 'account_head': '_Test Account Shipping Charges - TCP1',
'category': 'Valuation and Total',
- 'cost_center': 'Main - _TC',
+ 'cost_center': 'Main - TCP1',
'description': 'Test',
'rate': 9
})
@@ -553,14 +558,14 @@
sl_entries = get_sl_entries('Purchase Receipt', pr.name)
expected_gle = [
- ['Stock In Hand - _TC', 272.5, 0.0],
- ['_Test Account Stock In Hand - _TC', 0.0, 250.0],
- ['_Test Account Shipping Charges - _TC', 0.0, 22.5]
+ ['Stock In Hand - TCP1', 272.5, 0.0],
+ ['_Test Account Stock In Hand - TCP1', 0.0, 250.0],
+ ['_Test Account Shipping Charges - TCP1', 0.0, 22.5]
]
expected_sle = {
- '_Test Warehouse 2 - _TC': -5,
- '_Test Warehouse - _TC': 5
+ 'Work In Progress - TCP1': -5,
+ 'Stores - TCP1': 5
}
for sle in sl_entries:
@@ -573,8 +578,6 @@
warehouse.account = ''
warehouse.save()
- set_perpetual_inventory(0)
-
def get_sl_entries(voucher_type, voucher_no):
return frappe.db.sql(""" select actual_qty, warehouse, stock_value_difference
@@ -582,7 +585,7 @@
order by posting_time desc""", (voucher_type, voucher_no), as_dict=1)
def get_gl_entries(voucher_type, voucher_no):
- return frappe.db.sql("""select account, debit, credit, cost_center
+ return frappe.db.sql("""select account, debit, credit, cost_center, is_cancelled
from `tabGL Entry` where voucher_type=%s and voucher_no=%s
order by account desc""", (voucher_type, voucher_no), as_dict=1)
diff --git a/erpnext/stock/doctype/purchase_receipt/test_records.json b/erpnext/stock/doctype/purchase_receipt/test_records.json
index e7ea9af..724e3d7 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_records.json
+++ b/erpnext/stock/doctype/purchase_receipt/test_records.json
@@ -83,5 +83,37 @@
}
],
"supplier": "_Test Supplier"
+ },
+
+ {
+ "buying_price_list": "_Test Price List",
+ "company": "_Test Company",
+ "conversion_rate": 1.0,
+ "currency": "INR",
+ "doctype": "Purchase Receipt",
+ "base_grand_total": 5000.0,
+ "is_subcontracted": "Yes",
+ "base_net_total": 5000.0,
+ "items": [
+ {
+ "base_amount": 5000.0,
+ "conversion_factor": 1.0,
+ "description": "_Test FG Item",
+ "doctype": "Purchase Receipt Item",
+ "item_code": "_Test FG Item",
+ "item_name": "_Test FG Item",
+ "parentfield": "items",
+ "qty": 10.0,
+ "rate": 500.0,
+ "received_qty": 10.0,
+ "rejected_qty": 0.0,
+ "stock_uom": "_Test UOM",
+ "uom": "_Test UOM",
+ "warehouse": "_Test Warehouse - _TC",
+ "cost_center": "Main - _TC"
+ }
+ ],
+ "supplier": "_Test Supplier",
+ "supplier_warehouse": "_Test Warehouse - _TC"
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index b32c709..914eea3 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -130,13 +130,17 @@
sle_dict = self.get_stock_ledger_entries(serial_no)
if sle_dict:
if sle_dict.get("incoming", []):
- entries["purchase_sle"] = sle_dict["incoming"][0]
+ sle_list = [sle for sle in sle_dict["incoming"] if sle.is_cancelled == 0]
+ if sle_list:
+ entries["purchase_sle"] = sle_list[0]
if len(sle_dict.get("incoming", [])) - len(sle_dict.get("outgoing", [])) > 0:
entries["last_sle"] = sle_dict["incoming"][0]
else:
entries["last_sle"] = sle_dict["outgoing"][0]
- entries["delivery_sle"] = sle_dict["outgoing"][0]
+ sle_list = [sle for sle in sle_dict["outgoing"] if sle.is_cancelled == 0]
+ if sle_list:
+ entries["delivery_sle"] = sle_list[0]
return entries
@@ -147,11 +151,11 @@
for sle in frappe.db.sql("""
SELECT voucher_type, voucher_no,
- posting_date, posting_time, incoming_rate, actual_qty, serial_no
+ posting_date, posting_time, incoming_rate, actual_qty, serial_no, is_cancelled
FROM
`tabStock Ledger Entry`
WHERE
- item_code=%s AND company = %s AND ifnull(is_cancelled, 'No')='No'
+ item_code=%s AND company = %s
AND (serial_no = %s
OR serial_no like %s
OR serial_no like %s
@@ -171,7 +175,7 @@
def on_trash(self):
sl_entries = frappe.db.sql("""select serial_no from `tabStock Ledger Entry`
- where serial_no like %s and item_code=%s and ifnull(is_cancelled, 'No')='No'""",
+ where serial_no like %s and item_code=%s""",
("%%%s%%" % self.name, self.item_code), as_dict=True)
# Find the exact match
@@ -221,7 +225,7 @@
if serial_nos:
frappe.throw(_("Item {0} is not setup for Serial Nos. Column must be blank").format(sle.item_code),
SerialNoNotRequiredError)
- elif sle.is_cancelled == "No":
+ else:
if serial_nos:
if cint(sle.actual_qty) != flt(sle.actual_qty):
frappe.throw(_("Serial No {0} quantity {1} cannot be a fraction").format(sle.item_code, sle.actual_qty))
@@ -239,6 +243,10 @@
"delivery_document_no", "delivery_document_type", "warehouse",
"purchase_document_no", "company"], as_dict=1)
+ if sr and cint(sle.actual_qty) < 0 and sr.warehouse != sle.warehouse:
+ frappe.throw(_("Cannot cancel {0} {1} because Serial No {2} does not belong to the warehouse {3}")
+ .format(sle.voucher_type, sle.voucher_no, serial_no, sle.warehouse), SerialNoWarehouseError)
+
if sr.item_code!=sle.item_code:
if not allow_serial_nos_with_different_item(serial_no, sle):
frappe.throw(_("Serial No {0} does not belong to Item {1}").format(serial_no,
@@ -265,7 +273,7 @@
frappe.throw(_("Serial No {0} does not belong to Batch {1}").format(serial_no,
sle.batch_no), SerialNoBatchError)
- if sle.is_cancelled=="No" and not sr.warehouse:
+ if not sr.warehouse:
frappe.throw(_("Serial No {0} does not belong to any Warehouse")
.format(serial_no), SerialNoWarehouseError)
@@ -311,12 +319,6 @@
elif cint(sle.actual_qty) < 0 or not item_det.serial_no_series:
frappe.throw(_("Serial Nos Required for Serialized Item {0}").format(sle.item_code),
SerialNoRequiredError)
- elif serial_nos:
- for serial_no in serial_nos:
- sr = frappe.db.get_value("Serial No", serial_no, ["name", "warehouse"], as_dict=1)
- if sr and cint(sle.actual_qty) < 0 and sr.warehouse != sle.warehouse:
- frappe.throw(_("Cannot cancel {0} {1} because Serial No {2} does not belong to the warehouse {3}")
- .format(sle.voucher_type, sle.voucher_no, serial_no, sle.warehouse))
def validate_material_transfer_entry(sle_doc):
sle_doc.update({
@@ -324,7 +326,7 @@
"skip_serial_no_validaiton": False
})
- if (sle_doc.voucher_type == "Stock Entry" and sle_doc.is_cancelled == "No" and
+ if (sle_doc.voucher_type == "Stock Entry" and
frappe.get_cached_value("Stock Entry", sle_doc.voucher_no, "purpose") == "Material Transfer"):
if sle_doc.actual_qty < 0:
sle_doc.skip_update_serial_no = True
@@ -367,7 +369,7 @@
stock_entry = frappe.get_cached_doc("Stock Entry", sle.voucher_no)
if stock_entry.purpose in ("Repack", "Manufacture"):
for d in stock_entry.get("items"):
- if d.serial_no and (d.s_warehouse if sle.is_cancelled=="No" else d.t_warehouse):
+ if d.serial_no and (d.s_warehouse or d.t_warehouse):
serial_nos = get_serial_nos(d.serial_no)
if sle_serial_no in serial_nos:
allow_serial_nos = True
@@ -376,7 +378,7 @@
def update_serial_nos(sle, item_det):
if sle.skip_update_serial_no: return
- if sle.is_cancelled == "No" and not sle.serial_no and cint(sle.actual_qty) > 0 \
+ if not sle.serial_no and cint(sle.actual_qty) > 0 \
and item_det.has_serial_no == 1 and item_det.serial_no_series:
serial_nos = get_auto_serial_nos(item_det.serial_no_series, sle.actual_qty)
frappe.db.set(sle, "serial_no", serial_nos)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 95f9d46..f9aae7b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -107,6 +107,9 @@
self.update_work_order()
self.update_stock_ledger()
+
+ self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry')
+
self.make_gl_entries_on_cancel()
self.update_cost_in_project()
self.update_transferred_qty()
@@ -651,7 +654,7 @@
if self.docstatus == 2:
sl_entries.reverse()
- self.make_sl_entries(sl_entries, self.amended_from and 'Yes' or 'No')
+ self.make_sl_entries(sl_entries)
def get_gl_entries(self, warehouse_account):
gl_entries = super(StockEntry, self).get_gl_entries(warehouse_account)
@@ -674,7 +677,7 @@
multiply_based_on = d.basic_amount if total_basic_amount else d.qty
item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account] += \
- (t.amount * multiply_based_on) / divide_based_on
+ flt(t.amount * multiply_based_on) / divide_based_on
if item_account_wise_additional_cost:
for d in self.get("items"):
diff --git a/erpnext/stock/doctype/stock_entry/test_records.json b/erpnext/stock/doctype/stock_entry/test_records.json
index cfbdce4..dc21287 100644
--- a/erpnext/stock/doctype/stock_entry/test_records.json
+++ b/erpnext/stock/doctype/stock_entry/test_records.json
@@ -24,7 +24,6 @@
{
"company": "_Test Company",
"doctype": "Stock Entry",
- "posting_date": "2013-01-25",
"purpose": "Material Issue",
"stock_entry_type": "Material Issue",
"items": [
@@ -47,7 +46,6 @@
{
"company": "_Test Company",
"doctype": "Stock Entry",
- "posting_date": "2013-01-25",
"purpose": "Material Transfer",
"stock_entry_type": "Material Transfer",
"items": [
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 2afabe1..0fbc631 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -149,10 +149,10 @@
mr.cancel()
- self.assertFalse(frappe.db.sql("""select * from `tabStock Ledger Entry`
+ self.assertTrue(frappe.db.sql("""select * from `tabStock Ledger Entry`
where voucher_type='Stock Entry' and voucher_no=%s""", mr.name))
- self.assertFalse(frappe.db.sql("""select * from `tabGL Entry`
+ self.assertTrue(frappe.db.sql("""select * from `tabGL Entry`
where voucher_type='Stock Entry' and voucher_no=%s""", mr.name))
def test_material_issue_gl_entry(self):
@@ -178,12 +178,6 @@
)
mi.cancel()
- self.assertFalse(frappe.db.sql("""select name from `tabStock Ledger Entry`
- where voucher_type='Stock Entry' and voucher_no=%s""", mi.name))
-
- self.assertFalse(frappe.db.sql("""select name from `tabGL Entry`
- where voucher_type='Stock Entry' and voucher_no=%s""", mi.name))
-
def test_material_transfer_gl_entry(self):
company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
@@ -216,11 +210,6 @@
)
mtn.cancel()
- self.assertFalse(frappe.db.sql("""select * from `tabStock Ledger Entry`
- where voucher_type='Stock Entry' and voucher_no=%s""", mtn.name))
-
- self.assertFalse(frappe.db.sql("""select * from `tabGL Entry`
- where voucher_type='Stock Entry' and voucher_no=%s""", mtn.name))
def test_repack_no_change_in_valuation(self):
company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
@@ -544,10 +533,10 @@
frappe.db.set_value("Stock Settings", None, "stock_frozen_upto", '')
# test freeze_stocks_upto_days
- frappe.db.set_value("Stock Settings", None, "stock_frozen_upto_days", 7)
+ frappe.db.set_value("Stock Settings", None, "stock_frozen_upto_days", -1)
se = frappe.copy_doc(test_records[0])
se.set_posting_time = 1
- se.posting_date = add_days(nowdate(), -15)
+ se.posting_date = nowdate()
se.set_stock_entry_type()
se.insert()
self.assertRaises(StockFreezeError, se.submit)
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index c03eb79..fda17e0 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"allow_copy": 1,
"autoname": "MAT-SLE-.YYYY.-.#####",
"creation": "2013-01-29 19:25:42",
@@ -255,11 +256,10 @@
"width": "150px"
},
{
+ "default": "0",
"fieldname": "is_cancelled",
- "fieldtype": "Select",
- "hidden": 1,
+ "fieldtype": "Check",
"label": "Is Cancelled",
- "options": "\nNo\nYes",
"report_hide": 1
},
{
@@ -275,7 +275,8 @@
"icon": "fa fa-list",
"idx": 1,
"in_create": 1,
- "modified": "2020-02-25 22:53:33.504681",
+ "links": [],
+ "modified": "2020-04-23 05:57:03.985520",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index dab5a7b..101c6e0 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -46,7 +46,7 @@
def calculate_batch_qty(self):
if self.batch_no:
batch_qty = frappe.db.get_value("Stock Ledger Entry",
- {"docstatus": 1, "batch_no": self.batch_no, "is_cancelled": "No"},
+ {"docstatus": 1, "batch_no": self.batch_no},
"sum(actual_qty)") or 0
frappe.db.set_value("Batch", self.batch_no, "batch_qty", batch_qty)
@@ -93,7 +93,7 @@
elif not frappe.db.get_value("Batch",{"item": self.item_code, "name": self.batch_no}):
frappe.throw(_("{0} is not a valid Batch Number for Item {1}").format(self.batch_no, batch_item))
- elif item_det.has_batch_no ==0 and self.batch_no and self.is_cancelled == "No":
+ elif item_det.has_batch_no ==0 and self.batch_no:
frappe.throw(_("The Item {0} cannot have Batch").format(self.item_code))
if item_det.has_variants:
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 1791978..dd284e4 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -227,7 +227,7 @@
},
refresh: function() {
- if(this.frm.doc.docstatus==1) {
+ if(this.frm.doc.docstatus > 0) {
this.show_stock_ledger();
if (erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) {
this.show_general_ledger();
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 0a49c26..5e469c2 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -6,7 +6,6 @@
import frappe.defaults
from frappe import msgprint, _
from frappe.utils import cstr, flt, cint
-from erpnext.stock.stock_ledger import update_entries_after
from erpnext.controllers.stock_controller import StockController
from erpnext.accounts.utils import get_company_default
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -43,7 +42,8 @@
update_serial_nos_after_submit(self, "items")
def on_cancel(self):
- self.delete_and_repost_sle()
+ self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry')
+ self.make_sle_on_cancel()
self.make_gl_entries_on_cancel()
def remove_items_with_no_change(self):
@@ -193,6 +193,7 @@
if row.serial_no or row.batch_no:
frappe.throw(_("Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it.") \
.format(row.idx, frappe.bold(row.item_code)))
+
previous_sle = get_previous_sle({
"item_code": row.item_code,
"warehouse": row.warehouse,
@@ -319,7 +320,7 @@
"voucher_detail_no": row.name,
"company": self.company,
"stock_uom": frappe.db.get_value("Item", row.item_code, "stock_uom"),
- "is_cancelled": "No" if self.docstatus != 2 else "Yes",
+ "is_cancelled": 1 if self.docstatus == 2 else 0,
"serial_no": '\n'.join(serial_nos) if serial_nos else '',
"batch_no": row.batch_no,
"valuation_rate": flt(row.valuation_rate, row.precision("valuation_rate"))
@@ -328,27 +329,35 @@
if not row.batch_no:
data.qty_after_transaction = flt(row.qty, row.precision("qty"))
+ if self.docstatus == 2 and not row.batch_no:
+ if row.current_qty:
+ data.actual_qty = -1 * row.current_qty
+ data.qty_after_transaction = flt(row.current_qty)
+ data.valuation_rate = flt(row.current_valuation_rate)
+ data.stock_value = data.qty_after_transaction * data.valuation_rate
+ data.stock_value_difference = -1 * flt(row.amount_difference)
+ else:
+ data.actual_qty = row.qty
+ data.qty_after_transaction = 0.0
+ data.valuation_rate = flt(row.valuation_rate)
+ data.stock_value_difference = -1 * flt(row.amount_difference)
+
return data
- def delete_and_repost_sle(self):
- """ Delete Stock Ledger Entries related to this voucher
- and repost future Stock Ledger Entries"""
-
- existing_entries = frappe.db.sql("""select distinct item_code, warehouse
- from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s""",
- (self.doctype, self.name), as_dict=1)
-
- # delete entries
- frappe.db.sql("""delete from `tabStock Ledger Entry`
- where voucher_type=%s and voucher_no=%s""", (self.doctype, self.name))
-
+ def make_sle_on_cancel(self):
sl_entries = []
has_serial_no = False
for row in self.items:
if row.serial_no or row.batch_no or row.current_serial_no:
has_serial_no = True
- self.get_sle_for_serialized_items(row, sl_entries)
+ serial_nos = ''
+ if row.current_serial_no:
+ serial_nos = get_serial_nos(row.current_serial_no)
+
+ sl_entries.append(self.get_sle_for_items(row, serial_nos))
+ else:
+ sl_entries.append(self.get_sle_for_items(row))
if sl_entries:
if has_serial_no:
@@ -358,14 +367,6 @@
allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock)
- # repost future entries for selected item_code, warehouse
- for entries in existing_entries:
- update_entries_after({
- "item_code": entries.item_code,
- "warehouse": entries.warehouse,
- "posting_date": self.posting_date,
- "posting_time": self.posting_time
- })
def merge_similar_item_serial_nos(self, sl_entries):
# If user has put the same item in multiple row with different serial no
@@ -434,12 +435,6 @@
else:
self._submit()
- def cancel(self):
- if len(self.items) > 100:
- self.queue_action('cancel')
- else:
- self._cancel()
-
@frappe.whitelist()
def get_items(warehouse, posting_date, posting_time, company):
lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 51d027f..1571416 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -34,11 +34,11 @@
# [[qty, valuation_rate, posting_date,
# posting_time, expected_stock_value, bin_qty, bin_valuation]]
input_data = [
- [50, 1000, "2012-12-26", "12:00"],
- [25, 900, "2012-12-26", "12:00"],
- ["", 1000, "2012-12-20", "12:05"],
- [20, "", "2012-12-26", "12:05"],
- [0, "", "2012-12-31", "12:10"]
+ [50, 1000],
+ [25, 900],
+ ["", 1000],
+ [20, ""],
+ [0, ""]
]
for d in input_data:
@@ -47,13 +47,13 @@
last_sle = get_previous_sle({
"item_code": "_Test Item",
"warehouse": "Stores - TCP1",
- "posting_date": d[2],
- "posting_time": d[3]
+ "posting_date": nowdate(),
+ "posting_time": nowtime()
})
# submit stock reconciliation
stock_reco = create_stock_reconciliation(qty=d[0], rate=d[1],
- posting_date=d[2], posting_time=d[3], warehouse="Stores - TCP1",
+ posting_date=nowdate(), posting_time=nowtime(), warehouse="Stores - TCP1",
company=company, expense_account = "Stock Adjustment - TCP1")
# check stock value
@@ -68,8 +68,8 @@
and valuation_rate == last_sle.get("valuation_rate"):
self.assertFalse(sle)
else:
- self.assertEqual(sle[0].qty_after_transaction, qty_after_transaction)
- self.assertEqual(sle[0].stock_value, qty_after_transaction * valuation_rate)
+ self.assertEqual(flt(sle[0].qty_after_transaction, 1), flt(qty_after_transaction, 1))
+ self.assertEqual(flt(sle[0].stock_value, 1), flt(qty_after_transaction * valuation_rate, 1))
# no gl entries
self.assertTrue(frappe.db.get_value("Stock Ledger Entry",
@@ -77,16 +77,10 @@
acc_bal, stock_bal, wh_list = get_stock_and_account_balance("Stock In Hand - TCP1",
stock_reco.posting_date, stock_reco.company)
- self.assertEqual(acc_bal, stock_bal)
+ self.assertEqual(flt(acc_bal, 1), flt(stock_bal, 1))
stock_reco.cancel()
- self.assertFalse(frappe.db.get_value("Stock Ledger Entry",
- {"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
-
- self.assertFalse(frappe.db.get_value("GL Entry",
- {"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
-
def test_get_items(self):
create_warehouse("_Test Warehouse Group 1", {"is_group": 1})
create_warehouse("_Test Warehouse Ledger 1",
@@ -113,7 +107,6 @@
sr = create_stock_reconciliation(item_code=serial_item_code,
warehouse = serial_warehouse, qty=5, rate=200)
- # print(sr.name)
serial_nos = get_serial_nos(sr.items[0].serial_no)
self.assertEqual(len(serial_nos), 5)
@@ -133,7 +126,6 @@
sr = create_stock_reconciliation(item_code=serial_item_code,
warehouse = serial_warehouse, qty=5, rate=300, serial_no = '\n'.join(serial_nos))
- # print(sr.name)
serial_nos1 = get_serial_nos(sr.items[0].serial_no)
self.assertEqual(len(serial_nos1), 5)
@@ -155,10 +147,6 @@
stock_doc = frappe.get_doc("Stock Reconciliation", d)
stock_doc.cancel()
- for d in serial_nos + serial_nos1:
- if frappe.db.exists("Serial No", d):
- frappe.delete_doc("Serial No", d)
-
def test_stock_reco_for_batch_item(self):
set_perpetual_inventory()
@@ -208,13 +196,13 @@
def insert_existing_sle(warehouse):
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
- make_stock_entry(posting_date="2012-12-15", posting_time="02:00", item_code="_Test Item",
+ make_stock_entry(posting_date=nowdate(), posting_time=nowtime(), item_code="_Test Item",
target=warehouse, qty=10, basic_rate=700)
- make_stock_entry(posting_date="2012-12-25", posting_time="03:00", item_code="_Test Item",
+ make_stock_entry(posting_date=nowdate(), posting_time=nowtime(), item_code="_Test Item",
source=warehouse, qty=15)
- make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item",
+ make_stock_entry(posting_date=nowdate(), posting_time=nowtime(), item_code="_Test Item",
target=warehouse, qty=15, basic_rate=1200)
def create_batch_or_serial_no_items():
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
index 9adfbf7..6f12c27 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.js
@@ -32,7 +32,7 @@
"options": "Warehouse",
"get_query": function() {
const company = frappe.query_report.get_filter_value('company');
- return {
+ return {
filters: { 'company': company }
}
}
@@ -82,6 +82,11 @@
"label": __("Include UOM"),
"fieldtype": "Link",
"options": "UOM"
+ },
+ {
+ "fieldname": "show_cancelled_entries",
+ "label": __("Show Cancelled Entries"),
+ "fieldtype": "Check"
}
],
"formatter": function (value, row, column, data, default_formatter) {
@@ -96,9 +101,3 @@
return value;
},
}
-
-// $(function() {
-// $(wrapper).bind("show", function() {
-// frappe.query_report.load();
-// });
-// });
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 0190f09..abf959e 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -181,6 +181,9 @@
if filters.get("project"):
conditions.append("project=%(project)s")
+ if not filters.get("show_cancelled_entries"):
+ conditions.append("is_cancelled = 0")
+
return "and {}".format(" and ".join(conditions)) if conditions else ""
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index 5697315..b5ae1b7 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -6,7 +6,6 @@
from frappe.utils import flt, cstr, nowdate, nowtime
from erpnext.stock.utils import update_bin
from erpnext.stock.stock_ledger import update_entries_after
-from erpnext.controllers.stock_controller import update_gl_entries_after
def repost(only_actual=False, allow_negative_stock=False, allow_zero_rate=False, only_bin=False):
"""
@@ -56,12 +55,13 @@
update_bin_qty(item_code, warehouse, qty_dict)
-def repost_actual_qty(item_code, warehouse, allow_zero_rate=False, allow_negative_stock=False): update_entries_after({ "item_code": item_code, "warehouse": warehouse },
+def repost_actual_qty(item_code, warehouse, allow_zero_rate=False, allow_negative_stock=False):
+ update_entries_after({ "item_code": item_code, "warehouse": warehouse },
allow_zero_rate=allow_zero_rate, allow_negative_stock=allow_negative_stock)
def get_balance_qty_from_sle(item_code, warehouse):
balance_qty = frappe.db.sql("""select qty_after_transaction from `tabStock Ledger Entry`
- where item_code=%s and warehouse=%s and is_cancelled='No'
+ where item_code=%s and warehouse=%s
order by posting_date desc, posting_time desc, creation desc
limit 1""", (item_code, warehouse))
@@ -191,7 +191,7 @@
print(d[0], d[1], d[2], serial_nos[0][0])
sle = frappe.db.sql("""select valuation_rate, company from `tabStock Ledger Entry`
- where item_code = %s and warehouse = %s and ifnull(is_cancelled, 'No') = 'No'
+ where item_code = %s and warehouse = %s
order by posting_date desc limit 1""", (d[0], d[1]))
sle_dict = {
@@ -208,7 +208,6 @@
'stock_uom' : d[3],
'incoming_rate' : sle and flt(serial_nos[0][0]) > flt(d[2]) and flt(sle[0][0]) or 0,
'company' : sle and cstr(sle[0][1]) or 0,
- 'is_cancelled' : 'No',
'batch_no' : '',
'serial_no' : ''
}
@@ -220,8 +219,7 @@
args = sle_dict.copy()
args.update({
- "sle_id": sle_doc.name,
- "is_amended": 'No'
+ "sle_id": sle_doc.name
})
update_bin(args)
@@ -246,15 +244,3 @@
sr.save()
except:
pass
-
-def repost_gle_for_stock_transactions(posting_date=None, posting_time=None, for_warehouses=None):
- frappe.db.auto_commit_on_many_writes = 1
-
- if not posting_date:
- posting_date = "1900-01-01"
- if not posting_time:
- posting_time = "00:00"
-
- update_gl_entries_after(posting_date, posting_time, for_warehouses=for_warehouses)
-
- frappe.db.auto_commit_on_many_writes = 0
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 7567a1a..b4cb8ca 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -4,8 +4,8 @@
import frappe, erpnext
from frappe import _
-from frappe.utils import cint, flt, cstr, now
-from erpnext.stock.utils import get_valuation_method
+from frappe.utils import cint, flt, cstr, now, now_datetime
+from erpnext.stock.utils import get_valuation_method, get_incoming_outgoing_rate_for_cancel
import json
from six import iteritems
@@ -16,36 +16,48 @@
_exceptions = frappe.local('stockledger_exceptions')
# _exceptions = []
-def make_sl_entries(sl_entries, is_amended=None, allow_negative_stock=False, via_landed_cost_voucher=False):
+def make_sl_entries(sl_entries, allow_negative_stock=False, via_landed_cost_voucher=False):
if sl_entries:
from erpnext.stock.utils import update_bin
- cancel = True if sl_entries[0].get("is_cancelled") == "Yes" else False
+ cancel = sl_entries[0].get("is_cancelled")
if cancel:
- set_as_cancel(sl_entries[0].get('voucher_no'), sl_entries[0].get('voucher_type'))
+ set_as_cancel(sl_entries[0].get('voucher_type'), sl_entries[0].get('voucher_no'))
for sle in sl_entries:
sle_id = None
- if sle.get('is_cancelled') == 'Yes':
- sle['actual_qty'] = -flt(sle['actual_qty'])
+ if via_landed_cost_voucher or cancel:
+ sle['posting_date'] = now_datetime().strftime('%Y-%m-%d')
+ sle['posting_time'] = now_datetime().strftime('%H:%M:%S.%f')
+
+ if cancel:
+ sle['actual_qty'] = -flt(sle.get('actual_qty'), 0)
+
+ if sle['actual_qty'] < 0 and not sle.get('outgoing_rate'):
+ sle['outgoing_rate'] = get_incoming_outgoing_rate_for_cancel(sle.item_code,
+ sle.voucher_type, sle.voucher_no, sle.voucher_detail_no)
+ sle['incoming_rate'] = 0.0
+
+ if sle['actual_qty'] > 0 and not sle.get('incoming_rate'):
+ sle['incoming_rate'] = get_incoming_outgoing_rate_for_cancel(sle.item_code,
+ sle.voucher_type, sle.voucher_no, sle.voucher_detail_no)
+ sle['outgoing_rate'] = 0.0
+
if sle.get("actual_qty") or sle.get("voucher_type")=="Stock Reconciliation":
sle_id = make_entry(sle, allow_negative_stock, via_landed_cost_voucher)
args = sle.copy()
args.update({
- "sle_id": sle_id,
- "is_amended": is_amended
+ "sle_id": sle_id
})
update_bin(args, allow_negative_stock, via_landed_cost_voucher)
- if cancel:
- delete_cancelled_entry(sl_entries[0].get('voucher_type'), sl_entries[0].get('voucher_no'))
def set_as_cancel(voucher_type, voucher_no):
- frappe.db.sql("""update `tabStock Ledger Entry` set is_cancelled='Yes',
+ frappe.db.sql("""update `tabStock Ledger Entry` set is_cancelled=1,
modified=%s, modified_by=%s
- where voucher_no=%s and voucher_type=%s""",
+ where voucher_type=%s and voucher_no=%s and is_cancelled = 0""",
(now(), frappe.session.user, voucher_type, voucher_no))
def make_entry(args, allow_negative_stock=False, via_landed_cost_voucher=False):
@@ -58,9 +70,6 @@
sle.submit()
return sle.name
-def delete_cancelled_entry(voucher_type, voucher_no):
- frappe.db.sql("""delete from `tabStock Ledger Entry`
- where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
class update_entries_after(object):
"""
@@ -106,14 +115,17 @@
self.stock_queue = json.loads(self.previous_sle.stock_queue or "[]")
self.valuation_method = get_valuation_method(self.item_code)
self.stock_value_difference = 0.0
- self.build()
+ self.build(args.get('sle_id'))
- def build(self):
- # includes current entry!
- entries_to_fix = self.get_sle_after_datetime()
-
- for sle in entries_to_fix:
+ def build(self, sle_id):
+ if sle_id:
+ sle = get_sle_by_id(sle_id)
self.process_sle(sle)
+ else:
+ # includes current entry!
+ entries_to_fix = self.get_sle_after_datetime()
+ for sle in entries_to_fix:
+ self.process_sle(sle)
if self.exceptions:
self.raise_exceptions()
@@ -403,7 +415,10 @@
def get_sle_before_datetime(self):
"""get previous stock ledger entry before current time-bucket"""
- return get_stock_ledger_entries(self.args, "<", "desc", "limit 1", for_update=False)
+ if self.args.get('sle_id'):
+ self.args['name'] = self.args.get('sle_id')
+
+ return get_stock_ledger_entries(self.args, "<=", "desc", "limit 1", for_update=False)
def get_sle_after_datetime(self):
"""get Stock Ledger Entries after a particular datetime, for reposting"""
@@ -470,9 +485,10 @@
if operator in (">", "<=") and previous_sle.get("name"):
conditions += " and name!=%(name)s"
- return frappe.db.sql("""select *, timestamp(posting_date, posting_time) as "timestamp" from `tabStock Ledger Entry`
+ return frappe.db.sql("""
+ select *, timestamp(posting_date, posting_time) as "timestamp"
+ from `tabStock Ledger Entry`
where item_code = %%(item_code)s
- and ifnull(is_cancelled, 'No')='No'
%(conditions)s
order by timestamp(posting_date, posting_time) %(order)s, creation %(order)s
%(limit)s %(for_update)s""" % {
@@ -482,6 +498,11 @@
"order": order
}, previous_sle, as_dict=1, debug=debug)
+def get_sle_by_id(sle_id):
+ return frappe.db.get_all('Stock Ledger Entry',
+ fields=['*', 'timestamp(posting_date, posting_time) as timestamp'],
+ filters={'name': sle_id})[0]
+
def get_valuation_rate(item_code, warehouse, voucher_type, voucher_no,
allow_zero_rate=False, currency=None, company=None, raise_error_if_no_rate=True):
# Get valuation rate from last sle for the same item and warehouse
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 7f32b8d..f21dc3f 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -364,4 +364,16 @@
else:
row[data.converted_col] = flt(value_before_conversion) / conversion_factor
- result[row_idx] = row
\ No newline at end of file
+ result[row_idx] = row
+
+def get_incoming_outgoing_rate_for_cancel(item_code, voucher_type, voucher_no, voucher_detail_no):
+ outgoing_rate = frappe.db.sql("""SELECT abs(stock_value_difference / actual_qty)
+ FROM `tabStock Ledger Entry`
+ WHERE voucher_type = %s and voucher_no = %s
+ and item_code = %s and voucher_detail_no = %s
+ ORDER BY CREATION DESC limit 1""",
+ (voucher_type, voucher_no, item_code, voucher_detail_no))
+
+ outgoing_rate = outgoing_rate[0][0] if outgoing_rate else 0.0
+
+ return outgoing_rate
\ No newline at end of file