a77b8c9fcc
* feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis
258 lines
8.8 KiB
Python
258 lines
8.8 KiB
Python
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
|
# License: GNU General Public License v3. See license.txt
|
|
|
|
from __future__ import unicode_literals
|
|
|
|
import frappe
|
|
from frappe.utils import cint, flt
|
|
from erpnext.stock.utils import update_included_uom_in_report, is_reposting_item_valuation_in_progress
|
|
from frappe import _
|
|
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
|
|
|
|
def execute(filters=None):
|
|
is_reposting_item_valuation_in_progress()
|
|
include_uom = filters.get("include_uom")
|
|
columns = get_columns()
|
|
items = get_items(filters)
|
|
sl_entries = get_stock_ledger_entries(filters, items)
|
|
item_details = get_item_details(items, sl_entries, include_uom)
|
|
opening_row = get_opening_balance(filters, columns)
|
|
precision = cint(frappe.db.get_single_value("System Settings", "float_precision"))
|
|
|
|
data = []
|
|
conversion_factors = []
|
|
if opening_row:
|
|
data.append(opening_row)
|
|
|
|
actual_qty = stock_value = 0
|
|
|
|
available_serial_nos = {}
|
|
for sle in sl_entries:
|
|
item_detail = item_details[sle.item_code]
|
|
|
|
sle.update(item_detail)
|
|
|
|
if filters.get("batch_no"):
|
|
actual_qty += flt(sle.actual_qty, precision)
|
|
stock_value += sle.stock_value_difference
|
|
|
|
if sle.voucher_type == 'Stock Reconciliation' and not sle.actual_qty:
|
|
actual_qty = sle.qty_after_transaction
|
|
stock_value = sle.stock_value
|
|
|
|
sle.update({
|
|
"qty_after_transaction": actual_qty,
|
|
"stock_value": stock_value
|
|
})
|
|
|
|
sle.update({
|
|
"in_qty": max(sle.actual_qty, 0),
|
|
"out_qty": min(sle.actual_qty, 0)
|
|
})
|
|
|
|
if sle.serial_no:
|
|
update_available_serial_nos(available_serial_nos, sle)
|
|
|
|
data.append(sle)
|
|
|
|
if include_uom:
|
|
conversion_factors.append(item_detail.conversion_factor)
|
|
|
|
update_included_uom_in_report(columns, data, include_uom, conversion_factors)
|
|
return columns, data
|
|
|
|
def update_available_serial_nos(available_serial_nos, sle):
|
|
serial_nos = get_serial_nos(sle.serial_no)
|
|
key = (sle.item_code, sle.warehouse)
|
|
if key not in available_serial_nos:
|
|
available_serial_nos.setdefault(key, [])
|
|
|
|
existing_serial_no = available_serial_nos[key]
|
|
for sn in serial_nos:
|
|
if sle.actual_qty > 0:
|
|
if sn in existing_serial_no:
|
|
existing_serial_no.remove(sn)
|
|
else:
|
|
existing_serial_no.append(sn)
|
|
else:
|
|
if sn in existing_serial_no:
|
|
existing_serial_no.remove(sn)
|
|
else:
|
|
existing_serial_no.append(sn)
|
|
|
|
sle.balance_serial_no = '\n'.join(existing_serial_no)
|
|
|
|
def get_columns():
|
|
columns = [
|
|
{"label": _("Date"), "fieldname": "date", "fieldtype": "Datetime", "width": 150},
|
|
{"label": _("Item"), "fieldname": "item_code", "fieldtype": "Link", "options": "Item", "width": 100},
|
|
{"label": _("Item Name"), "fieldname": "item_name", "width": 100},
|
|
{"label": _("Stock UOM"), "fieldname": "stock_uom", "fieldtype": "Link", "options": "UOM", "width": 90},
|
|
{"label": _("In Qty"), "fieldname": "in_qty", "fieldtype": "Float", "width": 80, "convertible": "qty"},
|
|
{"label": _("Out Qty"), "fieldname": "out_qty", "fieldtype": "Float", "width": 80, "convertible": "qty"},
|
|
{"label": _("Balance Qty"), "fieldname": "qty_after_transaction", "fieldtype": "Float", "width": 100, "convertible": "qty"},
|
|
{"label": _("Voucher #"), "fieldname": "voucher_no", "fieldtype": "Dynamic Link", "options": "voucher_type", "width": 150},
|
|
{"label": _("Warehouse"), "fieldname": "warehouse", "fieldtype": "Link", "options": "Warehouse", "width": 150},
|
|
{"label": _("Item Group"), "fieldname": "item_group", "fieldtype": "Link", "options": "Item Group", "width": 100},
|
|
{"label": _("Brand"), "fieldname": "brand", "fieldtype": "Link", "options": "Brand", "width": 100},
|
|
{"label": _("Description"), "fieldname": "description", "width": 200},
|
|
{"label": _("Incoming Rate"), "fieldname": "incoming_rate", "fieldtype": "Currency", "width": 110, "options": "Company:company:default_currency", "convertible": "rate"},
|
|
{"label": _("Valuation Rate"), "fieldname": "valuation_rate", "fieldtype": "Currency", "width": 110, "options": "Company:company:default_currency", "convertible": "rate"},
|
|
{"label": _("Balance Value"), "fieldname": "stock_value", "fieldtype": "Currency", "width": 110, "options": "Company:company:default_currency"},
|
|
{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": 110},
|
|
{"label": _("Voucher #"), "fieldname": "voucher_no", "fieldtype": "Dynamic Link", "options": "voucher_type", "width": 100},
|
|
{"label": _("Batch"), "fieldname": "batch_no", "fieldtype": "Link", "options": "Batch", "width": 100},
|
|
{"label": _("Serial No"), "fieldname": "serial_no", "fieldtype": "Link", "options": "Serial No", "width": 100},
|
|
{"label": _("Balance Serial No"), "fieldname": "balance_serial_no", "width": 100},
|
|
{"label": _("Project"), "fieldname": "project", "fieldtype": "Link", "options": "Project", "width": 100},
|
|
{"label": _("Company"), "fieldname": "company", "fieldtype": "Link", "options": "Company", "width": 110}
|
|
]
|
|
|
|
return columns
|
|
|
|
|
|
def get_stock_ledger_entries(filters, items):
|
|
item_conditions_sql = ''
|
|
if items:
|
|
item_conditions_sql = 'and sle.item_code in ({})'\
|
|
.format(', '.join([frappe.db.escape(i) for i in items]))
|
|
|
|
sl_entries = frappe.db.sql("""
|
|
SELECT
|
|
concat_ws(" ", posting_date, posting_time) AS date,
|
|
item_code,
|
|
warehouse,
|
|
actual_qty,
|
|
qty_after_transaction,
|
|
incoming_rate,
|
|
valuation_rate,
|
|
stock_value,
|
|
voucher_type,
|
|
voucher_no,
|
|
batch_no,
|
|
serial_no,
|
|
company,
|
|
project,
|
|
stock_value_difference
|
|
FROM
|
|
`tabStock Ledger Entry` sle
|
|
WHERE
|
|
company = %(company)s
|
|
AND posting_date BETWEEN %(from_date)s AND %(to_date)s
|
|
{sle_conditions}
|
|
{item_conditions_sql}
|
|
ORDER BY
|
|
posting_date asc, posting_time asc, creation asc
|
|
""".format(sle_conditions=get_sle_conditions(filters), item_conditions_sql=item_conditions_sql),
|
|
filters, as_dict=1)
|
|
|
|
return sl_entries
|
|
|
|
|
|
def get_items(filters):
|
|
conditions = []
|
|
if filters.get("item_code"):
|
|
conditions.append("item.name=%(item_code)s")
|
|
else:
|
|
if filters.get("brand"):
|
|
conditions.append("item.brand=%(brand)s")
|
|
if filters.get("item_group"):
|
|
conditions.append(get_item_group_condition(filters.get("item_group")))
|
|
|
|
items = []
|
|
if conditions:
|
|
items = frappe.db.sql_list("""select name from `tabItem` item where {}"""
|
|
.format(" and ".join(conditions)), filters)
|
|
return items
|
|
|
|
|
|
def get_item_details(items, sl_entries, include_uom):
|
|
item_details = {}
|
|
if not items:
|
|
items = list(set([d.item_code for d in sl_entries]))
|
|
|
|
if not items:
|
|
return item_details
|
|
|
|
cf_field = cf_join = ""
|
|
if include_uom:
|
|
cf_field = ", ucd.conversion_factor"
|
|
cf_join = "left join `tabUOM Conversion Detail` ucd on ucd.parent=item.name and ucd.uom=%s" \
|
|
% frappe.db.escape(include_uom)
|
|
|
|
res = frappe.db.sql("""
|
|
select
|
|
item.name, item.item_name, item.description, item.item_group, item.brand, item.stock_uom {cf_field}
|
|
from
|
|
`tabItem` item
|
|
{cf_join}
|
|
where
|
|
item.name in ({item_codes})
|
|
""".format(cf_field=cf_field, cf_join=cf_join, item_codes=','.join(['%s'] *len(items))), items, as_dict=1)
|
|
|
|
for item in res:
|
|
item_details.setdefault(item.name, item)
|
|
|
|
return item_details
|
|
|
|
|
|
def get_sle_conditions(filters):
|
|
conditions = []
|
|
if filters.get("warehouse"):
|
|
warehouse_condition = get_warehouse_condition(filters.get("warehouse"))
|
|
if warehouse_condition:
|
|
conditions.append(warehouse_condition)
|
|
if filters.get("voucher_no"):
|
|
conditions.append("voucher_no=%(voucher_no)s")
|
|
if filters.get("batch_no"):
|
|
conditions.append("batch_no=%(batch_no)s")
|
|
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 ""
|
|
|
|
|
|
def get_opening_balance(filters, columns):
|
|
if not (filters.item_code and filters.warehouse and filters.from_date):
|
|
return
|
|
|
|
from erpnext.stock.stock_ledger import get_previous_sle
|
|
last_entry = get_previous_sle({
|
|
"item_code": filters.item_code,
|
|
"warehouse_condition": get_warehouse_condition(filters.warehouse),
|
|
"posting_date": filters.from_date,
|
|
"posting_time": "00:00:00"
|
|
})
|
|
|
|
row = {
|
|
"item_code": _("'Opening'"),
|
|
"qty_after_transaction": last_entry.get("qty_after_transaction", 0),
|
|
"valuation_rate": last_entry.get("valuation_rate", 0),
|
|
"stock_value": last_entry.get("stock_value", 0)
|
|
}
|
|
|
|
return row
|
|
|
|
|
|
def get_warehouse_condition(warehouse):
|
|
warehouse_details = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"], as_dict=1)
|
|
if warehouse_details:
|
|
return " exists (select name from `tabWarehouse` wh \
|
|
where wh.lft >= %s and wh.rgt <= %s and warehouse = wh.name)"%(warehouse_details.lft,
|
|
warehouse_details.rgt)
|
|
|
|
return ''
|
|
|
|
|
|
def get_item_group_condition(item_group):
|
|
item_group_details = frappe.db.get_value("Item Group", item_group, ["lft", "rgt"], as_dict=1)
|
|
if item_group_details:
|
|
return "item.item_group in (select ig.name from `tabItem Group` ig \
|
|
where ig.lft >= %s and ig.rgt <= %s and item.item_group = ig.name)"%(item_group_details.lft,
|
|
item_group_details.rgt)
|
|
|
|
return ''
|