34c551d9a5
* fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases
449 lines
18 KiB
Python
449 lines
18 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, erpnext
|
|
from frappe.utils import cint, flt, cstr
|
|
from frappe import _
|
|
import frappe.defaults
|
|
from erpnext.accounts.utils import get_fiscal_year
|
|
from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map
|
|
from erpnext.controllers.accounts_controller import AccountsController
|
|
from erpnext.stock.stock_ledger import get_valuation_rate
|
|
from erpnext.stock import get_warehouse_account_map
|
|
|
|
class QualityInspectionRequiredError(frappe.ValidationError): pass
|
|
class QualityInspectionRejectedError(frappe.ValidationError): pass
|
|
class QualityInspectionNotSubmittedError(frappe.ValidationError): pass
|
|
|
|
class StockController(AccountsController):
|
|
def validate(self):
|
|
super(StockController, self).validate()
|
|
self.validate_inspection()
|
|
|
|
def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
|
|
if self.docstatus == 2:
|
|
delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
|
|
|
|
if cint(erpnext.is_perpetual_inventory_enabled(self.company)):
|
|
warehouse_account = get_warehouse_account_map(self.company)
|
|
|
|
if self.docstatus==1:
|
|
if not gl_entries:
|
|
gl_entries = self.get_gl_entries(warehouse_account)
|
|
make_gl_entries(gl_entries, from_repost=from_repost)
|
|
|
|
if repost_future_gle:
|
|
items, warehouses = self.get_items_and_warehouses()
|
|
update_gl_entries_after(self.posting_date, self.posting_time, warehouses, items,
|
|
warehouse_account, company=self.company)
|
|
elif self.doctype in ['Purchase Receipt', 'Purchase Invoice'] and self.docstatus == 1:
|
|
gl_entries = []
|
|
gl_entries = self.get_asset_gl_entry(gl_entries)
|
|
make_gl_entries(gl_entries, from_repost=from_repost)
|
|
|
|
def get_gl_entries(self, warehouse_account=None, default_expense_account=None,
|
|
default_cost_center=None):
|
|
|
|
if not warehouse_account:
|
|
warehouse_account = get_warehouse_account_map(self.company)
|
|
|
|
sle_map = self.get_stock_ledger_details()
|
|
voucher_details = self.get_voucher_details(default_expense_account, default_cost_center, sle_map)
|
|
|
|
gl_list = []
|
|
warehouse_with_no_account = []
|
|
|
|
for item_row in voucher_details:
|
|
sle_list = sle_map.get(item_row.name)
|
|
if sle_list:
|
|
for sle in sle_list:
|
|
if warehouse_account.get(sle.warehouse):
|
|
# from warehouse account
|
|
|
|
self.check_expense_account(item_row)
|
|
|
|
# If the item does not have the allow zero valuation rate flag set
|
|
# and ( valuation rate not mentioned in an incoming entry
|
|
# or incoming entry not found while delivering the item),
|
|
# try to pick valuation rate from previous sle or Item master and update in SLE
|
|
# Otherwise, throw an exception
|
|
|
|
if not sle.stock_value_difference and self.doctype != "Stock Reconciliation" \
|
|
and not item_row.get("allow_zero_valuation_rate"):
|
|
|
|
sle = self.update_stock_ledger_entries(sle)
|
|
|
|
gl_list.append(self.get_gl_dict({
|
|
"account": warehouse_account[sle.warehouse]["account"],
|
|
"against": item_row.expense_account,
|
|
"cost_center": item_row.cost_center,
|
|
"remarks": self.get("remarks") or "Accounting Entry for Stock",
|
|
"debit": flt(sle.stock_value_difference, 2),
|
|
"is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
|
|
}, warehouse_account[sle.warehouse]["account_currency"], item=item_row))
|
|
|
|
# to target warehouse / expense account
|
|
gl_list.append(self.get_gl_dict({
|
|
"account": item_row.expense_account,
|
|
"against": warehouse_account[sle.warehouse]["account"],
|
|
"cost_center": item_row.cost_center,
|
|
"remarks": self.get("remarks") or "Accounting Entry for Stock",
|
|
"credit": flt(sle.stock_value_difference, 2),
|
|
"project": item_row.get("project") or self.get("project"),
|
|
"is_opening": item_row.get("is_opening") or self.get("is_opening") or "No"
|
|
}, item=item_row))
|
|
elif sle.warehouse not in warehouse_with_no_account:
|
|
warehouse_with_no_account.append(sle.warehouse)
|
|
|
|
if warehouse_with_no_account:
|
|
for wh in warehouse_with_no_account:
|
|
if frappe.db.get_value("Warehouse", wh, "company"):
|
|
frappe.throw(_("Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}.").format(wh, self.company))
|
|
|
|
return process_gl_map(gl_list)
|
|
|
|
def update_stock_ledger_entries(self, sle):
|
|
sle.valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse,
|
|
self.doctype, self.name, currency=self.company_currency, company=self.company)
|
|
|
|
sle.stock_value = flt(sle.qty_after_transaction) * flt(sle.valuation_rate)
|
|
sle.stock_value_difference = flt(sle.actual_qty) * flt(sle.valuation_rate)
|
|
|
|
if sle.name:
|
|
frappe.db.sql("""
|
|
update
|
|
`tabStock Ledger Entry`
|
|
set
|
|
stock_value = %(stock_value)s,
|
|
valuation_rate = %(valuation_rate)s,
|
|
stock_value_difference = %(stock_value_difference)s
|
|
where
|
|
name = %(name)s""", (sle))
|
|
|
|
return sle
|
|
|
|
def get_voucher_details(self, default_expense_account, default_cost_center, sle_map):
|
|
if self.doctype == "Stock Reconciliation":
|
|
reconciliation_purpose = frappe.db.get_value(self.doctype, self.name, "purpose")
|
|
is_opening = "Yes" if reconciliation_purpose == "Opening Stock" else "No"
|
|
details = []
|
|
for voucher_detail_no in sle_map:
|
|
details.append(frappe._dict({
|
|
"name": voucher_detail_no,
|
|
"expense_account": default_expense_account,
|
|
"cost_center": default_cost_center,
|
|
"is_opening": is_opening
|
|
}))
|
|
return details
|
|
else:
|
|
details = self.get("items")
|
|
|
|
if default_expense_account or default_cost_center:
|
|
for d in details:
|
|
if default_expense_account and not d.get("expense_account"):
|
|
d.expense_account = default_expense_account
|
|
if default_cost_center and not d.get("cost_center"):
|
|
d.cost_center = default_cost_center
|
|
|
|
return details
|
|
|
|
def get_items_and_warehouses(self):
|
|
items, warehouses = [], []
|
|
|
|
if hasattr(self, "items"):
|
|
item_doclist = self.get("items")
|
|
elif self.doctype == "Stock Reconciliation":
|
|
import json
|
|
item_doclist = []
|
|
data = json.loads(self.reconciliation_json)
|
|
for row in data[data.index(self.head_row)+1:]:
|
|
d = frappe._dict(zip(["item_code", "warehouse", "qty", "valuation_rate"], row))
|
|
item_doclist.append(d)
|
|
|
|
if item_doclist:
|
|
for d in item_doclist:
|
|
if d.item_code and d.item_code not in items:
|
|
items.append(d.item_code)
|
|
|
|
if d.get("warehouse") and d.warehouse not in warehouses:
|
|
warehouses.append(d.warehouse)
|
|
|
|
if self.doctype == "Stock Entry":
|
|
if d.get("s_warehouse") and d.s_warehouse not in warehouses:
|
|
warehouses.append(d.s_warehouse)
|
|
if d.get("t_warehouse") and d.t_warehouse not in warehouses:
|
|
warehouses.append(d.t_warehouse)
|
|
|
|
return items, warehouses
|
|
|
|
def get_stock_ledger_details(self):
|
|
stock_ledger = {}
|
|
stock_ledger_entries = frappe.db.sql("""
|
|
select
|
|
name, warehouse, stock_value_difference, valuation_rate,
|
|
voucher_detail_no, item_code, posting_date, posting_time,
|
|
actual_qty, qty_after_transaction
|
|
from
|
|
`tabStock Ledger Entry`
|
|
where
|
|
voucher_type=%s and voucher_no=%s
|
|
""", (self.doctype, self.name), as_dict=True)
|
|
|
|
for sle in stock_ledger_entries:
|
|
stock_ledger.setdefault(sle.voucher_detail_no, []).append(sle)
|
|
return stock_ledger
|
|
|
|
def make_batches(self, warehouse_field):
|
|
'''Create batches if required. Called before submit'''
|
|
for d in self.items:
|
|
if d.get(warehouse_field) and not d.batch_no:
|
|
has_batch_no, create_new_batch = frappe.db.get_value('Item', d.item_code, ['has_batch_no', 'create_new_batch'])
|
|
if has_batch_no and create_new_batch:
|
|
d.batch_no = frappe.get_doc(dict(
|
|
doctype='Batch',
|
|
item=d.item_code,
|
|
supplier=getattr(self, 'supplier', None),
|
|
reference_doctype=self.doctype,
|
|
reference_name=self.name)).insert().name
|
|
|
|
def make_adjustment_entry(self, expected_gle, voucher_obj):
|
|
from erpnext.accounts.utils import get_stock_and_account_difference
|
|
account_list = [d.account for d in expected_gle]
|
|
acc_diff = get_stock_and_account_difference(account_list,
|
|
expected_gle[0].posting_date, self.company)
|
|
|
|
cost_center = self.get_company_default("cost_center")
|
|
stock_adjustment_account = self.get_company_default("stock_adjustment_account")
|
|
|
|
gl_entries = []
|
|
for account, diff in acc_diff.items():
|
|
if diff:
|
|
gl_entries.append([
|
|
# stock in hand account
|
|
voucher_obj.get_gl_dict({
|
|
"account": account,
|
|
"against": stock_adjustment_account,
|
|
"debit": diff,
|
|
"remarks": "Adjustment Accounting Entry for Stock",
|
|
}),
|
|
|
|
# account against stock in hand
|
|
voucher_obj.get_gl_dict({
|
|
"account": stock_adjustment_account,
|
|
"against": account,
|
|
"credit": diff,
|
|
"cost_center": cost_center or None,
|
|
"remarks": "Adjustment Accounting Entry for Stock",
|
|
}),
|
|
])
|
|
|
|
if gl_entries:
|
|
from erpnext.accounts.general_ledger import make_gl_entries
|
|
make_gl_entries(gl_entries)
|
|
|
|
def check_expense_account(self, item):
|
|
if not item.get("expense_account"):
|
|
frappe.throw(_("Expense or Difference account is mandatory for Item {0} as it impacts overall stock value").format(item.item_code))
|
|
|
|
else:
|
|
is_expense_account = frappe.db.get_value("Account",
|
|
item.get("expense_account"), "report_type")=="Profit and Loss"
|
|
if self.doctype not in ("Purchase Receipt", "Purchase Invoice", "Stock Reconciliation", "Stock Entry") and not is_expense_account:
|
|
frappe.throw(_("Expense / Difference account ({0}) must be a 'Profit or Loss' account")
|
|
.format(item.get("expense_account")))
|
|
if is_expense_account and not item.get("cost_center"):
|
|
frappe.throw(_("{0} {1}: Cost Center is mandatory for Item {2}").format(
|
|
_(self.doctype), self.name, item.get("item_code")))
|
|
|
|
def get_sl_entries(self, d, args):
|
|
sl_dict = frappe._dict({
|
|
"item_code": d.get("item_code", None),
|
|
"warehouse": d.get("warehouse", None),
|
|
"posting_date": self.posting_date,
|
|
"posting_time": self.posting_time,
|
|
'fiscal_year': get_fiscal_year(self.posting_date, company=self.company)[0],
|
|
"voucher_type": self.doctype,
|
|
"voucher_no": self.name,
|
|
"voucher_detail_no": d.name,
|
|
"actual_qty": (self.docstatus==1 and 1 or -1)*flt(d.get("stock_qty")),
|
|
"stock_uom": frappe.db.get_value("Item", args.get("item_code") or d.get("item_code"), "stock_uom"),
|
|
"incoming_rate": 0,
|
|
"company": self.company,
|
|
"batch_no": cstr(d.get("batch_no")).strip(),
|
|
"serial_no": d.get("serial_no"),
|
|
"project": d.get("project") or self.get('project'),
|
|
"is_cancelled": self.docstatus==2 and "Yes" or "No"
|
|
})
|
|
|
|
sl_dict.update(args)
|
|
return sl_dict
|
|
|
|
def make_sl_entries(self, sl_entries, is_amended=None, allow_negative_stock=False,
|
|
via_landed_cost_voucher=False):
|
|
from erpnext.stock.stock_ledger import make_sl_entries
|
|
make_sl_entries(sl_entries, is_amended, allow_negative_stock, via_landed_cost_voucher)
|
|
|
|
def make_gl_entries_on_cancel(self, repost_future_gle=True):
|
|
if frappe.db.sql("""select name from `tabGL Entry` where voucher_type=%s
|
|
and voucher_no=%s""", (self.doctype, self.name)):
|
|
self.make_gl_entries(repost_future_gle=repost_future_gle)
|
|
|
|
def get_serialized_items(self):
|
|
serialized_items = []
|
|
item_codes = list(set([d.item_code for d in self.get("items")]))
|
|
if item_codes:
|
|
serialized_items = frappe.db.sql_list("""select name from `tabItem`
|
|
where has_serial_no=1 and name in ({})""".format(", ".join(["%s"]*len(item_codes))),
|
|
tuple(item_codes))
|
|
|
|
return serialized_items
|
|
|
|
def get_incoming_rate_for_sales_return(self, item_code, against_document):
|
|
incoming_rate = 0.0
|
|
if against_document and item_code:
|
|
incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty)
|
|
from `tabStock Ledger Entry`
|
|
where voucher_type = %s and voucher_no = %s
|
|
and item_code = %s limit 1""",
|
|
(self.doctype, against_document, item_code))
|
|
incoming_rate = incoming_rate[0][0] if incoming_rate else 0.0
|
|
|
|
return incoming_rate
|
|
|
|
def validate_warehouse(self):
|
|
from erpnext.stock.utils import validate_warehouse_company
|
|
|
|
warehouses = list(set([d.warehouse for d in
|
|
self.get("items") if getattr(d, "warehouse", None)]))
|
|
|
|
for w in warehouses:
|
|
validate_warehouse_company(w, self.company)
|
|
|
|
def update_billing_percentage(self, update_modified=True):
|
|
self._update_percent_field({
|
|
"target_dt": self.doctype + " Item",
|
|
"target_parent_dt": self.doctype,
|
|
"target_parent_field": "per_billed",
|
|
"target_ref_field": "amount",
|
|
"target_field": "billed_amt",
|
|
"name": self.name,
|
|
}, update_modified)
|
|
|
|
def validate_inspection(self):
|
|
'''Checks if quality inspection is set for Items that require inspection.
|
|
On submit, throw an exception'''
|
|
inspection_required_fieldname = None
|
|
if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
|
|
inspection_required_fieldname = "inspection_required_before_purchase"
|
|
elif self.doctype in ["Delivery Note", "Sales Invoice"]:
|
|
inspection_required_fieldname = "inspection_required_before_delivery"
|
|
|
|
if ((not inspection_required_fieldname and self.doctype != "Stock Entry") or
|
|
(self.doctype == "Stock Entry" and not self.inspection_required) or
|
|
(self.doctype in ["Sales Invoice", "Purchase Invoice"] and not self.update_stock)):
|
|
return
|
|
|
|
for d in self.get('items'):
|
|
qa_required = False
|
|
if (inspection_required_fieldname and not d.quality_inspection and
|
|
frappe.db.get_value("Item", d.item_code, inspection_required_fieldname)):
|
|
qa_required = True
|
|
elif self.doctype == "Stock Entry" and not d.quality_inspection and d.t_warehouse:
|
|
qa_required = True
|
|
if self.docstatus == 1 and d.quality_inspection:
|
|
qa_doc = frappe.get_doc("Quality Inspection", d.quality_inspection)
|
|
if qa_doc.docstatus == 0:
|
|
link = frappe.utils.get_link_to_form('Quality Inspection', d.quality_inspection)
|
|
frappe.throw(_("Quality Inspection: {0} is not submitted for the item: {1} in row {2}").format(link, d.item_code, d.idx), QualityInspectionNotSubmittedError)
|
|
|
|
qa_failed = any([r.status=="Rejected" for r in qa_doc.readings])
|
|
if qa_failed:
|
|
frappe.throw(_("Row {0}: Quality Inspection rejected for item {1}")
|
|
.format(d.idx, d.item_code), QualityInspectionRejectedError)
|
|
elif qa_required :
|
|
action = frappe.get_doc('Stock Settings').action_if_quality_inspection_is_not_submitted
|
|
if self.docstatus==1 and action == 'Stop':
|
|
frappe.throw(_("Quality Inspection required for Item {0} to submit").format(frappe.bold(d.item_code)),
|
|
exc=QualityInspectionRequiredError)
|
|
else:
|
|
frappe.msgprint(_("Create Quality Inspection for Item {0}").format(frappe.bold(d.item_code)))
|
|
|
|
def update_blanket_order(self):
|
|
blanket_orders = list(set([d.blanket_order for d in self.items if d.blanket_order]))
|
|
for blanket_order in blanket_orders:
|
|
frappe.get_doc("Blanket Order", blanket_order).update_ordered_qty()
|
|
|
|
def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
|
|
warehouse_account=None, company=None):
|
|
def _delete_gl_entries(voucher_type, voucher_no):
|
|
frappe.db.sql("""delete from `tabGL Entry`
|
|
where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
|
|
|
|
if not warehouse_account:
|
|
warehouse_account = get_warehouse_account_map(company)
|
|
|
|
future_stock_vouchers = get_future_stock_vouchers(posting_date, posting_time, for_warehouses, for_items)
|
|
gle = get_voucherwise_gl_entries(future_stock_vouchers, posting_date)
|
|
|
|
for voucher_type, voucher_no in future_stock_vouchers:
|
|
existing_gle = gle.get((voucher_type, voucher_no), [])
|
|
voucher_obj = frappe.get_doc(voucher_type, voucher_no)
|
|
expected_gle = voucher_obj.get_gl_entries(warehouse_account)
|
|
if expected_gle:
|
|
if not existing_gle or not compare_existing_and_expected_gle(existing_gle, expected_gle):
|
|
_delete_gl_entries(voucher_type, voucher_no)
|
|
voucher_obj.make_gl_entries(gl_entries=expected_gle, repost_future_gle=False, from_repost=True)
|
|
else:
|
|
_delete_gl_entries(voucher_type, voucher_no)
|
|
|
|
def compare_existing_and_expected_gle(existing_gle, expected_gle):
|
|
matched = True
|
|
for entry in expected_gle:
|
|
account_existed = False
|
|
for e in existing_gle:
|
|
if entry.account == e.account:
|
|
account_existed = True
|
|
if entry.account == e.account and entry.against_account == e.against_account \
|
|
and (not entry.cost_center or not e.cost_center or entry.cost_center == e.cost_center) \
|
|
and (entry.debit != e.debit or entry.credit != e.credit):
|
|
matched = False
|
|
break
|
|
if not account_existed:
|
|
matched = False
|
|
break
|
|
return matched
|
|
|
|
def get_future_stock_vouchers(posting_date, posting_time, for_warehouses=None, for_items=None):
|
|
future_stock_vouchers = []
|
|
|
|
values = []
|
|
condition = ""
|
|
if for_items:
|
|
condition += " and item_code in ({})".format(", ".join(["%s"] * len(for_items)))
|
|
values += for_items
|
|
|
|
if for_warehouses:
|
|
condition += " and warehouse in ({})".format(", ".join(["%s"] * len(for_warehouses)))
|
|
values += for_warehouses
|
|
|
|
for d in frappe.db.sql("""select distinct sle.voucher_type, sle.voucher_no
|
|
from `tabStock Ledger Entry` sle
|
|
where timestamp(sle.posting_date, sle.posting_time) >= timestamp(%s, %s) {condition}
|
|
order by timestamp(sle.posting_date, sle.posting_time) asc, creation asc""".format(condition=condition),
|
|
tuple([posting_date, posting_time] + values), as_dict=True):
|
|
future_stock_vouchers.append([d.voucher_type, d.voucher_no])
|
|
|
|
return future_stock_vouchers
|
|
|
|
def get_voucherwise_gl_entries(future_stock_vouchers, posting_date):
|
|
gl_entries = {}
|
|
if future_stock_vouchers:
|
|
for d in frappe.db.sql("""select * from `tabGL Entry`
|
|
where posting_date >= %s and voucher_no in (%s)""" %
|
|
('%s', ', '.join(['%s']*len(future_stock_vouchers))),
|
|
tuple([posting_date] + [d[1] for d in future_stock_vouchers]), as_dict=1):
|
|
gl_entries.setdefault((d.voucher_type, d.voucher_no), []).append(d)
|
|
|
|
return gl_entries
|