From bd025a6cdf147577f8dc2b52825c85ea282c30df Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 29 Jun 2012 12:23:44 +0530 Subject: [PATCH 1/2] added field descriptions for packing slip --- .../doctype/packing_slip/packing_slip.js | 8 ++++++++ .../doctype/packing_slip/packing_slip.txt | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.js b/erpnext/stock/doctype/packing_slip/packing_slip.js index aea22fff68..d3cf9be030 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.js +++ b/erpnext/stock/doctype/packing_slip/packing_slip.js @@ -52,6 +52,14 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { } } +cur_frm.cscript.refresh = function(doc, dt, dn) { + if(!doc.amended_from) { + hide_field('misc_details'); + } else { + unhide_field('misc_details'); + } +} + cur_frm.cscript.update_item_details = function(doc) { $c_obj(make_doclist(doc.doctype, doc.name), 'update_item_details', '', function(r, rt) { diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.txt b/erpnext/stock/doctype/packing_slip/packing_slip.txt index e3801222b7..625aa0d906 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.txt +++ b/erpnext/stock/doctype/packing_slip/packing_slip.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:34', + 'creation': '2012-05-15 12:15:08', 'docstatus': 0, - 'modified': '2012-03-27 14:45:49', + 'modified': '2012-06-29 12:22:43', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -15,6 +15,7 @@ '_last_update': u'1328091392', 'autoname': u'PS.#######', 'colour': u'White:FFF', + 'description': u'Generate packing slips for packages to be delivered. Used to notify case/package number, package contents and its weight.', 'doctype': 'DocType', 'document_type': u'Transaction', 'is_submittable': 1, @@ -26,7 +27,7 @@ 'section_style': u'Simple', 'show_in_menu': 0, 'subject': u'[%(delivery_note)s] Case Nos: %(from_case_no)s - %(to_case_no)s | Net Weight: %(net_weight_pkg)s %(net_weight_uom)s | Gross Weight: %(gross_weight_pkg)s %(gross_weight_uom)s', - 'version': 40 + 'version': 1 }, # These values are common for all DocField @@ -140,6 +141,8 @@ # DocField { + 'colour': u'White:FFF', + 'description': u'Indicates that the package is a part of this delivery', 'doctype': u'DocField', 'fieldname': u'delivery_note', 'fieldtype': u'Link', @@ -190,10 +193,11 @@ # DocField { 'colour': u'White:FFF', + 'description': u'Identification of the package for the delivery (for print)', 'doctype': u'DocField', 'fieldname': u'from_case_no', 'fieldtype': u'Data', - 'label': u'From Case No.', + 'label': u'From Package No.', 'no_copy': 1, 'permlevel': 0, 'reqd': 1, @@ -211,10 +215,11 @@ # DocField { 'colour': u'White:FFF', + 'description': u'If more than one package of the same type (for print)', 'doctype': u'DocField', 'fieldname': u'to_case_no', 'fieldtype': u'Data', - 'label': u'To Case No.', + 'label': u'To Package No.', 'no_copy': 1, 'permlevel': 0, 'width': u'50px' @@ -251,6 +256,7 @@ # DocField { 'colour': u'White:FFF', + 'description': u'The net weight of this package. (calculated automatically as sum of net weight of items)', 'doctype': u'DocField', 'fieldname': u'net_weight_pkg', 'fieldtype': u'Currency', @@ -281,6 +287,7 @@ # DocField { 'colour': u'White:FFF', + 'description': u'The gross weight of the package. Usually net weight + packaging material weight.', 'doctype': u'DocField', 'fieldname': u'gross_weight_pkg', 'fieldtype': u'Currency', @@ -303,7 +310,7 @@ # DocField { - 'depends_on': u'eval:doc.amended_from', + 'colour': u'White:FFF', 'doctype': u'DocField', 'fieldname': u'misc_details', 'fieldtype': u'Section Break', From 08faf5bb7fdc530f6e5405d2adcec53728ea9ad3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 29 Jun 2012 12:24:35 +0530 Subject: [PATCH 2/2] added field descriptions for packing slip --- erpnext/stock/doctype/packing_slip/packing_slip.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.txt b/erpnext/stock/doctype/packing_slip/packing_slip.txt index 625aa0d906..c610dadd8a 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.txt +++ b/erpnext/stock/doctype/packing_slip/packing_slip.txt @@ -5,7 +5,7 @@ { 'creation': '2012-05-15 12:15:08', 'docstatus': 0, - 'modified': '2012-06-29 12:22:43', + 'modified': '2012-06-29 12:24:16', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -15,7 +15,7 @@ '_last_update': u'1328091392', 'autoname': u'PS.#######', 'colour': u'White:FFF', - 'description': u'Generate packing slips for packages to be delivered. Used to notify case/package number, package contents and its weight.', + 'description': u'Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.', 'doctype': 'DocType', 'document_type': u'Transaction', 'is_submittable': 1, @@ -287,7 +287,7 @@ # DocField { 'colour': u'White:FFF', - 'description': u'The gross weight of the package. Usually net weight + packaging material weight.', + 'description': u'The gross weight of the package. Usually net weight + packaging material weight. (for print)', 'doctype': u'DocField', 'fieldname': u'gross_weight_pkg', 'fieldtype': u'Currency',