nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into edge

Browse Source
This commit is contained in:
Anand Doshi
2013-04-12 15:41:31 +05:30
parent 93b638af4d 6ce8af3b67
commit 36ecbbd9e8
8 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stock/doctype/item/item.py
View File

@@ -239,8 +239,8 @@ class DocType(DocListController):
vals = webnotes.conn.get_value("Item", self.doc.name,
["has_serial_no", "is_stock_item", "valuation_method"], as_dict=True)
if vals and (vals.has_serial_no != self.doc.has_serial_no or
vals.is_stock_item != self.doc.is_stock_item or
if vals and ((self.doc.is_stock_item == "No" and vals.is_stock_item == "Yes") or
vals.has_serial_no != self.doc.has_serial_no or
vals.valuation_method != self.doc.valuation_method):
if self.check_if_sle_exists():
webnotes.msgprint(_("As there are existing stock transactions for this \

14
stock/doctype/packing_slip/packing_slip.js
View File

@@ -138,3 +138,17 @@ cur_frm.cscript.calc_net_total_pkg = function(doc, ps_detail) {
refresh_many(['net_weight_pkg', 'net_weight_uom', 'gross_weight_uom', 'gross_weight_pkg']);
}
var make_row = function(title,val,bold){
var bstart = '<b>'; var bend = '</b>';
return '<tr><td class="datalabelcell">'+(bold?bstart:'')+title+(bold?bend:'')+'</td>'
+'<td class="datainputcell" style="text-align:left;">'+ val +'</td>'
+'</tr>'
}
cur_frm.pformat.net_weight_pkg= function(doc){
return '<table style="width:100%">' + make_row('Net Weight', doc.net_weight_pkg) + '</table>'
}
cur_frm.pformat.gross_weight_pkg= function(doc){
return '<table style="width:100%">' + make_row('Gross Weight', doc.gross_weight_pkg) + '</table>'
}

4
stock/doctype/packing_slip/packing_slip.py
View File

@@ -94,12 +94,10 @@ class DocType:
* Item Quantity dict of current packing slip doc
* No. of Cases of this packing slip
"""
item_codes = ", ".join([('"' + d.item_code + '"') for d in
self.doclist])
items = [d.item_code for d in self.doclist.get({"parentfield": "item_details"})]
if not item_codes: webnotes.msgprint("No Items to Pack",
if not items: webnotes.msgprint("No Items to Pack",
raise_exception=1)
# gets item code, qty per item code, latest packed qty per item code and stock uom

11
stock/doctype/packing_slip_item/packing_slip_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-07 11:42:59",
"creation": "2013-04-08 13:10:16",
"docstatus": 0,
"modified": "2013-04-05 16:06:40",
"modified": "2013-04-11 15:06:05",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -70,7 +70,7 @@
"fieldtype": "Float",
"label": "Net Weight",
"print_width": "100px",
"read_only": 1,
"read_only": 0,
"width": "100px"
},
{
@@ -80,7 +80,7 @@
"label": "Weight UOM",
"options": "UOM",
"print_width": "100px",
"read_only": 1,
"read_only": 0,
"width": "100px"
},
{
@@ -95,6 +95,7 @@
"fieldname": "dn_detail",
"fieldtype": "Data",
"hidden": 1,
"label": "DN Detail"
"label": "DN Detail",
"read_only": 0
}
]