nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait
2016-12-24 11:01:25 +05:30
parent 58291c77e9 8b3e39ed27
commit c2e12f16c6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.2.0' __version__ = '7.2.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/selling/sales_common.js
View File

@@ -212,7 +212,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
item_code: item.item_code, item_code: item.item_code,
warehouse: item.warehouse, warehouse: item.warehouse,
qty: item.qty, qty: item.qty,
serial_no:item.serial_no serial_no: item.serial_no || ""
}, },
callback:function(r){ callback:function(r){
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) { if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {

2
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@@ -1691,7 +1691,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-23 12:33:37.728117", "modified": "2016-12-24 12:33:37.728117",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",

2
erpnext/stock/get_item_details.py
View File

@@ -384,7 +384,7 @@ def get_serial_no_details(item_code, warehouse, qty, serial_no):
return {'serial_no': serial_no} return {'serial_no': serial_no}
@frappe.whitelist() @frappe.whitelist()
def get_bin_details_and_serial_nos(item_code, warehouse, qty, serial_no): def get_bin_details_and_serial_nos(item_code, warehouse, qty=None, serial_no=None):
bin_details_and_serial_nos = {} bin_details_and_serial_nos = {}
bin_details_and_serial_nos.update(get_bin_details(item_code, warehouse)) bin_details_and_serial_nos.update(get_bin_details(item_code, warehouse))
bin_details_and_serial_nos.update(get_serial_no_details(item_code, warehouse, qty, serial_no)) bin_details_and_serial_nos.update(get_serial_no_details(item_code, warehouse, qty, serial_no))