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

fixes in packing slip

Browse Source
This commit is contained in:
Nabin Hait 2013-04-06 08:20:35 +05:30
parent 5d4758b3e6
commit b72af39331
5 changed files with 88 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
stock/DocType Mapper/Delivery Note-Packing Slip/Delivery Note-Packing Slip.txt
View File

@ -1,71 +1,78 @@
[ [
{ {
"owner": "Administrator", "creation": "2012-02-02 11:50:33",
"docstatus": 0, "docstatus": 0,
"creation": "2012-02-22 15:45:56", "modified": "2013-04-05 16:08:22",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-22 15:45:56" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"parent": "Delivery Note-Packing Slip",
"doctype": "Table Mapper Detail", "doctype": "Table Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "table_mapper_details"
},
{
"name": "__common__", "name": "__common__",
"parent": "Delivery Note-Packing Slip", "parent": "Delivery Note-Packing Slip",
"parentfield": "table_mapper_details",
"parenttype": "DocType Mapper"
},
{
"doctype": "Field Mapper Detail", "doctype": "Field Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "field_mapper_details"
},
{
"name": "__common__", "name": "__common__",
"to_doctype": "Packing Slip", "parent": "Delivery Note-Packing Slip",
"module": "Stock", "parentfield": "field_mapper_details",
"parenttype": "DocType Mapper"
},
{
"doctype": "DocType Mapper", "doctype": "DocType Mapper",
"from_doctype": "Delivery Note",
"module": "Stock",
"name": "__common__",
"ref_doc_submitted": 0, "ref_doc_submitted": 0,
"from_doctype": "Delivery Note" "to_doctype": "Packing Slip"
}, },
{ {
"name": "Delivery Note-Packing Slip", "doctype": "DocType Mapper",
"doctype": "DocType Mapper" "name": "Delivery Note-Packing Slip"
}, },
{ {
"doctype": "Field Mapper Detail",
"from_field": "name",
"map": "Yes", "map": "Yes",
"match_id": 0, "match_id": 0,
"to_field": "delivery_note", "to_field": "delivery_note"
"doctype": "Field Mapper Detail",
"from_field": "name"
}, },
{ {
"doctype": "Field Mapper Detail",
"from_field": "qty",
"map": "No", "map": "No",
"match_id": 1, "match_id": 1,
"to_field": "qty", "to_field": "qty"
"doctype": "Field Mapper Detail",
"from_field": "qty"
}, },
{ {
"doctype": "Field Mapper Detail",
"from_field": "naming_series",
"map": "No", "map": "No",
"match_id": 0, "match_id": 0,
"to_field": "naming_series", "to_field": "naming_series"
"doctype": "Field Mapper Detail", },
"from_field": "naming_series" {
"doctype": "Field Mapper Detail",
"from_field": "name",
"map": "Yes",
"match_id": 1,
"to_field": "dn_detail"
}, },
{ {
"match_id": 0,
"doctype": "Table Mapper Detail", "doctype": "Table Mapper Detail",
"from_table": "Delivery Note", "from_table": "Delivery Note",
"match_id": 0,
"to_table": "Packing Slip", "to_table": "Packing Slip",
"validation_logic": "docstatus=0" "validation_logic": "docstatus=0"
}, },
{ {
"match_id": 1,
"to_field": "item_details",
"doctype": "Table Mapper Detail", "doctype": "Table Mapper Detail",
"from_field": "delivery_note_details", "from_field": "delivery_note_details",
"from_table": "Delivery Note Item", "from_table": "Delivery Note Item",
"match_id": 1,
"to_field": "item_details",
"to_table": "Packing Slip Item", "to_table": "Packing Slip Item",
"validation_logic": "IFNULL(packed_qty, 0) < IFNULL(qty, 0)" "validation_logic": "IFNULL(packed_qty, 0) < IFNULL(qty, 0)"
} }

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

@ -35,7 +35,6 @@ cur_frm.add_fetch("item_code", "net_weight", "net_weight");
cur_frm.add_fetch("item_code", "weight_uom", "weight_uom"); cur_frm.add_fetch("item_code", "weight_uom", "weight_uom");
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
console.log(make_doclist(cdt, cdn));
if(doc.delivery_note && doc.__islocal) { if(doc.delivery_note && doc.__islocal) {
var ps_detail = getchildren('Packing Slip Item', doc.name, 'item_details'); var ps_detail = getchildren('Packing Slip Item', doc.name, 'item_details');
if(!(flt(ps_detail.net_weight) && cstr(ps_detail.weight_uom))) { if(!(flt(ps_detail.net_weight) && cstr(ps_detail.weight_uom))) {
@ -100,7 +99,7 @@ cur_frm.cscript.validate_calculate_item_details = function(doc) {
cur_frm.cscript.validate_duplicate_items = function(doc, ps_detail) { cur_frm.cscript.validate_duplicate_items = function(doc, ps_detail) {
for(var i=0; i<ps_detail.length; i++) { for(var i=0; i<ps_detail.length; i++) {
for(var j=0; j<ps_detail.length; j++) { for(var j=0; j<ps_detail.length; j++) {
if(i!=j && ps_detail[i].item_code==ps_detail[j].item_code) { if(i!=j && ps_detail[i].dn_detail && ps_detail[i].dn_detail==ps_detail[j].dn_detail) {
msgprint("You have entered duplicate items. Please rectify and try again."); msgprint("You have entered duplicate items. Please rectify and try again.");
validated = false; validated = false;
return; return;

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

@ -128,6 +128,7 @@ class DocType:
""" """
item['recommended_qty'] = (flt(item['qty']) - flt(item['packed_qty'])) / no_of_cases item['recommended_qty'] = (flt(item['qty']) - flt(item['packed_qty'])) / no_of_cases
item['specified_qty'] = flt(ps_item_qty[item['item_code']]) item['specified_qty'] = flt(ps_item_qty[item['item_code']])
if not item['packed_qty']: item['packed_qty'] = 0
webnotes.msgprint(""" webnotes.msgprint("""
Invalid Quantity specified (%(specified_qty)s %(stock_uom)s). Invalid Quantity specified (%(specified_qty)s %(stock_uom)s).

53
stock/doctype/packing_slip/packing_slip.txt
View File

@ -1,8 +1,8 @@
[ [
{ {
"creation": "2013-01-10 16:34:28", "creation": "2013-03-07 18:50:31",
"docstatus": 0, "docstatus": 0,
"modified": "2013-01-22 14:56:40", "modified": "2013-04-05 15:40:59",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -48,12 +48,14 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "packing_slip_details", "fieldname": "packing_slip_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Packing Slip Items" "label": "Packing Slip Items",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "column_break0", "fieldname": "column_break0",
"fieldtype": "Column Break" "fieldtype": "Column Break",
"read_only": 0
}, },
{ {
"description": "Indicates that the package is a part of this delivery", "description": "Indicates that the package is a part of this delivery",
@ -62,12 +64,14 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Delivery Note", "label": "Delivery Note",
"options": "Delivery Note", "options": "Delivery Note",
"read_only": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "column_break1", "fieldname": "column_break1",
"fieldtype": "Column Break" "fieldtype": "Column Break",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
@ -77,17 +81,20 @@
"no_copy": 0, "no_copy": 0,
"options": "PS", "options": "PS",
"print_hide": 1, "print_hide": 1,
"read_only": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "section_break0", "fieldname": "section_break0",
"fieldtype": "Section Break" "fieldtype": "Section Break",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "column_break2", "fieldname": "column_break2",
"fieldtype": "Column Break" "fieldtype": "Column Break",
"read_only": 0
}, },
{ {
"description": "Identification of the package for the delivery (for print)", "description": "Identification of the package for the delivery (for print)",
@ -96,13 +103,15 @@
"fieldtype": "Data", "fieldtype": "Data",
"label": "From Package No.", "label": "From Package No.",
"no_copy": 1, "no_copy": 1,
"read_only": 0,
"reqd": 1, "reqd": 1,
"width": "50px" "width": "50px"
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "column_break3", "fieldname": "column_break3",
"fieldtype": "Column Break" "fieldtype": "Column Break",
"read_only": 0
}, },
{ {
"description": "If more than one package of the same type (for print)", "description": "If more than one package of the same type (for print)",
@ -111,26 +120,30 @@
"fieldtype": "Data", "fieldtype": "Data",
"label": "To Package No.", "label": "To Package No.",
"no_copy": 1, "no_copy": 1,
"read_only": 0,
"width": "50px" "width": "50px"
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "package_item_details", "fieldname": "package_item_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Package Item Details" "label": "Package Item Details",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "item_details", "fieldname": "item_details",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Items", "label": "Items",
"options": "Packing Slip Item" "options": "Packing Slip Item",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "package_weight_details", "fieldname": "package_weight_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Package Weight Details" "label": "Package Weight Details",
"read_only": 0
}, },
{ {
"description": "The net weight of this package. (calculated automatically as sum of net weight of items)", "description": "The net weight of this package. (calculated automatically as sum of net weight of items)",
@ -144,15 +157,17 @@
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "net_weight_uom", "fieldname": "net_weight_uom",
"fieldtype": "Data", "fieldtype": "Link",
"label": "Net Weight UOM", "label": "Net Weight UOM",
"no_copy": 1, "no_copy": 1,
"options": "UOM",
"read_only": 1 "read_only": 1
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "column_break4", "fieldname": "column_break4",
"fieldtype": "Column Break" "fieldtype": "Column Break",
"read_only": 0
}, },
{ {
"description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)", "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)",
@ -160,7 +175,8 @@
"fieldname": "gross_weight_pkg", "fieldname": "gross_weight_pkg",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Gross Weight", "label": "Gross Weight",
"no_copy": 1 "no_copy": 1,
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
@ -168,13 +184,15 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Gross Weight UOM", "label": "Gross Weight UOM",
"no_copy": 1, "no_copy": 1,
"options": "UOM" "options": "UOM",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "misc_details", "fieldname": "misc_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Misc Details" "label": "Misc Details",
"read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
@ -194,7 +212,8 @@
"fieldtype": "Date", "fieldtype": "Date",
"label": "Amendment Date", "label": "Amendment Date",
"no_copy": 1, "no_copy": 1,
"print_hide": 1 "print_hide": 1,
"read_only": 0
}, },
{ {
"doctype": "DocPerm", "doctype": "DocPerm",

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

@ -1,8 +1,8 @@
[ [
{ {
"creation": "2013-02-22 01:28:02", "creation": "2013-03-07 11:42:59",
"docstatus": 0, "docstatus": 0,
"modified": "2013-03-07 07:03:26", "modified": "2013-04-05 16:06:40",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -32,6 +32,7 @@
"label": "Item Code", "label": "Item Code",
"options": "Item", "options": "Item",
"print_width": "100px", "print_width": "100px",
"read_only": 0,
"reqd": 1, "reqd": 1,
"width": "100px" "width": "100px"
}, },
@ -50,6 +51,7 @@
"fieldtype": "Float", "fieldtype": "Float",
"label": "Quantity", "label": "Quantity",
"print_width": "100px", "print_width": "100px",
"read_only": 0,
"reqd": 1, "reqd": 1,
"width": "100px" "width": "100px"
}, },
@ -85,6 +87,14 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "page_break", "fieldname": "page_break",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Page Break" "label": "Page Break",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "dn_detail",
"fieldtype": "Data",
"hidden": 1,
"label": "DN Detail"
} }
] ]