nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-08-21 17:49:26 +05:30
parent 9b09c95d83 72c9aa083a
commit f68d563a68
19 changed files with 340 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/utils.js
View File

@@ -38,7 +38,8 @@ $.extend(erpnext, {
},
setup_serial_no: function(grid_row) {
if(grid_row.fields_dict.serial_no.get_status()!=="Write") return;
if(!grid_row.fields_dict.serial_no ||
grid_row.fields_dict.serial_no.get_status()!=="Write") return;
var $btn = $('<button class="btn btn-sm btn-default">Add Serial No</button>')
.appendTo($("<div>")