commit a3f490890da12a5872c178d5717ae37cc2eee41f
author Nabin Hait <nabinhait@gmail.com> Mon Oct 26 13:02:59 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Oct 26 13:02:59 2015 +0530
tree 97825ff28449c8ff7aa1bb2e6fd1d3161fbddc23
parent 8e3ea32d6dd1e21ac896ccd6a8927482e5b70361
parent abc0b64b681efb37f4bf4cffbebe4e332fcfab09

Merge pull request #4227 from nabinhait/dn_to_wh

[fix] Label changed for Target Warehouse in Delivery Note

erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index ceefaf5..96e2660 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -735,7 +735,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Warehouse", 
+   "label": "From Warehouse", 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -755,13 +755,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
+   "description": "", 
    "fieldname": "target_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Target Warehouse", 
+   "label": "To Warehouse (Optional)", 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -831,7 +833,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Available Qty at Warehouse", 
+   "label": "Available Qty at From Warehouse", 
    "no_copy": 1, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Currency", 
@@ -857,7 +859,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Available Batch Qty at Warehouse", 
+   "label": "Available Batch Qty at From Warehouse", 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -1160,7 +1162,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:50.887288", 
+ "modified": "2015-10-26 02:19:18.053222", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 

erpnext/stock/doctype/packed_item/packed_item.json

diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index bfd78bf..88e11d7 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -155,7 +155,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Warehouse", 
+   "label": "From Warehouse", 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -179,7 +179,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Target Warehouse", 
+   "label": "To Warehouse (Optional)", 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -511,7 +511,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-12 07:38:58.896987", 
+ "modified": "2015-10-26 02:25:47.718911", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packed Item",