[cleanup] rename discount and reserver warehouse #3325

2015-05-27 12:19:48 +05:30 · 2015-05-27 12:19:48 +05:30 · 69fb13f229
commit 69fb13f229
parent dcbc4d1a46
17 changed files with 4099 additions and 4091 deletions
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@ -217,7 +217,7 @@
   "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Float", 
-   "label": "Discount Percentage", 
+   "label": "Discount on Price List Rate (%)", 
   "permlevel": 0
  }, 
  {
@ -245,7 +245,7 @@
 "icon": "icon-gift", 
 "idx": 1, 
 "istable": 0, 
- "modified": "2015-02-26 04:26:13.240166", 
+ "modified": "2015-05-27 02:47:16.777466", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Pricing Rule", 
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@ -428,7 +428,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On", 
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": "", 
@ -443,7 +443,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount", 
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "precision": "", 
@ -939,7 +939,7 @@
 "icon": "icon-file-text", 
 "idx": 1, 
 "is_submittable": 1, 
- "modified": "2015-05-21 05:34:42.436924", 
+ "modified": "2015-05-27 02:48:01.662340", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice", 
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@ -105,10 +105,11 @@
   "read_only": 0
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount %", 
+   "label": "Discount on Price List Rate (%)", 
   "permlevel": 0, 
   "print_hide": 0, 
   "read_only": 0
@ -451,7 +452,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-02-23 15:35:32.895515", 
+ "modified": "2015-05-27 02:47:16.341373", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice Item", 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@ -480,7 +480,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On", 
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": "", 
@ -494,7 +494,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount", 
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1
@ -1243,7 +1243,7 @@
 "icon": "icon-file-text", 
 "idx": 1, 
 "is_submittable": 1, 
- "modified": "2015-05-21 05:34:21.539823", 
+ "modified": "2015-05-27 02:48:02.897865", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice", 
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@ -98,10 +98,11 @@
   "reqd": 0
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount (%)", 
+   "label": "Discount on Price List Rate (%)", 
   "oldfieldname": "adj_rate", 
   "oldfieldtype": "Float", 
   "permlevel": 0, 
@ -504,7 +505,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-03-23 14:56:45.641026", 
+ "modified": "2015-05-27 02:47:15.645114", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Item", 
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@ -434,7 +434,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On",
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": ""
@ -448,7 +448,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount",
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "precision": "", 
@ -873,7 +873,7 @@
 "icon": "icon-file-text", 
 "idx": 1, 
 "is_submittable": 1, 
- "modified": "2015-04-28 15:27:28.755819",
+ "modified": "2015-05-27 02:48:02.452899", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order", 
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@ -192,10 +192,11 @@
   "read_only": 0
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount %", 
+   "label": "Discount on Price List Rate (%)", 
   "permlevel": 0, 
   "print_hide": 0, 
   "read_only": 0
@ -537,7 +538,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-05-14 14:54:16.899713", 
+ "modified": "2015-05-27 02:47:16.553472", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order Item", 
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@ -415,7 +415,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On",
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": "", 
@ -430,7 +430,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount",
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "precision": "", 
@ -660,7 +660,7 @@
 "icon": "icon-shopping-cart", 
 "idx": 1, 
 "is_submittable": 1, 
- "modified": "2015-03-23 14:47:07.225609",
+ "modified": "2015-05-27 02:48:02.098540", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier Quotation", 
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@ -121,10 +121,11 @@
   "read_only": 0
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount %", 
+   "label": "Discount on Price List Rate (%)", 
   "permlevel": 0, 
   "print_hide": 0, 
   "read_only": 0
@ -412,7 +413,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-05-14 14:54:36.253819", 
+ "modified": "2015-05-27 02:47:15.853886", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier Quotation Item", 
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@ -465,7 +465,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On",
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": "", 
@ -480,7 +480,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount",
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1
@ -858,7 +858,7 @@
 "idx": 1, 
 "is_submittable": 1, 
 "max_attachments": 1, 
- "modified": "2015-03-23 14:45:49.596357",
+ "modified": "2015-05-27 02:48:00.388847", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Quotation", 
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@ -121,10 +121,11 @@
   "width": "100px"
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount (%)", 
+   "label": "Discount on Price List Rate (%)", 
   "oldfieldname": "adj_rate", 
   "oldfieldtype": "Float", 
   "permlevel": 0, 
@ -389,7 +390,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-05-14 14:51:21.557189", 
+ "modified": "2015-05-27 02:47:15.474119", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Quotation Item", 
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@ -471,7 +471,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On",
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": "", 
@ -485,7 +485,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount",
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1
@ -1080,7 +1080,7 @@
 "idx": 1, 
 "is_submittable": 1, 
 "issingle": 0, 
- "modified": "2015-04-28 15:27:40.852417",
+ "modified": "2015-05-27 02:48:01.160307", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Sales Order", 
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@ -127,10 +127,11 @@
   "width": "70px"
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount(%)", 
+   "label": "Discount on Price List Rate (%)", 
   "oldfieldname": "adj_rate", 
   "oldfieldtype": "Float", 
   "permlevel": 0, 
@ -310,7 +311,7 @@
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "in_list_view": 1, 
-   "label": "Reserved Warehouse", 
+   "label": "Delivery Warehouse", 
   "no_copy": 0, 
   "oldfieldname": "reserved_warehouse", 
   "oldfieldtype": "Link", 
@ -497,7 +498,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-05-14 14:51:46.978580", 
+ "modified": "2015-05-27 02:47:15.134435", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Sales Order Item", 
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@ -496,7 +496,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On",
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": ""
@ -509,7 +509,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount",
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1
@ -1070,7 +1070,7 @@
 "idx": 1, 
 "in_create": 0, 
 "is_submittable": 1, 
- "modified": "2015-04-24 00:12:12.119033",
+ "modified": "2015-05-27 02:47:59.778147", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Delivery Note", 
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@ -134,10 +134,11 @@
   "width": "100px"
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Float", 
   "in_list_view": 1, 
-   "label": "Discount (%)", 
+   "label": "Discount on Price List Rate (%)", 
   "oldfieldname": "adj_rate", 
   "oldfieldtype": "Float", 
   "permlevel": 0, 
@ -522,7 +523,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-05-14 14:52:20.610748", 
+ "modified": "2015-05-27 02:47:16.946934", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Delivery Note Item", 
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@ -418,7 +418,7 @@
   "default": "Grand Total", 
   "fieldname": "apply_discount_on", 
   "fieldtype": "Select", 
-   "label": "Apply Discount On", 
+   "label": "Apply Additional Discount On", 
   "options": "\nGrand Total\nNet Total", 
   "permlevel": 0, 
   "precision": "", 
@ -433,7 +433,7 @@
  {
   "fieldname": "discount_amount", 
   "fieldtype": "Currency", 
-   "label": "Discount Amount", 
+   "label": "Additional Discount Amount", 
   "options": "currency", 
   "permlevel": 0, 
   "precision": "", 
@ -854,7 +854,7 @@
 "icon": "icon-truck", 
 "idx": 1, 
 "is_submittable": 1, 
- "modified": "2015-05-18 05:06:04.723299", 
+ "modified": "2015-05-27 02:48:00.763945", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Purchase Receipt", 
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@ -191,10 +191,11 @@
   "read_only": 0
  }, 
  {
+   "depends_on": "price_list_rate", 
   "fieldname": "discount_percentage", 
   "fieldtype": "Percent", 
   "in_list_view": 1, 
-   "label": "Discount  %", 
+   "label": "Discount on Price List Rate (%)", 
   "permlevel": 0, 
   "print_hide": 1, 
   "read_only": 0
@ -641,7 +642,7 @@
 ], 
 "idx": 1, 
 "istable": 1, 
- "modified": "2015-05-14 14:54:02.462587", 
+ "modified": "2015-05-27 02:47:16.086625", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Purchase Receipt Item",