nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes][account][packing slip]

Browse Source
This commit is contained in:
Nabin Hait
2013-04-11 15:31:41 +05:30
parent 1cfab4e21d
commit d246de8417
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accounts/doctype/account/account.py
View File

@@ -69,11 +69,13 @@ class DocType:
raise_exception=1) raise_exception=1)
def validate_duplicate_account(self): def validate_duplicate_account(self):
if (self.doc.fields.get('__islocal') or not self.doc.name) and \
sql("""select name from tabAccount where account_name=%s and company=%s""", if self.doc.fields.get('__islocal') or not self.doc.name:
(self.doc.account_name, self.doc.company)): company_abbr = webnotes.conn.get_value("Company", self.doc.company, "abbr")
msgprint("Account Name: %s already exists, please rename" if sql("""select name from tabAccount where name=%s""",
% self.doc.account_name, raise_exception=1) (self.doc.account_name + " - " + company_abbr)):
msgprint("Account Name: %s already exists, please rename"
% self.doc.account_name, raise_exception=1)
def validate_root_details(self): def validate_root_details(self):
#does not exists parent #does not exists parent

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']); 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 * Item Quantity dict of current packing slip doc
* No. of Cases of this packing slip * 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"})] 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) raise_exception=1)
# gets item code, qty per item code, latest packed qty per item code and stock uom # 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, "docstatus": 0,
"modified": "2013-04-05 16:06:40", "modified": "2013-04-11 15:06:05",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -70,7 +70,7 @@
"fieldtype": "Float", "fieldtype": "Float",
"label": "Net Weight", "label": "Net Weight",
"print_width": "100px", "print_width": "100px",
"read_only": 1, "read_only": 0,
"width": "100px" "width": "100px"
}, },
{ {
@@ -80,7 +80,7 @@
"label": "Weight UOM", "label": "Weight UOM",
"options": "UOM", "options": "UOM",
"print_width": "100px", "print_width": "100px",
"read_only": 1, "read_only": 0,
"width": "100px" "width": "100px"
}, },
{ {
@@ -95,6 +95,7 @@
"fieldname": "dn_detail", "fieldname": "dn_detail",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"label": "DN Detail" "label": "DN Detail",
"read_only": 0
} }
] ]