From 05d3bcb63df47162bfe64412255dd5875b61dbe8 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 28 Apr 2019 18:39:18 +0530 Subject: [PATCH 1/4] stock recon for serial no, batch no --- erpnext/stock/doctype/serial_no/serial_no.py | 2 +- .../stock_ledger_entry/stock_ledger_entry.py | 2 +- .../stock_reconciliation.js | 5 +- .../stock_reconciliation.py | 187 ++++++++++--- .../stock_reconciliation_item.json | 260 +++++++++++++++++- erpnext/stock/stock_ledger.py | 8 + erpnext/stock/utils.py | 4 + 7 files changed, 420 insertions(+), 48 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index c1aef95216..b91fddfc02 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -222,7 +222,7 @@ def validate_serial_no(sle, item_det): frappe.throw(_("Serial No {0} has already been received").format(serial_no), SerialNoDuplicateError) - if (sr.delivery_document_no and sle.voucher_type != 'Stock Entry' + if (sr.delivery_document_no and sle.voucher_type not in ['Stock Entry', 'Stock Reconciliation'] and sle.voucher_type == sr.delivery_document_type): return_against = frappe.db.get_value(sle.voucher_type, sle.voucher_no, 'return_against') if return_against and return_against != sr.delivery_document_no: 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 79da70e313..5fe89d6e22 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -38,7 +38,7 @@ class StockLedgerEntry(Document): self.check_stock_frozen_date() self.actual_amt_check() - if not self.get("via_landed_cost_voucher") and self.voucher_type != 'Stock Reconciliation': + if not self.get("via_landed_cost_voucher"): from erpnext.stock.doctype.serial_no.serial_no import process_serial_no process_serial_no(self) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index ed9d77092a..818a671cab 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -12,8 +12,7 @@ frappe.ui.form.on("Stock Reconciliation", { return { query: "erpnext.controllers.queries.item_query", filters:{ - "is_stock_item": 1, - "has_serial_no": 0 + "is_stock_item": 1 } } }); @@ -93,7 +92,7 @@ frappe.ui.form.on("Stock Reconciliation", { frappe.model.set_value(cdt, cdn, "current_valuation_rate", r.message.rate); frappe.model.set_value(cdt, cdn, "current_amount", r.message.rate * r.message.qty); frappe.model.set_value(cdt, cdn, "amount", r.message.rate * r.message.qty); - + frappe.model.set_value(cdt, cdn, "current_serial_no", r.message.serial_nos); } }); } diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 205beed744..b1abe89275 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -9,7 +9,8 @@ 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.utils import get_stock_balance +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos +from erpnext.stock.utils import get_stock_balance, get_incoming_rate, get_available_serial_nos class OpeningEntryAccountError(frappe.ValidationError): pass class EmptyStockReconciliationItemsError(frappe.ValidationError): pass @@ -42,23 +43,28 @@ class StockReconciliation(StockController): """Remove items if qty or rate is not changed""" self.difference_amount = 0.0 def _changed(item): - qty, rate = get_stock_balance(item.item_code, item.warehouse, - self.posting_date, self.posting_time, with_valuation_rate=True) - if (item.qty==None or item.qty==qty) and (item.valuation_rate==None or item.valuation_rate==rate): + item_dict = get_stock_balance_for(item.item_code, item.warehouse, + self.posting_date, self.posting_time) + + if ((item.qty==None or item.qty==item_dict.get("qty")) + and (item.valuation_rate==None or item.valuation_rate==item_dict.get("rate"))): return False else: # set default as current rates if item.qty==None: - item.qty = qty + item.qty = item_dict.get("qty") if item.valuation_rate==None: - item.valuation_rate = rate + item.valuation_rate = item_dict.get("rate") - item.current_qty = qty - item.current_valuation_rate = rate + if item_dict.get("serial_nos"): + item.current_serial_no = item_dict.get("serial_nos") + + item.current_qty = item_dict.get("qty") + item.current_valuation_rate = item_dict.get("rate") self.difference_amount += (flt(item.qty, item.precision("qty")) * \ flt(item.valuation_rate or rate, item.precision("valuation_rate")) \ - - flt(qty, item.precision("qty")) * flt(rate, item.precision("valuation_rate"))) + - flt(item_dict.get("qty"), item.precision("qty")) * flt(item_dict.get("rate"), item.precision("valuation_rate"))) return True items = list(filter(lambda d: _changed(d), self.items)) @@ -89,7 +95,7 @@ class StockReconciliation(StockController): else: item_warehouse_combinations.append([row.item_code, row.warehouse]) - self.validate_item(row.item_code, row_num+1) + self.validate_item(row.item_code, row) # validate warehouse if not frappe.db.get_value("Warehouse", row.warehouse): @@ -131,7 +137,7 @@ class StockReconciliation(StockController): raise frappe.ValidationError(self.validation_messages) - def validate_item(self, item_code, row_num): + def validate_item(self, item_code, row): from erpnext.stock.doctype.item.item import validate_end_of_life, \ validate_is_stock_item, validate_cancelled_item @@ -145,51 +151,121 @@ class StockReconciliation(StockController): validate_is_stock_item(item_code, item.is_stock_item, verbose=0) # item should not be serialized - if item.has_serial_no == 1: - raise frappe.ValidationError(_("Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry").format(item_code)) + if item.has_serial_no and not row.serial_no: + raise frappe.ValidationError(_("Serial nos are required for serialized item {0}").format(item_code)) # item managed batch-wise not allowed - if item.has_batch_no == 1: - raise frappe.ValidationError(_("Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry").format(item_code)) + if item.has_batch_no and not row.batch: + raise frappe.ValidationError(_("Batch no is required for batched item {0}").format(item_code)) # docstatus should be < 2 validate_cancelled_item(item_code, item.docstatus, verbose=0) except Exception as e: - self.validation_messages.append(_("Row # ") + ("%d: " % (row_num)) + cstr(e)) + self.validation_messages.append(_("Row # ") + ("%d: " % (row.idx)) + cstr(e)) def update_stock_ledger(self): """ find difference between current and expected entries and create stock ledger entries based on the difference""" from erpnext.stock.stock_ledger import get_previous_sle + sl_entries = [] for row in self.items: + if row.serial_no: + self.get_sle_for_serialized_items(row, sl_entries) + else: + previous_sle = get_previous_sle({ + "item_code": row.item_code, + "warehouse": row.warehouse, + "posting_date": self.posting_date, + "posting_time": self.posting_time + }) + + if previous_sle: + if row.qty in ("", None): + row.qty = previous_sle.get("qty_after_transaction", 0) + + if row.valuation_rate in ("", None): + row.valuation_rate = previous_sle.get("valuation_rate", 0) + + if row.qty and not row.valuation_rate: + frappe.throw(_("Valuation Rate required for Item in row {0}").format(row.idx)) + + if ((previous_sle and row.qty == previous_sle.get("qty_after_transaction") + and (row.valuation_rate == previous_sle.get("valuation_rate") or row.qty == 0)) + or (not previous_sle and not row.qty)): + continue + + sl_entries.append(self.get_sle_for_items(row)) + + if sl_entries: + self.make_sl_entries(sl_entries) + + def get_sle_for_serialized_items(self, row, sl_entries): + from erpnext.stock.stock_ledger import get_previous_sle + + # To issue existing serial nos + if row.current_serial_no: + args = self.get_sle_for_items(row) + args.update({ + 'actual_qty': -1 * row.current_qty, + 'serial_no': row.current_serial_no, + 'qty_after_transaction': 0, + 'valuation_rate': row.current_valuation_rate + }) + + sl_entries.append(args) + + for serial_no in get_serial_nos(row.serial_no): + args = self.get_sle_for_items(row, [serial_no]) + previous_sle = get_previous_sle({ "item_code": row.item_code, - "warehouse": row.warehouse, "posting_date": self.posting_date, - "posting_time": self.posting_time + "posting_time": self.posting_time, + "serial_no": serial_no }) - if previous_sle: - if row.qty in ("", None): - row.qty = previous_sle.get("qty_after_transaction", 0) - if row.valuation_rate in ("", None): - row.valuation_rate = previous_sle.get("valuation_rate", 0) + if previous_sle and row.warehouse != previous_sle.get("warehouse"): + # If serial no exists in different warehouse - if row.qty and not row.valuation_rate: - frappe.throw(_("Valuation Rate required for Item in row {0}").format(row.idx)) + new_args = args.copy() + new_args.update({ + 'actual_qty': -1, + 'qty_after_transaction': cint(previous_sle.get('qty_after_transaction')) - 1, + 'warehouse': previous_sle.get("warehouse", '') or row.warehouse, + 'valuation_rate': previous_sle.get("valuation_rate") + }) - if ((previous_sle and row.qty == previous_sle.get("qty_after_transaction") - and (row.valuation_rate == previous_sle.get("valuation_rate") or row.qty == 0)) - or (not previous_sle and not row.qty)): - continue + sl_entries.append(new_args) - self.insert_entries(row) + if self.docstatus == 2: + args.update({ + 'actual_qty': 1, + 'incoming_rate': row.valuation_rate, + 'valuation_rate': row.valuation_rate + }) - def insert_entries(self, row): + sl_entries.append(args) + + if self.docstatus == 1: + args = self.get_sle_for_items(row) + + args.update({ + 'actual_qty': row.qty, + 'incoming_rate': row.valuation_rate, + 'valuation_rate': row.valuation_rate + }) + + sl_entries.append(args) + + def get_sle_for_items(self, row, serial_nos=None): """Insert Stock Ledger Entries""" - args = frappe._dict({ + + if not serial_nos and row.serial_no: + serial_nos = get_serial_nos(row.serial_no) + + return frappe._dict({ "doctype": "Stock Ledger Entry", "item_code": row.item_code, "warehouse": row.warehouse, @@ -199,11 +275,11 @@ class StockReconciliation(StockController): "voucher_no": self.name, "company": self.company, "stock_uom": frappe.db.get_value("Item", row.item_code, "stock_uom"), - "is_cancelled": "No", + "is_cancelled": "No" if self.docstatus != 2 else "Yes", "qty_after_transaction": flt(row.qty, row.precision("qty")), + "serial_no": '\n'.join(serial_nos) if serial_nos else '', "valuation_rate": flt(row.valuation_rate, row.precision("valuation_rate")) }) - self.make_sl_entries([args]) def delete_and_repost_sle(self): """ Delete Stock Ledger Entries related to this voucher @@ -217,6 +293,15 @@ class StockReconciliation(StockController): frappe.db.sql("""delete from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s""", (self.doctype, self.name)) + sl_entries = [] + for row in self.items: + if row.serial_no: + self.get_sle_for_serialized_items(row, sl_entries) + + if sl_entries: + sl_entries.reverse() + self.make_sl_entries(sl_entries) + # repost future entries for selected item_code, warehouse for entries in existing_entries: update_entries_after({ @@ -310,17 +395,43 @@ def get_items(warehouse, posting_date, posting_time, company): return res @frappe.whitelist() -def get_stock_balance_for(item_code, warehouse, posting_date, posting_time): +def get_stock_balance_for(item_code, warehouse, posting_date, posting_time, with_valuation_rate= True): frappe.has_permission("Stock Reconciliation", "write", throw = True) - qty, rate = get_stock_balance(item_code, warehouse, - posting_date, posting_time, with_valuation_rate=True) + has_serial_no = frappe.get_cached_value("Item", item_code, "has_serial_no") + + serial_nos = "" + if has_serial_no: + qty, rate, serial_nos = get_qty_rate_for_serial_nos(item_code, + warehouse, posting_date, posting_time) + else: + qty, rate = get_stock_balance(item_code, warehouse, + posting_date, posting_time, with_valuation_rate=with_valuation_rate) return { 'qty': qty, - 'rate': rate + 'rate': rate, + 'serial_nos': serial_nos } +def get_qty_rate_for_serial_nos(item_code, warehouse, posting_date, posting_time): + serial_nos_list = [serial_no.get("name") + for serial_no in get_available_serial_nos(item_code, warehouse)] + + qty = len(serial_nos_list) + serial_nos = '\n'.join(serial_nos_list) + + rate = get_incoming_rate({ + "item_code": item_code, + "warehouse": warehouse, + "posting_date": posting_date, + "posting_time": posting_time, + "qty": qty, + "serial_no":serial_nos, + }) + + return qty, rate, serial_nos + @frappe.whitelist() def get_difference_account(purpose, company): if purpose == 'Stock Reconciliation': diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json index 0fafe8306c..d64c218a6d 100644 --- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json +++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_events_in_timeline": 0, "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, @@ -14,10 +15,12 @@ "fields": [ { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "barcode", "fieldtype": "Data", "hidden": 0, @@ -40,14 +43,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 3, + "fetch_if_empty": 0, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -71,14 +77,17 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, @@ -101,14 +110,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 3, + "fetch_if_empty": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -132,14 +144,17 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "column_break_6", "fieldtype": "Column Break", "hidden": 0, @@ -161,15 +176,18 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 2, "description": "", + "fetch_if_empty": 0, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -192,15 +210,18 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 2, "description": "", + "fetch_if_empty": 0, "fieldname": "valuation_rate", "fieldtype": "Currency", "hidden": 0, @@ -224,14 +245,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -255,14 +279,149 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, + "fieldname": "serial_no_and_batch_section", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Serial No and Batch", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "serial_no", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Serial No", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "column_break_11", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "batch", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Batch", + "length": 0, + "no_copy": 0, + "options": "Batch", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, "fieldname": "section_break_3", "fieldtype": "Section Break", "hidden": 0, @@ -285,15 +444,18 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, "description": "", + "fetch_if_empty": 0, "fieldname": "current_qty", "fieldtype": "Float", "hidden": 0, @@ -316,14 +478,85 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, + "fieldname": "current_batch", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Current Batch No", + "length": 0, + "no_copy": 1, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "current_serial_no", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Current Serial No", + "length": 0, + "no_copy": 1, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, "fieldname": "column_break_9", "fieldtype": "Column Break", "hidden": 0, @@ -345,15 +578,18 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, "description": "", + "fetch_if_empty": 0, "fieldname": "current_valuation_rate", "fieldtype": "Currency", "hidden": 0, @@ -377,15 +613,18 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, "description": "", + "fetch_if_empty": 0, "fieldname": "current_amount", "fieldtype": "Currency", "hidden": 0, @@ -409,14 +648,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "section_break_14", "fieldtype": "Section Break", "hidden": 0, @@ -438,14 +680,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "quantity_difference", "fieldtype": "Read Only", "hidden": 0, @@ -468,14 +713,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "column_break_16", "fieldtype": "Column Break", "hidden": 0, @@ -497,14 +745,17 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, + "fetch_if_empty": 0, "fieldname": "amount_difference", "fieldtype": "Currency", "hidden": 0, @@ -528,21 +779,20 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 } ], "has_web_view": 0, - "hide_heading": 0, "hide_toolbar": 0, "idx": 0, - "image_view": 0, "in_create": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2017-08-03 00:03:40.412071", + "modified": "2019-04-24 19:07:59.113660", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reconciliation Item", @@ -551,10 +801,10 @@ "permissions": [], "quick_entry": 1, "read_only": 0, - "read_only_onload": 0, "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", "track_changes": 1, - "track_seen": 0 + "track_seen": 0, + "track_views": 0 } \ No newline at end of file diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index c8706b291e..6a92ce8bd2 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -157,7 +157,11 @@ class update_entries_after(object): if sle.serial_no: self.get_serialized_values(sle) self.qty_after_transaction += flt(sle.actual_qty) + if sle.voucher_type == "Stock Reconciliation": + self.qty_after_transaction = sle.qty_after_transaction + self.stock_value = flt(self.qty_after_transaction) * flt(self.valuation_rate) + frappe.errprint([self.stock_value, self.qty_after_transaction, self.valuation_rate]) else: if sle.voucher_type=="Stock Reconciliation": # assert @@ -177,6 +181,7 @@ class update_entries_after(object): # rounding as per precision self.stock_value = flt(self.stock_value, self.precision) + frappe.errprint([self.stock_value, self.qty_after_transaction, self.valuation_rate, "wefjlk"]) if self.prev_stock_value < 0 and self.stock_value >= 0 and sle.voucher_type != 'Stock Reconciliation': stock_value_difference = sle.actual_qty * self.valuation_rate @@ -420,6 +425,9 @@ def get_stock_ledger_entries(previous_sle, operator=None, order="desc", limit=No elif previous_sle.get("warehouse_condition"): conditions += " and " + previous_sle.get("warehouse_condition") + if previous_sle.get("serial_no"): + conditions += " and serial_no like {}".format(frappe.db.escape('%{0}%'.format(previous_sle.get("serial_no")))) + if not previous_sle.get("posting_date"): previous_sle["posting_date"] = "1900-01-01" if not previous_sle.get("posting_time"): diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index 76631fad64..ea8e8805a6 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -277,3 +277,7 @@ def update_included_uom_in_report(columns, result, include_uom, conversion_facto new_row.append(None) result[row_idx] = new_row + +def get_available_serial_nos(item_code, warehouse): + return frappe.get_all("Serial No", filters = {'item_code': item_code, + 'warehouse': warehouse, 'delivery_document_no': ''}) or [] \ No newline at end of file From 66aa37f1e2dbba02007cfae0309c51f06a0f539b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 24 May 2019 16:53:51 +0530 Subject: [PATCH 2/4] provision to add batch number in the stock reconciliation --- erpnext/stock/doctype/batch/batch.py | 4 +- .../stock_reconciliation.js | 17 +- .../stock_reconciliation.py | 75 +- .../stock_reconciliation_item.json | 939 +++--------------- erpnext/stock/stock_ledger.py | 11 +- 5 files changed, 230 insertions(+), 816 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 4881983b8e..c540ac5227 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -257,10 +257,10 @@ def get_batches(item_code, warehouse, qty=1, throw=False): 'on (`tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no )' 'where `tabStock Ledger Entry`.item_code = %s and `tabStock Ledger Entry`.warehouse = %s ' 'and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)' - 'group by batch_id ' + 'group by batch_id having qty > 0' 'order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC', (item_code, warehouse), - as_dict=True + as_dict=True, debug=1 ) return batches diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index 818a671cab..a00e6e64bf 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -76,6 +76,7 @@ frappe.ui.form.on("Stock Reconciliation", { set_valuation_rate_and_qty: function(frm, cdt, cdn) { var d = frappe.model.get_doc(cdt, cdn); + if(d.item_code && d.warehouse) { frappe.call({ method: "erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_stock_balance_for", @@ -83,7 +84,8 @@ frappe.ui.form.on("Stock Reconciliation", { item_code: d.item_code, warehouse: d.warehouse, posting_date: frm.doc.posting_date, - posting_time: frm.doc.posting_time + posting_time: frm.doc.posting_time, + batch_no: d.batch_no }, callback: function(r) { frappe.model.set_value(cdt, cdn, "qty", r.message.qty); @@ -152,9 +154,22 @@ frappe.ui.form.on("Stock Reconciliation Item", { frm.events.set_item_code(frm, cdt, cdn); }, warehouse: function(frm, cdt, cdn) { + var child = locals[cdt][cdn]; + if (child.batch_no) { + frappe.model.set_value(child.cdt, child.cdn, "batch_no", ""); + } + frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); }, item_code: function(frm, cdt, cdn) { + var child = locals[cdt][cdn]; + if (child.batch_no) { + frappe.model.set_value(child.cdt, child.cdn, "batch_no", ""); + } + + frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); + }, + batch_no: function(frm, cdt, cdn) { frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); }, qty: function(frm, cdt, cdn) { diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index b1abe89275..9aec76d7e6 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -11,6 +11,7 @@ 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 from erpnext.stock.utils import get_stock_balance, get_incoming_rate, get_available_serial_nos +from erpnext.stock.doctype.batch.batch import get_batch_qty class OpeningEntryAccountError(frappe.ValidationError): pass class EmptyStockReconciliationItemsError(frappe.ValidationError): pass @@ -44,7 +45,7 @@ class StockReconciliation(StockController): self.difference_amount = 0.0 def _changed(item): item_dict = get_stock_balance_for(item.item_code, item.warehouse, - self.posting_date, self.posting_time) + self.posting_date, self.posting_time, batch_no=item.batch_no) if ((item.qty==None or item.qty==item_dict.get("qty")) and (item.valuation_rate==None or item.valuation_rate==item_dict.get("rate"))): @@ -90,10 +91,15 @@ class StockReconciliation(StockController): for row_num, row in enumerate(self.items): # find duplicates - if [row.item_code, row.warehouse] in item_warehouse_combinations: + key = [row.item_code, row.warehouse] + for field in ['serial_no', 'batch_no']: + if row.get(field): + key.append(row.get(field)) + + if key in item_warehouse_combinations: self.validation_messages.append(_get_msg(row_num, _("Duplicate entry"))) else: - item_warehouse_combinations.append([row.item_code, row.warehouse]) + item_warehouse_combinations.append(key) self.validate_item(row.item_code, row) @@ -155,9 +161,12 @@ class StockReconciliation(StockController): raise frappe.ValidationError(_("Serial nos are required for serialized item {0}").format(item_code)) # item managed batch-wise not allowed - if item.has_batch_no and not row.batch: + if item.has_batch_no and not row.batch_no and not item.create_new_batch: raise frappe.ValidationError(_("Batch no is required for batched item {0}").format(item_code)) + if self._action=="submit" and item.create_new_batch: + self.make_batches('warehouse') + # docstatus should be < 2 validate_cancelled_item(item_code, item.docstatus, verbose=0) @@ -171,7 +180,7 @@ class StockReconciliation(StockController): sl_entries = [] for row in self.items: - if row.serial_no: + if row.serial_no or row.batch_no: self.get_sle_for_serialized_items(row, sl_entries) else: previous_sle = get_previous_sle({ @@ -205,15 +214,20 @@ class StockReconciliation(StockController): from erpnext.stock.stock_ledger import get_previous_sle # To issue existing serial nos - if row.current_serial_no: + if row.current_qty and (row.current_serial_no or row.batch_no): args = self.get_sle_for_items(row) args.update({ 'actual_qty': -1 * row.current_qty, 'serial_no': row.current_serial_no, - 'qty_after_transaction': 0, + 'batch_no': row.batch_no, 'valuation_rate': row.current_valuation_rate }) + if row.current_serial_no: + args.update({ + 'qty_after_transaction': 0, + }) + sl_entries.append(args) for serial_no in get_serial_nos(row.serial_no): @@ -265,7 +279,7 @@ class StockReconciliation(StockController): if not serial_nos and row.serial_no: serial_nos = get_serial_nos(row.serial_no) - return frappe._dict({ + data = frappe._dict({ "doctype": "Stock Ledger Entry", "item_code": row.item_code, "warehouse": row.warehouse, @@ -276,11 +290,16 @@ class StockReconciliation(StockController): "company": self.company, "stock_uom": frappe.db.get_value("Item", row.item_code, "stock_uom"), "is_cancelled": "No" if self.docstatus != 2 else "Yes", - "qty_after_transaction": flt(row.qty, row.precision("qty")), "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")) }) + if not row.batch_no: + data.qty_after_transaction = flt(row.qty, row.precision("qty")) + + return data + def delete_and_repost_sle(self): """ Delete Stock Ledger Entries related to this voucher and repost future Stock Ledger Entries""" @@ -295,7 +314,7 @@ class StockReconciliation(StockController): sl_entries = [] for row in self.items: - if row.serial_no: + if row.serial_no or row.batch_no: self.get_sle_for_serialized_items(row, sl_entries) if sl_entries: @@ -395,41 +414,51 @@ def get_items(warehouse, posting_date, posting_time, company): return res @frappe.whitelist() -def get_stock_balance_for(item_code, warehouse, posting_date, posting_time, with_valuation_rate= True): +def get_stock_balance_for(item_code, warehouse, + posting_date, posting_time, batch_no=None, with_valuation_rate= True): frappe.has_permission("Stock Reconciliation", "write", throw = True) - has_serial_no = frappe.get_cached_value("Item", item_code, "has_serial_no") + item_dict = frappe.db.get_value("Item", item_code, + ["has_serial_no", "has_batch_no"], as_dict=1) serial_nos = "" - if has_serial_no: + if item_dict.get("has_serial_no"): qty, rate, serial_nos = get_qty_rate_for_serial_nos(item_code, - warehouse, posting_date, posting_time) + warehouse, posting_date, posting_time, item_dict) else: qty, rate = get_stock_balance(item_code, warehouse, posting_date, posting_time, with_valuation_rate=with_valuation_rate) + if item_dict.get("has_batch_no"): + qty = get_batch_qty(batch_no, warehouse) or 0 + + print(qty, rate, batch_no, warehouse) return { 'qty': qty, 'rate': rate, 'serial_nos': serial_nos } -def get_qty_rate_for_serial_nos(item_code, warehouse, posting_date, posting_time): +def get_qty_rate_for_serial_nos(item_code, warehouse, posting_date, posting_time, item_dict): + args = { + "item_code": item_code, + "warehouse": warehouse, + "posting_date": posting_date, + "posting_time": posting_time, + } + serial_nos_list = [serial_no.get("name") for serial_no in get_available_serial_nos(item_code, warehouse)] qty = len(serial_nos_list) serial_nos = '\n'.join(serial_nos_list) - - rate = get_incoming_rate({ - "item_code": item_code, - "warehouse": warehouse, - "posting_date": posting_date, - "posting_time": posting_time, - "qty": qty, - "serial_no":serial_nos, + args.update({ + 'qty': qty, + "serial_nos": serial_nos }) + rate = get_incoming_rate(args) + return qty, rate, serial_nos @frappe.whitelist() diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json index d64c218a6d..dce87e5ae3 100644 --- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json +++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json @@ -1,810 +1,181 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2015-02-17 01:06:05.072764", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Other", - "editable_grid": 1, - "engine": "InnoDB", + "creation": "2015-02-17 01:06:05.072764", + "doctype": "DocType", + "document_type": "Other", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "barcode", + "item_code", + "item_name", + "warehouse", + "column_break_6", + "qty", + "valuation_rate", + "amount", + "serial_no_and_batch_section", + "serial_no", + "column_break_11", + "batch_no", + "section_break_3", + "current_qty", + "current_serial_no", + "column_break_9", + "current_valuation_rate", + "current_amount", + "section_break_14", + "quantity_difference", + "column_break_16", + "amount_difference" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "barcode", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Barcode", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "barcode", + "fieldtype": "Data", + "label": "Barcode", + "print_hide": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 3, - "fetch_if_empty": 0, - "fieldname": "item_code", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Item Code", - "length": 0, - "no_copy": 0, - "options": "Item", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "columns": 3, + "fieldname": "item_code", + "fieldtype": "Link", + "in_global_search": 1, + "in_list_view": 1, + "label": "Item Code", + "options": "Item", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "item_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Item Name", - "length": 0, - "no_copy": 1, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "item_name", + "fieldtype": "Data", + "in_global_search": 1, + "label": "Item Name", + "no_copy": 1, + "print_hide": 1, + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 3, - "fetch_if_empty": 0, - "fieldname": "warehouse", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Warehouse", - "length": 0, - "no_copy": 0, - "options": "Warehouse", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "columns": 3, + "fieldname": "warehouse", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Warehouse", + "options": "Warehouse", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "column_break_6", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "column_break_6", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 2, - "description": "", - "fetch_if_empty": 0, - "fieldname": "qty", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Quantity", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "columns": 2, + "fieldname": "qty", + "fieldtype": "Float", + "in_list_view": 1, + "label": "Quantity" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 2, - "description": "", - "fetch_if_empty": 0, - "fieldname": "valuation_rate", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Valuation Rate", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "columns": 2, + "fieldname": "valuation_rate", + "fieldtype": "Currency", + "in_list_view": 1, + "label": "Valuation Rate", + "options": "Company:company:default_currency" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Amount", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "amount", + "fieldtype": "Currency", + "label": "Amount", + "options": "Company:company:default_currency", + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "serial_no_and_batch_section", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Serial No and Batch", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "serial_no_and_batch_section", + "fieldtype": "Section Break", + "label": "Serial No and Batch" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "serial_no", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Serial No", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "serial_no", + "fieldtype": "Small Text", + "label": "Serial No" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "column_break_11", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "column_break_11", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "batch", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Batch", - "length": 0, - "no_copy": 0, - "options": "Batch", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "section_break_3", + "fieldtype": "Section Break", + "label": "Before reconciliation" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "section_break_3", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Before reconciliation", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "current_qty", + "fieldtype": "Float", + "label": "Current Qty", + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fetch_if_empty": 0, - "fieldname": "current_qty", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Current Qty", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "current_serial_no", + "fieldtype": "Small Text", + "label": "Current Serial No", + "no_copy": 1, + "print_hide": 1, + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "current_batch", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Current Batch No", - "length": 0, - "no_copy": 1, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "column_break_9", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "current_serial_no", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Current Serial No", - "length": 0, - "no_copy": 1, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "current_valuation_rate", + "fieldtype": "Currency", + "label": "Current Valuation Rate", + "options": "Company:company:default_currency", + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "column_break_9", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "current_amount", + "fieldtype": "Currency", + "label": "Current Amount", + "options": "Company:company:default_currency", + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fetch_if_empty": 0, - "fieldname": "current_valuation_rate", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Current Valuation Rate", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "section_break_14", + "fieldtype": "Section Break" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fetch_if_empty": 0, - "fieldname": "current_amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Current Amount", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "quantity_difference", + "fieldtype": "Read Only", + "label": "Quantity Difference" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "section_break_14", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "column_break_16", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "quantity_difference", - "fieldtype": "Read Only", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Quantity Difference", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "amount_difference", + "fieldtype": "Currency", + "label": "Amount Difference", + "options": "Company:company:default_currency", + "read_only": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "column_break_16", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "amount_difference", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Amount Difference", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "fieldname": "batch_no", + "fieldtype": "Link", + "label": "Batch No", + "options": "Batch" } - ], - "has_web_view": 0, - "hide_toolbar": 0, - "idx": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "menu_index": 0, - "modified": "2019-04-24 19:07:59.113660", - "modified_by": "Administrator", - "module": "Stock", - "name": "Stock Reconciliation Item", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + ], + "istable": 1, + "modified": "2019-05-24 12:34:50.018491", + "modified_by": "Administrator", + "module": "Stock", + "name": "Stock Reconciliation Item", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 } \ No newline at end of file diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 6a92ce8bd2..e46823ea62 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -161,9 +161,8 @@ class update_entries_after(object): self.qty_after_transaction = sle.qty_after_transaction self.stock_value = flt(self.qty_after_transaction) * flt(self.valuation_rate) - frappe.errprint([self.stock_value, self.qty_after_transaction, self.valuation_rate]) else: - if sle.voucher_type=="Stock Reconciliation": + if sle.voucher_type=="Stock Reconciliation" and not sle.batch_no: # assert self.valuation_rate = sle.valuation_rate self.qty_after_transaction = sle.qty_after_transaction @@ -181,7 +180,6 @@ class update_entries_after(object): # rounding as per precision self.stock_value = flt(self.stock_value, self.precision) - frappe.errprint([self.stock_value, self.qty_after_transaction, self.valuation_rate, "wefjlk"]) if self.prev_stock_value < 0 and self.stock_value >= 0 and sle.voucher_type != 'Stock Reconciliation': stock_value_difference = sle.actual_qty * self.valuation_rate @@ -376,7 +374,7 @@ class update_entries_after(object): """get Stock Ledger Entries after a particular datetime, for reposting""" return get_stock_ledger_entries(self.previous_sle or frappe._dict({ "item_code": self.args.get("item_code"), "warehouse": self.args.get("warehouse") }), - ">", "asc", for_update=True) + ">", "asc", for_update=True, check_serial_no=False) def raise_exceptions(self): deficiency = min(e["diff"] for e in self.exceptions) @@ -417,7 +415,8 @@ def get_previous_sle(args, for_update=False): sle = get_stock_ledger_entries(args, "<=", "desc", "limit 1", for_update=for_update) return sle and sle[0] or {} -def get_stock_ledger_entries(previous_sle, operator=None, order="desc", limit=None, for_update=False, debug=False): +def get_stock_ledger_entries(previous_sle, operator=None, + order="desc", limit=None, for_update=False, debug=False, check_serial_no=True): """get stock ledger entries filtered by specific posting datetime conditions""" conditions = " and timestamp(posting_date, posting_time) {0} timestamp(%(posting_date)s, %(posting_time)s)".format(operator) if previous_sle.get("warehouse"): @@ -425,7 +424,7 @@ def get_stock_ledger_entries(previous_sle, operator=None, order="desc", limit=No elif previous_sle.get("warehouse_condition"): conditions += " and " + previous_sle.get("warehouse_condition") - if previous_sle.get("serial_no"): + if check_serial_no and previous_sle.get("serial_no"): conditions += " and serial_no like {}".format(frappe.db.escape('%{0}%'.format(previous_sle.get("serial_no")))) if not previous_sle.get("posting_date"): From 87c4b06437dcded371dd705b5e9b1c9a837443d0 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sat, 1 Jun 2019 14:22:46 +0530 Subject: [PATCH 3/4] Test cases for serial no --- erpnext/stock/doctype/serial_no/serial_no.py | 7 +- .../stock_reconciliation.py | 33 +++++-- .../test_stock_reconciliation.py | 86 ++++++++++++++++++- .../stock_reconciliation_item.json | 9 +- erpnext/stock/utils.py | 2 +- 5 files changed, 124 insertions(+), 13 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index b91fddfc02..4ab95c7e14 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -299,7 +299,7 @@ def validate_so_serial_no(sr, sales_order,): be delivered""").format(sales_order, sr.item_code, sr.name)) def has_duplicate_serial_no(sn, sle): - if sn.warehouse: + if sn.warehouse and sle.voucher_type != 'Stock Reconciliation': return True if sn.company != sle.company: @@ -413,14 +413,17 @@ def update_serial_nos_after_submit(controller, parentfield): update_rejected_serial_nos = True if (controller.doctype in ("Purchase Receipt", "Purchase Invoice") and d.rejected_qty) else False accepted_serial_nos_updated = False + if controller.doctype == "Stock Entry": warehouse = d.t_warehouse qty = d.transfer_qty else: warehouse = d.warehouse - qty = d.stock_qty + qty = (d.qty if controller.doctype == "Stock Reconciliation" + else d.stock_qty) for sle in stock_ledger_entries: + print(accepted_serial_nos_updated, qty, sle.actual_qty) if sle.voucher_detail_no==d.name: if not accepted_serial_nos_updated and qty and abs(sle.actual_qty)==qty \ and sle.warehouse == warehouse and sle.serial_no != d.serial_no: diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 9aec76d7e6..cdf6068f11 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -36,6 +36,9 @@ class StockReconciliation(StockController): self.update_stock_ledger() self.make_gl_entries() + from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit + update_serial_nos_after_submit(self, "items") + def on_cancel(self): self.delete_and_repost_sle() self.make_gl_entries_on_cancel() @@ -48,7 +51,8 @@ class StockReconciliation(StockController): self.posting_date, self.posting_time, batch_no=item.batch_no) if ((item.qty==None or item.qty==item_dict.get("qty")) - and (item.valuation_rate==None or item.valuation_rate==item_dict.get("rate"))): + and (item.valuation_rate==None or item.valuation_rate==item_dict.get("rate")) + and item.serial_no == item_dict.get("serial_nos")): return False else: # set default as current rates @@ -64,7 +68,7 @@ class StockReconciliation(StockController): item.current_qty = item_dict.get("qty") item.current_valuation_rate = item_dict.get("rate") self.difference_amount += (flt(item.qty, item.precision("qty")) * \ - flt(item.valuation_rate or rate, item.precision("valuation_rate")) \ + flt(item.valuation_rate or item_dict.get("rate"), item.precision("valuation_rate")) \ - flt(item_dict.get("qty"), item.precision("qty")) * flt(item_dict.get("rate"), item.precision("valuation_rate"))) return True @@ -157,7 +161,7 @@ class StockReconciliation(StockController): validate_is_stock_item(item_code, item.is_stock_item, verbose=0) # item should not be serialized - if item.has_serial_no and not row.serial_no: + if item.has_serial_no and not row.serial_no and not item.serial_no_series: raise frappe.ValidationError(_("Serial nos are required for serialized item {0}").format(item_code)) # item managed batch-wise not allowed @@ -180,7 +184,8 @@ class StockReconciliation(StockController): sl_entries = [] for row in self.items: - if row.serial_no or row.batch_no: + item = frappe.get_doc("Item", row.item_code) + if item.has_serial_no or item.has_batch_no: self.get_sle_for_serialized_items(row, sl_entries) else: previous_sle = get_previous_sle({ @@ -213,6 +218,9 @@ class StockReconciliation(StockController): def get_sle_for_serialized_items(self, row, sl_entries): from erpnext.stock.stock_ledger import get_previous_sle + serial_nos = get_serial_nos(row.serial_no) + + # To issue existing serial nos if row.current_qty and (row.current_serial_no or row.batch_no): args = self.get_sle_for_items(row) @@ -230,7 +238,7 @@ class StockReconciliation(StockController): sl_entries.append(args) - for serial_no in get_serial_nos(row.serial_no): + for serial_no in serial_nos: args = self.get_sle_for_items(row, [serial_no]) previous_sle = get_previous_sle({ @@ -262,7 +270,7 @@ class StockReconciliation(StockController): sl_entries.append(args) - if self.docstatus == 1: + if self.docstatus == 1 and not row.remove_serial_no_from_stock: args = self.get_sle_for_items(row) args.update({ @@ -273,6 +281,15 @@ class StockReconciliation(StockController): sl_entries.append(args) + if serial_nos == get_serial_nos(row.current_serial_no): + # update valuation rate + self.update_valuation_rate_for_serial_nos(row, serial_nos) + + def update_valuation_rate_for_serial_nos(self, row, serial_nos): + valuation_rate = row.valuation_rate if self.docstatus == 1 else row.current_valuation_rate + for d in serial_nos: + frappe.db.set_value("Serial No", d, 'purchase_rate', valuation_rate) + def get_sle_for_items(self, row, serial_nos=None): """Insert Stock Ledger Entries""" @@ -287,6 +304,7 @@ class StockReconciliation(StockController): "posting_time": self.posting_time, "voucher_type": self.doctype, "voucher_no": self.name, + "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", @@ -432,7 +450,6 @@ def get_stock_balance_for(item_code, warehouse, if item_dict.get("has_batch_no"): qty = get_batch_qty(batch_no, warehouse) or 0 - print(qty, rate, batch_no, warehouse) return { 'qty': qty, 'rate': rate, @@ -457,7 +474,7 @@ def get_qty_rate_for_serial_nos(item_code, warehouse, posting_date, posting_time "serial_nos": serial_nos }) - rate = get_incoming_rate(args) + rate = get_incoming_rate(args, raise_error_if_no_rate=False) or 0 return qty, rate, serial_nos diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 2dc585b8d6..5ee8228edf 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -13,9 +13,12 @@ from erpnext.stock.stock_ledger import get_previous_sle, update_entries_after from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import EmptyStockReconciliationItemsError, get_items from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse from erpnext.stock.doctype.item.test_item import create_item +from erpnext.stock.utils import get_stock_balance, get_incoming_rate, get_available_serial_nos +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos class TestStockReconciliation(unittest.TestCase): def setUp(self): + create_batch_or_serial_no_items() frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1) self.insert_existing_sle() @@ -106,6 +109,83 @@ class TestStockReconciliation(unittest.TestCase): make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item", target="_Test Warehouse - _TC", qty=15, basic_rate=1200) + def test_stock_reco_for_serialized_item(self): + set_perpetual_inventory() + + to_delete_records = [] + to_delete_serial_nos = [] + + # Add new serial nos + serial_item_code = "Stock-Reco-Serial-Item-1" + serial_warehouse = "_Test Warehouse for Stock Reco1 - _TC" + + 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) + + args = { + "item_code": serial_item_code, + "warehouse": serial_warehouse, + "posting_date": nowdate(), + "posting_time": nowtime(), + "serial_no": sr.items[0].serial_no + } + + valuation_rate = get_incoming_rate(args) + self.assertEqual(valuation_rate, 200) + + to_delete_records.append(sr.name) + + 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) + + args = { + "item_code": serial_item_code, + "warehouse": serial_warehouse, + "posting_date": nowdate(), + "posting_time": nowtime(), + "serial_no": sr.items[0].serial_no + } + + valuation_rate = get_incoming_rate(args) + self.assertEqual(valuation_rate, 300) + + to_delete_records.append(sr.name) + to_delete_records.reverse() + + for d in to_delete_records: + stock_doc = frappe.get_doc("Stock Reconciliation", d) + stock_doc.cancel() + frappe.delete_doc("Stock Reconciliation", stock_doc.name) + + for d in serial_nos + serial_nos1: + if frappe.db.exists("Serial No", d): + frappe.delete_doc("Serial No", d) + +def create_batch_or_serial_no_items(): + create_warehouse("_Test Warehouse for Stock Reco1", + {"is_group": 0, "parent_warehouse": "_Test Warehouse Group - _TC"}) + + serial_item_doc = create_item("Stock-Reco-Serial-Item-1", is_stock_item=1) + if not serial_item_doc.has_serial_no: + serial_item_doc.has_serial_no = 1 + serial_item_doc.serial_no_series = "SRSI.####" + serial_item_doc.save(ignore_permissions=True) + + batch_item_doc = create_item("Stock-Reco-batch-Item-1", is_stock_item=1) + if not batch_item_doc.has_batch_no: + batch_item_doc.has_batch_no = 1 + batch_item_doc.create_new_batch = 1 + serial_item_doc.batch_number_series = "BASR.#####" + batch_item_doc.save(ignore_permissions=True) + def create_stock_reconciliation(**args): args = frappe._dict(args) sr = frappe.new_doc("Stock Reconciliation") @@ -120,7 +200,10 @@ def create_stock_reconciliation(**args): "item_code": args.item_code or "_Test Item", "warehouse": args.warehouse or "_Test Warehouse - _TC", "qty": args.qty, - "valuation_rate": args.rate + "valuation_rate": args.rate, + "serial_no": args.serial_no, + "batch_no": args.batch_no, + "remove_serial_no_from_stock": args.remove_serial_no_from_stock or 0 }) try: @@ -140,3 +223,4 @@ def set_valuation_method(item_code, valuation_method): }, allow_negative_stock=1) test_dependencies = ["Item", "Warehouse"] + diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json index dce87e5ae3..fa42c9c25c 100644 --- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json +++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json @@ -15,6 +15,7 @@ "amount", "serial_no_and_batch_section", "serial_no", + "remove_serial_no_from_stock", "column_break_11", "batch_no", "section_break_3", @@ -165,10 +166,16 @@ "fieldtype": "Link", "label": "Batch No", "options": "Batch" + }, + { + "default": "0", + "fieldname": "remove_serial_no_from_stock", + "fieldtype": "Check", + "label": "Remove Serial No from Stock" } ], "istable": 1, - "modified": "2019-05-24 12:34:50.018491", + "modified": "2019-06-01 03:16:38.459307", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reconciliation Item", diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index ea8e8805a6..6ea322872e 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -173,7 +173,7 @@ def get_incoming_rate(args, raise_error_if_no_rate=True): in_rate = get_valuation_rate(args.get('item_code'), args.get('warehouse'), args.get('voucher_type'), voucher_no, args.get('allow_zero_valuation'), currency=erpnext.get_company_currency(args.get('company')), company=args.get('company'), - raise_error_if_no_rate=True) + raise_error_if_no_rate=raise_error_if_no_rate) return in_rate From 059890ecefe2144cf49b0e2678265a84930afadb Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 3 Jun 2019 01:27:58 +0530 Subject: [PATCH 4/4] Test cases for batch no --- erpnext/stock/doctype/batch/batch.py | 4 +- erpnext/stock/doctype/serial_no/serial_no.py | 1 - .../stock_reconciliation.js | 16 ++++- .../stock_reconciliation.py | 24 ++++---- .../test_stock_reconciliation.py | 60 +++++++++++++++++-- .../stock_reconciliation_item.json | 10 +--- 6 files changed, 87 insertions(+), 28 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index c540ac5227..4881983b8e 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -257,10 +257,10 @@ def get_batches(item_code, warehouse, qty=1, throw=False): 'on (`tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no )' 'where `tabStock Ledger Entry`.item_code = %s and `tabStock Ledger Entry`.warehouse = %s ' 'and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)' - 'group by batch_id having qty > 0' + 'group by batch_id ' 'order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC', (item_code, warehouse), - as_dict=True, debug=1 + as_dict=True ) return batches diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index 4ab95c7e14..43bc5e2530 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -423,7 +423,6 @@ def update_serial_nos_after_submit(controller, parentfield): else d.stock_qty) for sle in stock_ledger_entries: - print(accepted_serial_nos_updated, qty, sle.actual_qty) if sle.voucher_detail_no==d.name: if not accepted_serial_nos_updated and qty and abs(sle.actual_qty)==qty \ and sle.warehouse == warehouse and sle.serial_no != d.serial_no: diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index a00e6e64bf..5ac0b098fe 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -153,6 +153,7 @@ frappe.ui.form.on("Stock Reconciliation Item", { barcode: function(frm, cdt, cdn) { frm.events.set_item_code(frm, cdt, cdn); }, + warehouse: function(frm, cdt, cdn) { var child = locals[cdt][cdn]; if (child.batch_no) { @@ -161,22 +162,35 @@ frappe.ui.form.on("Stock Reconciliation Item", { frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); }, + item_code: function(frm, cdt, cdn) { var child = locals[cdt][cdn]; if (child.batch_no) { - frappe.model.set_value(child.cdt, child.cdn, "batch_no", ""); + frappe.model.set_value(cdt, cdn, "batch_no", ""); } frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); }, + batch_no: function(frm, cdt, cdn) { frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); }, + qty: function(frm, cdt, cdn) { frm.events.set_amount_quantity(frm, cdt, cdn); }, + valuation_rate: function(frm, cdt, cdn) { frm.events.set_amount_quantity(frm, cdt, cdn); + }, + + serial_no: function(frm, cdt, cdn) { + var child = locals[cdt][cdn]; + + if (child.serial_no) { + const serial_nos = child.serial_no.trim().split('\n'); + frappe.model.set_value(cdt, cdn, "qty", serial_nos.length); + } } }); diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index cdf6068f11..2be667c340 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -32,6 +32,9 @@ class StockReconciliation(StockController): self.validate_expense_account() self.set_total_qty_and_amount() + if self._action=="submit": + self.make_batches('warehouse') + def on_submit(self): self.update_stock_ledger() self.make_gl_entries() @@ -50,16 +53,16 @@ class StockReconciliation(StockController): item_dict = get_stock_balance_for(item.item_code, item.warehouse, self.posting_date, self.posting_time, batch_no=item.batch_no) - if ((item.qty==None or item.qty==item_dict.get("qty")) - and (item.valuation_rate==None or item.valuation_rate==item_dict.get("rate")) - and item.serial_no == item_dict.get("serial_nos")): + if (((item.qty is None or item.qty==item_dict.get("qty")) and + (item.valuation_rate is None or item.valuation_rate==item_dict.get("rate")) and not item.serial_no) + or (item.serial_no and item.serial_no == item_dict.get("serial_nos"))): return False else: # set default as current rates - if item.qty==None: + if item.qty is None: item.qty = item_dict.get("qty") - if item.valuation_rate==None: + if item.valuation_rate is None: item.valuation_rate = item_dict.get("rate") if item_dict.get("serial_nos"): @@ -162,15 +165,12 @@ class StockReconciliation(StockController): # item should not be serialized if item.has_serial_no and not row.serial_no and not item.serial_no_series: - raise frappe.ValidationError(_("Serial nos are required for serialized item {0}").format(item_code)) + raise frappe.ValidationError(_("Serial no(s) required for serialized item {0}").format(item_code)) # item managed batch-wise not allowed if item.has_batch_no and not row.batch_no and not item.create_new_batch: raise frappe.ValidationError(_("Batch no is required for batched item {0}").format(item_code)) - if self._action=="submit" and item.create_new_batch: - self.make_batches('warehouse') - # docstatus should be < 2 validate_cancelled_item(item_code, item.docstatus, verbose=0) @@ -203,7 +203,7 @@ class StockReconciliation(StockController): row.valuation_rate = previous_sle.get("valuation_rate", 0) if row.qty and not row.valuation_rate: - frappe.throw(_("Valuation Rate required for Item in row {0}").format(row.idx)) + frappe.throw(_("Valuation Rate required for Item {0} at row {1}").format(row.item_code, row.idx)) if ((previous_sle and row.qty == previous_sle.get("qty_after_transaction") and (row.valuation_rate == previous_sle.get("valuation_rate") or row.qty == 0)) @@ -270,7 +270,7 @@ class StockReconciliation(StockController): sl_entries.append(args) - if self.docstatus == 1 and not row.remove_serial_no_from_stock: + if self.docstatus == 1 and row.qty: args = self.get_sle_for_items(row) args.update({ @@ -332,7 +332,7 @@ class StockReconciliation(StockController): sl_entries = [] for row in self.items: - if row.serial_no or row.batch_no: + if row.serial_no or row.batch_no or row.current_serial_no: self.get_sle_for_serialized_items(row, sl_entries) if sl_entries: diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 5ee8228edf..f0c71cf39a 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -13,7 +13,7 @@ from erpnext.stock.stock_ledger import get_previous_sle, update_entries_after from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import EmptyStockReconciliationItemsError, get_items from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse from erpnext.stock.doctype.item.test_item import create_item -from erpnext.stock.utils import get_stock_balance, get_incoming_rate, get_available_serial_nos +from erpnext.stock.utils import get_stock_balance, get_incoming_rate, get_available_serial_nos, get_stock_value_on from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos class TestStockReconciliation(unittest.TestCase): @@ -169,10 +169,62 @@ class TestStockReconciliation(unittest.TestCase): if frappe.db.exists("Serial No", d): frappe.delete_doc("Serial No", d) + def test_stock_reco_for_batch_item(self): + set_perpetual_inventory() + + to_delete_records = [] + to_delete_serial_nos = [] + + # Add new serial nos + item_code = "Stock-Reco-batch-Item-1" + warehouse = "_Test Warehouse for Stock Reco2 - _TC" + + sr = create_stock_reconciliation(item_code=item_code, + warehouse = warehouse, qty=5, rate=200, do_not_submit=1) + sr.save(ignore_permissions=True) + sr.submit() + + self.assertTrue(sr.items[0].batch_no) + to_delete_records.append(sr.name) + + sr1 = create_stock_reconciliation(item_code=item_code, + warehouse = warehouse, qty=6, rate=300, batch_no=sr.items[0].batch_no) + + args = { + "item_code": item_code, + "warehouse": warehouse, + "posting_date": nowdate(), + "posting_time": nowtime(), + } + + valuation_rate = get_incoming_rate(args) + self.assertEqual(valuation_rate, 300) + to_delete_records.append(sr1.name) + + + sr2 = create_stock_reconciliation(item_code=item_code, + warehouse = warehouse, qty=0, rate=0, batch_no=sr.items[0].batch_no) + + stock_value = get_stock_value_on(warehouse, nowdate(), item_code) + self.assertEqual(stock_value, 0) + to_delete_records.append(sr2.name) + + to_delete_records.reverse() + for d in to_delete_records: + stock_doc = frappe.get_doc("Stock Reconciliation", d) + stock_doc.cancel() + + frappe.delete_doc("Batch", sr.items[0].batch_no) + for d in to_delete_records: + frappe.delete_doc("Stock Reconciliation", d) + def create_batch_or_serial_no_items(): create_warehouse("_Test Warehouse for Stock Reco1", {"is_group": 0, "parent_warehouse": "_Test Warehouse Group - _TC"}) + create_warehouse("_Test Warehouse for Stock Reco2", + {"is_group": 0, "parent_warehouse": "_Test Warehouse Group - _TC"}) + serial_item_doc = create_item("Stock-Reco-Serial-Item-1", is_stock_item=1) if not serial_item_doc.has_serial_no: serial_item_doc.has_serial_no = 1 @@ -202,12 +254,12 @@ def create_stock_reconciliation(**args): "qty": args.qty, "valuation_rate": args.rate, "serial_no": args.serial_no, - "batch_no": args.batch_no, - "remove_serial_no_from_stock": args.remove_serial_no_from_stock or 0 + "batch_no": args.batch_no }) try: - sr.submit() + if not args.do_not_submit: + sr.submit() except EmptyStockReconciliationItemsError: pass return sr diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json index fa42c9c25c..e53db0772b 100644 --- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json +++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json @@ -15,7 +15,6 @@ "amount", "serial_no_and_batch_section", "serial_no", - "remove_serial_no_from_stock", "column_break_11", "batch_no", "section_break_3", @@ -110,6 +109,7 @@ "label": "Before reconciliation" }, { + "default": "0", "fieldname": "current_qty", "fieldtype": "Float", "label": "Current Qty", @@ -166,16 +166,10 @@ "fieldtype": "Link", "label": "Batch No", "options": "Batch" - }, - { - "default": "0", - "fieldname": "remove_serial_no_from_stock", - "fieldtype": "Check", - "label": "Remove Serial No from Stock" } ], "istable": 1, - "modified": "2019-06-01 03:16:38.459307", + "modified": "2019-06-14 17:10:53.188305", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reconciliation Item",