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

fix: Rename method name

Browse Source
This commit is contained in:
Suraj Shetty 2019-08-26 10:05:01 +05:30
parent 05f243590d
commit 2b9e256002
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@ -264,10 +264,6 @@ frappe.ui.form.on("Work Order", {
}); });
}, },
make_pick_list() {
},
show_progress: function(frm) { show_progress: function(frm) {
var bars = []; var bars = [];
var message = ''; var message = '';

6
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -110,7 +110,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
let allow_delivery = false; let allow_delivery = false;
if (doc.docstatus==1) { if (doc.docstatus==1) {
this.frm.add_custom_button(__('Pick List'), () => this.make_pick_list(), __('Create')); this.frm.add_custom_button(__('Pick List'), () => this.create_pick_list(), __('Create'));
if(this.frm.has_perm("submit")) { if(this.frm.has_perm("submit")) {
if(doc.status === 'On Hold') { if(doc.status === 'On Hold') {
@ -235,9 +235,9 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
this.order_type(doc); this.order_type(doc);
}, },
make_pick_list() { create_pick_list() {
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_pick_list", method: "erpnext.selling.doctype.sales_order.sales_order.create_pick_list",
frm: this.frm frm: this.frm
}) })
}, },

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -1002,7 +1002,7 @@ def make_inter_company_purchase_order(source_name, target_doc=None):
return make_inter_company_transaction("Sales Order", source_name, target_doc) return make_inter_company_transaction("Sales Order", source_name, target_doc)
@frappe.whitelist() @frappe.whitelist()
def make_pick_list(source_name, target_doc=None): def create_pick_list(source_name, target_doc=None):
def update_item_quantity(source, target, source_parent): def update_item_quantity(source, target, source_parent):
target.qty = flt(source.qty) - flt(source.delivered_qty) target.qty = flt(source.qty) - flt(source.delivered_qty)
target.stock_qty = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.conversion_factor) target.stock_qty = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.conversion_factor)

2
erpnext/stock/doctype/pick_list/pick_list.js
View File

@ -118,7 +118,7 @@ frappe.ui.form.on('Pick List', {
return; return;
} }
erpnext.utils.map_current_doc({ erpnext.utils.map_current_doc({
method: 'erpnext.selling.doctype.sales_order.sales_order.make_pick_list', method: 'erpnext.selling.doctype.sales_order.sales_order.create_pick_list',
source_doctype: 'Sales Order', source_doctype: 'Sales Order',
target: frm, target: frm,
setters: { setters: {

2
erpnext/stock/doctype/pick_list/test_pick_list.py
View File

@ -7,8 +7,6 @@ import frappe
import unittest import unittest
# test_dependencies = ['Item', 'Sales Invoice', 'Stock Entry', 'Batch'] # test_dependencies = ['Item', 'Sales Invoice', 'Stock Entry', 'Batch']
from erpnext.selling.doctype.sales_order.sales_order import make_pick_list
class TestPickList(unittest.TestCase): class TestPickList(unittest.TestCase):
def test_pick_list_picks_warehouse_for_each_item(self): def test_pick_list_picks_warehouse_for_each_item(self):
pick_list = frappe.get_doc({ pick_list = frappe.get_doc({