Merge branch 'develop' into e-inv-paid-invoice-fix
This commit is contained in:
Saqib Ansari
GitHub
commit
92f632c4b1
@ -146,12 +146,7 @@ def validate_cart_settings(doc=None, method=None):
|
||||
|
||||
|
||||
def get_shopping_cart_settings():
|
||||
if not getattr(frappe.local, "shopping_cart_settings", None):
|
||||
frappe.local.shopping_cart_settings = frappe.get_doc(
|
||||
"E Commerce Settings", "E Commerce Settings"
|
||||
)
|
||||
|
||||
return frappe.local.shopping_cart_settings
|
||||
return frappe.get_cached_doc("E Commerce Settings")
|
||||
|
||||
|
||||
@frappe.whitelist(allow_guest=True)
|
||||
|
||||
@ -41,4 +41,4 @@ class EducationSettings(Document):
|
||||
|
||||
|
||||
def update_website_context(context):
|
||||
context["lms_enabled"] = frappe.get_doc("Education Settings").enable_lms
|
||||
context["lms_enabled"] = frappe.get_cached_doc("Education Settings").enable_lms
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<div class="web-list-item transaction-list-item">
|
||||
{% set today = frappe.utils.getdate(frappe.utils.nowdate()) %}
|
||||
<a href = "{{ doc.route }}/" class="no-underline">
|
||||
<a href = "{{ doc.route }}" class="no-underline">
|
||||
<div class="row">
|
||||
<div class="col-sm-4 bold">
|
||||
<span class="indicator
|
||||
|
||||
@ -735,9 +735,9 @@ def get_number_of_leave_days(
|
||||
(Based on the include_holiday setting in Leave Type)"""
|
||||
number_of_days = 0
|
||||
if cint(half_day) == 1:
|
||||
if from_date == to_date:
|
||||
if getdate(from_date) == getdate(to_date):
|
||||
number_of_days = 0.5
|
||||
elif half_day_date and half_day_date <= to_date:
|
||||
elif half_day_date and getdate(from_date) <= getdate(half_day_date) <= getdate(to_date):
|
||||
number_of_days = date_diff(to_date, from_date) + 0.5
|
||||
else:
|
||||
number_of_days = date_diff(to_date, from_date) + 1
|
||||
|
||||
@ -205,7 +205,12 @@ class TestLeaveApplication(unittest.TestCase):
|
||||
# creates separate leave ledger entries
|
||||
frappe.delete_doc_if_exists("Leave Type", "Test Leave Validation", force=1)
|
||||
leave_type = frappe.get_doc(
|
||||
dict(leave_type_name="Test Leave Validation", doctype="Leave Type", allow_negative=True)
|
||||
dict(
|
||||
leave_type_name="Test Leave Validation",
|
||||
doctype="Leave Type",
|
||||
allow_negative=True,
|
||||
include_holiday=True,
|
||||
)
|
||||
).insert()
|
||||
|
||||
employee = get_employee()
|
||||
@ -217,8 +222,14 @@ class TestLeaveApplication(unittest.TestCase):
|
||||
# application across allocations
|
||||
|
||||
# CASE 1: from date has no allocation, to date has an allocation / both dates have allocation
|
||||
start_date = add_days(year_start, -10)
|
||||
application = make_leave_application(
|
||||
employee.name, add_days(year_start, -10), add_days(year_start, 3), leave_type.name
|
||||
employee.name,
|
||||
start_date,
|
||||
add_days(year_start, 3),
|
||||
leave_type.name,
|
||||
half_day=1,
|
||||
half_day_date=start_date,
|
||||
)
|
||||
|
||||
# 2 separate leave ledger entries
|
||||
@ -828,6 +839,7 @@ class TestLeaveApplication(unittest.TestCase):
|
||||
leave_type_name="_Test_CF_leave_expiry",
|
||||
is_carry_forward=1,
|
||||
expire_carry_forwarded_leaves_after_days=90,
|
||||
include_holiday=True,
|
||||
)
|
||||
leave_type.submit()
|
||||
|
||||
@ -840,6 +852,8 @@ class TestLeaveApplication(unittest.TestCase):
|
||||
leave_type=leave_type.name,
|
||||
from_date=add_days(nowdate(), -3),
|
||||
to_date=add_days(nowdate(), 7),
|
||||
half_day=1,
|
||||
half_day_date=add_days(nowdate(), -3),
|
||||
description="_Test Reason",
|
||||
company="_Test Company",
|
||||
docstatus=1,
|
||||
@ -855,7 +869,7 @@ class TestLeaveApplication(unittest.TestCase):
|
||||
self.assertEqual(len(leave_ledger_entry), 2)
|
||||
self.assertEqual(leave_ledger_entry[0].employee, leave_application.employee)
|
||||
self.assertEqual(leave_ledger_entry[0].leave_type, leave_application.leave_type)
|
||||
self.assertEqual(leave_ledger_entry[0].leaves, -9)
|
||||
self.assertEqual(leave_ledger_entry[0].leaves, -8.5)
|
||||
self.assertEqual(leave_ledger_entry[1].leaves, -2)
|
||||
|
||||
def test_leave_application_creation_after_expiry(self):
|
||||
|
||||
@ -745,6 +745,8 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
|
||||
if payment_type == "Loan Closure":
|
||||
amounts["payable_principal_amount"] = amounts["pending_principal_amount"]
|
||||
amounts["interest_amount"] += amounts["unaccrued_interest"]
|
||||
amounts["payable_amount"] = amounts["payable_principal_amount"] + amounts["interest_amount"]
|
||||
amounts["payable_amount"] = (
|
||||
amounts["payable_principal_amount"] + amounts["interest_amount"] + amounts["penalty_amount"]
|
||||
)
|
||||
|
||||
return amounts
|
||||
|
||||
@ -1290,7 +1290,16 @@ def create_additional_salary(employee, payroll_period, amount):
|
||||
return salary_date
|
||||
|
||||
|
||||
def make_leave_application(employee, from_date, to_date, leave_type, company=None, submit=True):
|
||||
def make_leave_application(
|
||||
employee,
|
||||
from_date,
|
||||
to_date,
|
||||
leave_type,
|
||||
company=None,
|
||||
half_day=False,
|
||||
half_day_date=None,
|
||||
submit=True,
|
||||
):
|
||||
leave_application = frappe.get_doc(
|
||||
dict(
|
||||
doctype="Leave Application",
|
||||
@ -1298,6 +1307,8 @@ def make_leave_application(employee, from_date, to_date, leave_type, company=Non
|
||||
leave_type=leave_type,
|
||||
from_date=from_date,
|
||||
to_date=to_date,
|
||||
half_day=half_day,
|
||||
half_day_date=half_day_date,
|
||||
company=company or erpnext.get_default_company() or "_Test Company",
|
||||
status="Approved",
|
||||
leave_approver="test@example.com",
|
||||
|
||||
@ -403,17 +403,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
var sms_man = new erpnext.SMSManager(this.frm.doc);
|
||||
}
|
||||
|
||||
barcode(doc, cdt, cdn) {
|
||||
const d = locals[cdt][cdn];
|
||||
if (!d.barcode) {
|
||||
// barcode cleared, remove item
|
||||
d.item_code = "";
|
||||
}
|
||||
// flag required for circular triggers
|
||||
d._triggerd_from_barcode = true;
|
||||
this.item_code(doc, cdt, cdn);
|
||||
}
|
||||
|
||||
item_code(doc, cdt, cdn) {
|
||||
var me = this;
|
||||
var item = frappe.get_doc(cdt, cdn);
|
||||
@ -431,9 +420,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
this.frm.doc.doctype === 'Delivery Note') {
|
||||
show_batch_dialog = 1;
|
||||
}
|
||||
if (!item._triggerd_from_barcode) {
|
||||
item.barcode = null;
|
||||
}
|
||||
item.barcode = null;
|
||||
|
||||
|
||||
if(item.item_code || item.barcode || item.serial_no) {
|
||||
@ -539,6 +526,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
if(!d[k]) d[k] = v;
|
||||
});
|
||||
|
||||
if (d.__disable_batch_serial_selector) {
|
||||
// reset for future use.
|
||||
d.__disable_batch_serial_selector = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (d.has_batch_no && d.has_serial_no) {
|
||||
d.batch_no = undefined;
|
||||
}
|
||||
|
||||
@ -21,9 +21,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
|
||||
// batch_no: "LOT12", // present if batch was scanned
|
||||
// serial_no: "987XYZ", // present if serial no was scanned
|
||||
// }
|
||||
this.scan_api =
|
||||
opts.scan_api ||
|
||||
"erpnext.selling.page.point_of_sale.point_of_sale.search_for_serial_or_batch_or_barcode_number";
|
||||
this.scan_api = opts.scan_api || "erpnext.stock.utils.scan_barcode";
|
||||
}
|
||||
|
||||
process_scan() {
|
||||
@ -52,14 +50,16 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
|
||||
return;
|
||||
}
|
||||
|
||||
me.update_table(data.item_code, data.barcode, data.batch_no, data.serial_no);
|
||||
me.update_table(data);
|
||||
});
|
||||
}
|
||||
|
||||
update_table(item_code, barcode, batch_no, serial_no) {
|
||||
update_table(data) {
|
||||
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
|
||||
let row = null;
|
||||
|
||||
const {item_code, barcode, batch_no, serial_no} = data;
|
||||
|
||||
// Check if batch is scanned and table has batch no field
|
||||
let batch_no_scan =
|
||||
Boolean(batch_no) && frappe.meta.has_field(cur_grid.doctype, this.batch_no_field);
|
||||
@ -84,6 +84,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
|
||||
}
|
||||
|
||||
this.show_scan_message(row.idx, row.item_code);
|
||||
this.set_selector_trigger_flag(row, data);
|
||||
this.set_item(row, item_code);
|
||||
this.set_serial_no(row, serial_no);
|
||||
this.set_batch_no(row, batch_no);
|
||||
@ -91,6 +92,19 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
|
||||
this.clean_up();
|
||||
}
|
||||
|
||||
// batch and serial selector is reduandant when all info can be added by scan
|
||||
// this flag on item row is used by transaction.js to avoid triggering selector
|
||||
set_selector_trigger_flag(row, data) {
|
||||
const {batch_no, serial_no, has_batch_no, has_serial_no} = data;
|
||||
|
||||
const require_selecting_batch = has_batch_no && !batch_no;
|
||||
const require_selecting_serial = has_serial_no && !serial_no;
|
||||
|
||||
if (!(require_selecting_batch || require_selecting_serial)) {
|
||||
row.__disable_batch_serial_selector = true;
|
||||
}
|
||||
}
|
||||
|
||||
set_item(row, item_code) {
|
||||
const item_data = { item_code: item_code };
|
||||
item_data[this.qty_field] = (row[this.qty_field] || 0) + 1;
|
||||
|
||||
@ -3,12 +3,14 @@
|
||||
|
||||
|
||||
import json
|
||||
from typing import Dict, Optional
|
||||
|
||||
import frappe
|
||||
from frappe.utils.nestedset import get_root_of
|
||||
|
||||
from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_stock_availability
|
||||
from erpnext.accounts.doctype.pos_profile.pos_profile import get_child_nodes, get_item_groups
|
||||
from erpnext.stock.utils import scan_barcode
|
||||
|
||||
|
||||
def search_by_term(search_term, warehouse, price_list):
|
||||
@ -150,29 +152,8 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_te
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def search_for_serial_or_batch_or_barcode_number(search_value):
|
||||
# search barcode no
|
||||
barcode_data = frappe.db.get_value(
|
||||
"Item Barcode", {"barcode": search_value}, ["barcode", "parent as item_code"], as_dict=True
|
||||
)
|
||||
if barcode_data:
|
||||
return barcode_data
|
||||
|
||||
# search serial no
|
||||
serial_no_data = frappe.db.get_value(
|
||||
"Serial No", search_value, ["name as serial_no", "item_code"], as_dict=True
|
||||
)
|
||||
if serial_no_data:
|
||||
return serial_no_data
|
||||
|
||||
# search batch no
|
||||
batch_no_data = frappe.db.get_value(
|
||||
"Batch", search_value, ["name as batch_no", "item as item_code"], as_dict=True
|
||||
)
|
||||
if batch_no_data:
|
||||
return batch_no_data
|
||||
|
||||
return {}
|
||||
def search_for_serial_or_batch_or_barcode_number(search_value: str) -> Dict[str, Optional[str]]:
|
||||
return scan_barcode(search_value)
|
||||
|
||||
|
||||
def get_conditions(search_term):
|
||||
|
||||
@ -14,7 +14,7 @@ def get_data():
|
||||
"goal_doctype_link": "company",
|
||||
"goal_field": "base_grand_total",
|
||||
"date_field": "posting_date",
|
||||
"filter_str": "docstatus = 1 and is_opening != 'Yes'",
|
||||
"filters": {"docstatus": 1, "is_opening": ("!=", "Yes")},
|
||||
"aggregation": "sum",
|
||||
},
|
||||
"fieldname": "company",
|
||||
|
||||
@ -1,109 +1,42 @@
|
||||
{
|
||||
"allow_copy": 0,
|
||||
"allow_events_in_timeline": 0,
|
||||
"allow_guest_to_view": 0,
|
||||
"allow_import": 0,
|
||||
"allow_rename": 0,
|
||||
"autoname": "field:barcode",
|
||||
"beta": 0,
|
||||
"creation": "2017-12-09 18:54:50.562438",
|
||||
"custom": 0,
|
||||
"docstatus": 0,
|
||||
"actions": [],
|
||||
"autoname": "hash",
|
||||
"creation": "2022-02-11 11:26:22.155183",
|
||||
"doctype": "DocType",
|
||||
"document_type": "",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"barcode",
|
||||
"barcode_type"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fieldname": "barcode",
|
||||
"fieldtype": "Data",
|
||||
"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": "Barcode",
|
||||
"length": 0,
|
||||
"no_copy": 1,
|
||||
"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": 1
|
||||
},
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fieldname": "barcode_type",
|
||||
"fieldtype": "Select",
|
||||
"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": "Barcode Type",
|
||||
"length": 0,
|
||||
"no_copy": 0,
|
||||
"options": "\nEAN\nUPC-A",
|
||||
"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
|
||||
"options": "\nEAN\nUPC-A"
|
||||
}
|
||||
],
|
||||
"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,
|
||||
"modified": "2018-11-13 06:03:09.814357",
|
||||
"links": [],
|
||||
"modified": "2022-04-01 05:54:27.314030",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Item Barcode",
|
||||
"name_case": "",
|
||||
"naming_rule": "Random",
|
||||
"owner": "Administrator",
|
||||
"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_views": 0
|
||||
"states": [],
|
||||
"track_changes": 1
|
||||
}
|
||||
@ -646,21 +646,6 @@ frappe.ui.form.on('Stock Entry Detail', {
|
||||
frm.events.calculate_basic_amount(frm, item);
|
||||
},
|
||||
|
||||
barcode: function(doc, cdt, cdn) {
|
||||
var d = locals[cdt][cdn];
|
||||
if (d.barcode) {
|
||||
frappe.call({
|
||||
method: "erpnext.stock.get_item_details.get_item_code",
|
||||
args: {"barcode": d.barcode },
|
||||
callback: function(r) {
|
||||
if (!r.exe){
|
||||
frappe.model.set_value(cdt, cdn, "item_code", r.message);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
uom: function(doc, cdt, cdn) {
|
||||
var d = locals[cdt][cdn];
|
||||
if(d.uom && d.item_code){
|
||||
|
||||
@ -55,6 +55,25 @@ frappe.ui.form.on("Stock Reconciliation", {
|
||||
}
|
||||
},
|
||||
|
||||
scan_barcode: function(frm) {
|
||||
const barcode_scanner = new erpnext.utils.BarcodeScanner({frm:frm});
|
||||
barcode_scanner.process_scan();
|
||||
},
|
||||
|
||||
scan_mode: function(frm) {
|
||||
if (frm.doc.scan_mode) {
|
||||
frappe.show_alert({
|
||||
message: __("Scan mode enabled, existing quantity will not be fetched."),
|
||||
indicator: "green"
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
set_warehouse: function(frm) {
|
||||
let transaction_controller = new erpnext.TransactionController({frm:frm});
|
||||
transaction_controller.autofill_warehouse(frm.doc.items, "warehouse", frm.doc.set_warehouse);
|
||||
},
|
||||
|
||||
get_items: function(frm) {
|
||||
let fields = [
|
||||
{
|
||||
@ -148,35 +167,25 @@ frappe.ui.form.on("Stock Reconciliation", {
|
||||
batch_no: d.batch_no
|
||||
},
|
||||
callback: function(r) {
|
||||
frappe.model.set_value(cdt, cdn, "qty", r.message.qty);
|
||||
const row = frappe.model.get_doc(cdt, cdn);
|
||||
if (!frm.doc.scan_mode) {
|
||||
frappe.model.set_value(cdt, cdn, "qty", r.message.qty);
|
||||
}
|
||||
frappe.model.set_value(cdt, cdn, "valuation_rate", r.message.rate);
|
||||
frappe.model.set_value(cdt, cdn, "current_qty", r.message.qty);
|
||||
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, "amount", row.qty * row.valuation_rate);
|
||||
frappe.model.set_value(cdt, cdn, "current_serial_no", r.message.serial_nos);
|
||||
|
||||
if (frm.doc.purpose == "Stock Reconciliation") {
|
||||
if (frm.doc.purpose == "Stock Reconciliation" && !frm.doc.scan_mode) {
|
||||
frappe.model.set_value(cdt, cdn, "serial_no", r.message.serial_nos);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
set_item_code: function(doc, cdt, cdn) {
|
||||
var d = frappe.model.get_doc(cdt, cdn);
|
||||
if (d.barcode) {
|
||||
frappe.call({
|
||||
method: "erpnext.stock.get_item_details.get_item_code",
|
||||
args: {"barcode": d.barcode },
|
||||
callback: function(r) {
|
||||
if (!r.exe){
|
||||
frappe.model.set_value(cdt, cdn, "item_code", r.message);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
set_amount_quantity: function(doc, cdt, cdn) {
|
||||
var d = frappe.model.get_doc(cdt, cdn);
|
||||
if (d.qty & d.valuation_rate) {
|
||||
@ -214,13 +223,10 @@ frappe.ui.form.on("Stock Reconciliation", {
|
||||
});
|
||||
|
||||
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) {
|
||||
if (child.batch_no && !frm.doc.scan_mode) {
|
||||
frappe.model.set_value(child.cdt, child.cdn, "batch_no", "");
|
||||
}
|
||||
|
||||
@ -229,7 +235,7 @@ frappe.ui.form.on("Stock Reconciliation Item", {
|
||||
|
||||
item_code: function(frm, cdt, cdn) {
|
||||
var child = locals[cdt][cdn];
|
||||
if (child.batch_no) {
|
||||
if (child.batch_no && !frm.doc.scan_mode) {
|
||||
frappe.model.set_value(cdt, cdn, "batch_no", "");
|
||||
}
|
||||
|
||||
@ -255,7 +261,14 @@ frappe.ui.form.on("Stock Reconciliation Item", {
|
||||
const serial_nos = child.serial_no.trim().split('\n');
|
||||
frappe.model.set_value(cdt, cdn, "qty", serial_nos.length);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
items_add: function(frm, cdt, cdn) {
|
||||
var item = frappe.get_doc(cdt, cdn);
|
||||
if (!item.warehouse && frm.doc.set_warehouse) {
|
||||
frappe.model.set_value(cdt, cdn, "warehouse", frm.doc.set_warehouse);
|
||||
}
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
|
||||
@ -14,6 +14,12 @@
|
||||
"posting_date",
|
||||
"posting_time",
|
||||
"set_posting_time",
|
||||
"section_break_8",
|
||||
"set_warehouse",
|
||||
"section_break_22",
|
||||
"scan_barcode",
|
||||
"column_break_12",
|
||||
"scan_mode",
|
||||
"sb9",
|
||||
"items",
|
||||
"section_break_9",
|
||||
@ -139,13 +145,44 @@
|
||||
{
|
||||
"fieldname": "dimension_col_break",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_8",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "scan_barcode",
|
||||
"fieldtype": "Data",
|
||||
"label": "Scan Barcode",
|
||||
"options": "Barcode"
|
||||
},
|
||||
{
|
||||
"default": "0",
|
||||
"description": "Disables auto-fetching of existing quantity",
|
||||
"fieldname": "scan_mode",
|
||||
"fieldtype": "Check",
|
||||
"label": "Scan Mode"
|
||||
},
|
||||
{
|
||||
"fieldname": "set_warehouse",
|
||||
"fieldtype": "Link",
|
||||
"label": "Default Warehouse",
|
||||
"options": "Warehouse"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_22",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_12",
|
||||
"fieldtype": "Column Break"
|
||||
}
|
||||
],
|
||||
"icon": "fa fa-upload-alt",
|
||||
"idx": 1,
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2022-02-06 14:28:19.043905",
|
||||
"modified": "2022-03-27 08:57:47.161959",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Stock Reconciliation",
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
# License: GNU General Public License v3. See license.txt
|
||||
|
||||
from typing import Optional
|
||||
|
||||
import frappe
|
||||
from frappe import _, msgprint
|
||||
@ -706,29 +707,43 @@ def get_itemwise_batch(warehouse, posting_date, company, item_code=None):
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_stock_balance_for(
|
||||
item_code, warehouse, posting_date, posting_time, batch_no=None, with_valuation_rate=True
|
||||
item_code: str,
|
||||
warehouse: str,
|
||||
posting_date: str,
|
||||
posting_time: str,
|
||||
batch_no: Optional[str] = None,
|
||||
with_valuation_rate: bool = True,
|
||||
):
|
||||
frappe.has_permission("Stock Reconciliation", "write", throw=True)
|
||||
|
||||
item_dict = frappe.db.get_value("Item", item_code, ["has_serial_no", "has_batch_no"], as_dict=1)
|
||||
item_dict = frappe.get_cached_value(
|
||||
"Item", item_code, ["has_serial_no", "has_batch_no"], as_dict=1
|
||||
)
|
||||
|
||||
if not item_dict:
|
||||
# In cases of data upload to Items table
|
||||
msg = _("Item {} does not exist.").format(item_code)
|
||||
frappe.throw(msg, title=_("Missing"))
|
||||
|
||||
serial_nos = ""
|
||||
with_serial_no = True if item_dict.get("has_serial_no") else False
|
||||
serial_nos = None
|
||||
has_serial_no = bool(item_dict.get("has_serial_no"))
|
||||
has_batch_no = bool(item_dict.get("has_batch_no"))
|
||||
|
||||
if not batch_no and has_batch_no:
|
||||
# Not enough information to fetch data
|
||||
return {"qty": 0, "rate": 0, "serial_nos": None}
|
||||
|
||||
# TODO: fetch only selected batch's values
|
||||
data = get_stock_balance(
|
||||
item_code,
|
||||
warehouse,
|
||||
posting_date,
|
||||
posting_time,
|
||||
with_valuation_rate=with_valuation_rate,
|
||||
with_serial_no=with_serial_no,
|
||||
with_serial_no=has_serial_no,
|
||||
)
|
||||
|
||||
if with_serial_no:
|
||||
if has_serial_no:
|
||||
qty, rate, serial_nos = data
|
||||
else:
|
||||
qty, rate = data
|
||||
|
||||
@ -16,15 +16,15 @@
|
||||
"amount",
|
||||
"allow_zero_valuation_rate",
|
||||
"serial_no_and_batch_section",
|
||||
"serial_no",
|
||||
"column_break_11",
|
||||
"batch_no",
|
||||
"column_break_11",
|
||||
"serial_no",
|
||||
"section_break_3",
|
||||
"current_qty",
|
||||
"current_serial_no",
|
||||
"current_amount",
|
||||
"column_break_9",
|
||||
"current_valuation_rate",
|
||||
"current_amount",
|
||||
"current_serial_no",
|
||||
"section_break_14",
|
||||
"quantity_difference",
|
||||
"column_break_16",
|
||||
@ -181,7 +181,7 @@
|
||||
],
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-05-21 12:13:33.041266",
|
||||
"modified": "2022-04-02 04:19:40.380587",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Stock Reconciliation Item",
|
||||
@ -190,5 +190,6 @@
|
||||
"quick_entry": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": [],
|
||||
"track_changes": 1
|
||||
}
|
||||
@ -167,6 +167,9 @@ def update_stock(args, out):
|
||||
reserved_so = get_so_reservation_for_item(args)
|
||||
out.serial_no = get_serial_no(out, args.serial_no, sales_order=reserved_so)
|
||||
|
||||
if not out.serial_no:
|
||||
out.pop("serial_no", None)
|
||||
|
||||
|
||||
def set_valuation_rate(out, args):
|
||||
if frappe.db.exists("Product Bundle", args.item_code, cache=True):
|
||||
|
||||
31
erpnext/stock/tests/test_utils.py
Normal file
31
erpnext/stock/tests/test_utils.py
Normal file
@ -0,0 +1,31 @@
|
||||
import frappe
|
||||
from frappe.tests.utils import FrappeTestCase
|
||||
|
||||
from erpnext.stock.doctype.item.test_item import make_item
|
||||
from erpnext.stock.utils import scan_barcode
|
||||
|
||||
|
||||
class TestStockUtilities(FrappeTestCase):
|
||||
def test_barcode_scanning(self):
|
||||
simple_item = make_item(properties={"barcodes": [{"barcode": "12399"}]})
|
||||
self.assertEqual(scan_barcode("12399")["item_code"], simple_item.name)
|
||||
|
||||
batch_item = make_item(properties={"has_batch_no": 1, "create_new_batch": 1})
|
||||
batch = frappe.get_doc(doctype="Batch", item=batch_item.name).insert()
|
||||
|
||||
batch_scan = scan_barcode(batch.name)
|
||||
self.assertEqual(batch_scan["item_code"], batch_item.name)
|
||||
self.assertEqual(batch_scan["batch_no"], batch.name)
|
||||
self.assertEqual(batch_scan["has_batch_no"], 1)
|
||||
self.assertEqual(batch_scan["has_serial_no"], 0)
|
||||
|
||||
serial_item = make_item(properties={"has_serial_no": 1})
|
||||
serial = frappe.get_doc(
|
||||
doctype="Serial No", item_code=serial_item.name, serial_no=frappe.generate_hash()
|
||||
).insert()
|
||||
|
||||
serial_scan = scan_barcode(serial.name)
|
||||
self.assertEqual(serial_scan["item_code"], serial_item.name)
|
||||
self.assertEqual(serial_scan["serial_no"], serial.name)
|
||||
self.assertEqual(serial_scan["has_batch_no"], 0)
|
||||
self.assertEqual(serial_scan["has_serial_no"], 1)
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
import json
|
||||
from typing import Dict, Optional
|
||||
|
||||
import frappe
|
||||
from frappe import _
|
||||
@ -548,3 +549,51 @@ def check_pending_reposting(posting_date: str, throw_error: bool = True) -> bool
|
||||
)
|
||||
|
||||
return bool(reposting_pending)
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def scan_barcode(search_value: str) -> Dict[str, Optional[str]]:
|
||||
|
||||
# search barcode no
|
||||
barcode_data = frappe.db.get_value(
|
||||
"Item Barcode",
|
||||
{"barcode": search_value},
|
||||
["barcode", "parent as item_code"],
|
||||
as_dict=True,
|
||||
)
|
||||
if barcode_data:
|
||||
return _update_item_info(barcode_data)
|
||||
|
||||
# search serial no
|
||||
serial_no_data = frappe.db.get_value(
|
||||
"Serial No",
|
||||
search_value,
|
||||
["name as serial_no", "item_code", "batch_no"],
|
||||
as_dict=True,
|
||||
)
|
||||
if serial_no_data:
|
||||
return _update_item_info(serial_no_data)
|
||||
|
||||
# search batch no
|
||||
batch_no_data = frappe.db.get_value(
|
||||
"Batch",
|
||||
search_value,
|
||||
["name as batch_no", "item as item_code"],
|
||||
as_dict=True,
|
||||
)
|
||||
if batch_no_data:
|
||||
return _update_item_info(batch_no_data)
|
||||
|
||||
return {}
|
||||
|
||||
|
||||
def _update_item_info(scan_result: Dict[str, Optional[str]]) -> Dict[str, Optional[str]]:
|
||||
if item_code := scan_result.get("item_code"):
|
||||
if item_info := frappe.get_cached_value(
|
||||
"Item",
|
||||
item_code,
|
||||
["has_batch_no", "has_serial_no"],
|
||||
as_dict=True,
|
||||
):
|
||||
scan_result.update(item_info)
|
||||
return scan_result
|
||||
|
||||
@ -8,7 +8,7 @@ no_cache = 1
|
||||
|
||||
|
||||
def get_context(context):
|
||||
homepage = frappe.get_doc("Homepage")
|
||||
homepage = frappe.get_cached_doc("Homepage")
|
||||
|
||||
for item in homepage.products:
|
||||
route = frappe.db.get_value("Website Item", {"item_code": item.item_code}, "route")
|
||||
@ -20,10 +20,10 @@ def get_context(context):
|
||||
context.homepage = homepage
|
||||
|
||||
if homepage.hero_section_based_on == "Homepage Section" and homepage.hero_section:
|
||||
homepage.hero_section_doc = frappe.get_doc("Homepage Section", homepage.hero_section)
|
||||
homepage.hero_section_doc = frappe.get_cached_doc("Homepage Section", homepage.hero_section)
|
||||
|
||||
if homepage.slideshow:
|
||||
doc = frappe.get_doc("Website Slideshow", homepage.slideshow)
|
||||
doc = frappe.get_cached_doc("Website Slideshow", homepage.slideshow)
|
||||
context.slideshow = homepage.slideshow
|
||||
context.slideshow_header = doc.header
|
||||
context.slides = doc.slideshow_items
|
||||
@ -46,7 +46,7 @@ def get_context(context):
|
||||
order_by="section_order asc",
|
||||
)
|
||||
context.homepage_sections = [
|
||||
frappe.get_doc("Homepage Section", name) for name in homepage_sections
|
||||
frappe.get_cached_doc("Homepage Section", name) for name in homepage_sections
|
||||
]
|
||||
|
||||
context.metatags = context.metatags or frappe._dict({})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user