Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18095 from scmmishra/remove-move-stock-summary

Browse Source 
refactor: move and add for serialized and batch items in stock summary
This commit is contained in:
rohitwaghchaure 2019-07-17 18:50:00 +05:30 committed by GitHub
commit 3403d1cc44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
erpnext/stock/dashboard/item_dashboard.js
View File

@ -16,18 +16,47 @@ erpnext.stock.ItemDashboard = Class.extend({
this.content = $(frappe.render_template('item_dashboard')).appendTo(this.parent); this.content = $(frappe.render_template('item_dashboard')).appendTo(this.parent);
this.result = this.content.find('.result'); this.result = this.content.find('.result');
// move
this.content.on('click', '.btn-move', function() { this.content.on('click', '.btn-move', function() {
erpnext.stock.move_item(unescape($(this).attr('data-item')), $(this).attr('data-warehouse'), handle_move_add($(this), "Move")
null, $(this).attr('data-actual_qty'), null, function() { me.refresh(); });
}); });
this.content.on('click', '.btn-add', function() { this.content.on('click', '.btn-add', function() {
erpnext.stock.move_item(unescape($(this).attr('data-item')), null, $(this).attr('data-warehouse'), handle_move_add($(this), "Add")
$(this).attr('data-actual_qty'), $(this).attr('data-rate'),
function() { me.refresh(); });
}); });
function handle_move_add(element, action) {
let item = unescape(element.attr('data-item'));
let warehouse = unescape(element.attr('data-warehouse'));
let actual_qty = unescape(element.attr('data-actual_qty'));
let disable_quick_entry = Number(unescape(element.attr('data-disable_quick_entry')));
let entry_type = action === "Move" ? "Material Transfer": null;
if (disable_quick_entry) {
open_stock_entry(item, warehouse, entry_type);
} else {
if (action === "Add") {
let rate = unescape($(this).attr('data-rate'));
erpnext.stock.move_item(item, null, warehouse, actual_qty, rate, function() { me.refresh(); });
}
else {
erpnext.stock.move_item(item, warehouse, null, actual_qty, null, function() { me.refresh(); });
}
}
}
function open_stock_entry(item, warehouse, entry_type) {
frappe.model.with_doctype('Stock Entry', function() {
var doc = frappe.model.get_new_doc('Stock Entry');
if (entry_type) doc.stock_entry_type = entry_type;
var row = frappe.model.add_child(doc, 'items');
row.item_code = item;
row.s_warehouse = warehouse;
frappe.set_route('Form', doc.doctype, doc.name);
})
}
// more // more
this.content.find('.btn-more').on('click', function() { this.content.find('.btn-more').on('click', function() {
me.start += 20; me.start += 20;

4
erpnext/stock/dashboard/item_dashboard.py
View File

@ -44,7 +44,9 @@ def get_data(item_code=None, warehouse=None, item_group=None,
for item in items: for item in items:
item.update({ item.update({
'item_name': frappe.get_cached_value("Item", item.item_code, 'item_name') 'item_name': frappe.get_cached_value("Item", item.item_code, 'item_name'),
'disable_quick_entry': frappe.get_cached_value("Item", item.item_code, 'has_batch_no')
or frappe.get_cached_value("Item", item.item_code, 'has_serial_no'),
}) })
return items return items

2
erpnext/stock/dashboard/item_dashboard_list.html
View File

@ -43,11 +43,13 @@
<div class="col-sm-2 text-right" style="margin-top: 8px;"> <div class="col-sm-2 text-right" style="margin-top: 8px;">
{% if d.actual_qty %} {% if d.actual_qty %}
<button class="btn btn-default btn-xs btn-move" <button class="btn btn-default btn-xs btn-move"
data-disable_quick_entry="{{ d.disable_quick_entry }}"
data-warehouse="{{ d.warehouse }}" data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}" data-actual_qty="{{ d.actual_qty }}"
data-item="{{ escape(d.item_code) }}">{{ __("Move") }}</a> data-item="{{ escape(d.item_code) }}">{{ __("Move") }}</a>
{% endif %} {% endif %}
<button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add" <button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
data-disable_quick_entry="{{ d.disable_quick_entry }}"
data-warehouse="{{ d.warehouse }}" data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}" data-actual_qty="{{ d.actual_qty }}"
data-item="{{ escape(d.item_code) }}" data-item="{{ escape(d.item_code) }}"