Fields renamed in schema
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 1fa36f3..5bb3f5a 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2014-02-07 16:39:12",
+ "modified": "2014-02-10 17:29:13",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -120,7 +120,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -130,7 +130,7 @@
},
{
"doctype": "DocField",
- "fieldname": "discount_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount %",
@@ -144,7 +144,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -159,7 +159,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate ",
@@ -172,7 +172,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -189,7 +189,7 @@
},
{
"doctype": "DocField",
- "fieldname": "rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Rate (Company Currency)",
@@ -202,7 +202,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",
@@ -222,7 +222,7 @@
},
{
"doctype": "DocField",
- "fieldname": "expense_head",
+ "fieldname": "expense_account",
"fieldtype": "Link",
"in_list_view": 0,
"label": "Expense Head",
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 4d7ae0c..a6b6c6e 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
- "modified": "2013-12-31 18:27:41",
+ "modified": "2014-02-10 17:28:47",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -111,7 +111,7 @@
},
{
"doctype": "DocField",
- "fieldname": "ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -124,7 +124,7 @@
},
{
"doctype": "DocField",
- "fieldname": "adj_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount (%)",
@@ -149,7 +149,7 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -166,10 +166,10 @@
},
{
"doctype": "DocField",
- "fieldname": "export_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"in_list_view": 1,
- "label": "Basic Rate",
+ "label": "Rate",
"oldfieldname": "export_rate",
"oldfieldtype": "Currency",
"options": "currency",
@@ -178,7 +178,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -195,11 +195,11 @@
},
{
"doctype": "DocField",
- "fieldname": "basic_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_filter": 0,
"in_list_view": 0,
- "label": "Basic Rate (Company Currency)",
+ "label": "Rate (Company Currency)",
"oldfieldname": "basic_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -210,7 +210,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
index 8400973..334c74b 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:06",
"docstatus": 0,
- "modified": "2014-02-03 12:08:21",
+ "modified": "2014-02-10 17:29:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -178,7 +178,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -188,7 +188,7 @@
},
{
"doctype": "DocField",
- "fieldname": "discount_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount %",
@@ -202,7 +202,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -217,7 +217,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"hidden": 0,
"in_list_view": 1,
@@ -230,7 +230,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -246,7 +246,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Rate (Company Currency)",
@@ -261,7 +261,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index cffe811..30666bb 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2014-02-03 11:47:21",
+ "modified": "2014-02-10 17:28:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -106,7 +106,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -116,7 +116,7 @@
},
{
"doctype": "DocField",
- "fieldname": "discount_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount %",
@@ -145,7 +145,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -160,7 +160,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"hidden": 0,
"in_list_view": 1,
@@ -173,7 +173,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -189,7 +189,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Rate (Company Currency)",
@@ -204,7 +204,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",
diff --git a/erpnext/patches/4_0/fields_to_be_renamed.py b/erpnext/patches/4_0/fields_to_be_renamed.py
index 9adba72..d8d0ff8 100644
--- a/erpnext/patches/4_0/fields_to_be_renamed.py
+++ b/erpnext/patches/4_0/fields_to_be_renamed.py
@@ -93,6 +93,9 @@
["default_sales_cost_center", "selling_cost_center"],
["cost_center", "buying_cost_center"]
],
+ "Item Price": [
+ ["ref_rate", "price_list_rate"]
+ ]
}
from webnotes.model import rename_field
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.txt b/erpnext/selling/doctype/quotation_item/quotation_item.txt
index 531f005..735e539 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.txt
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-12-31 18:12:09",
+ "modified": "2014-02-10 17:28:02",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -113,7 +113,7 @@
},
{
"doctype": "DocField",
- "fieldname": "ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -128,7 +128,7 @@
},
{
"doctype": "DocField",
- "fieldname": "adj_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount (%)",
@@ -161,7 +161,7 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -180,7 +180,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"in_filter": 0,
"in_list_view": 1,
@@ -197,7 +197,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_filter": 0,
"in_list_view": 1,
@@ -219,7 +219,7 @@
},
{
"doctype": "DocField",
- "fieldname": "basic_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_filter": 0,
"in_list_view": 0,
@@ -236,7 +236,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_filter": 0,
"in_list_view": 0,
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.txt b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
index 38fb01c..b57ba99 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
- "modified": "2013-12-31 18:07:50",
+ "modified": "2014-02-10 17:28:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -107,7 +107,7 @@
},
{
"doctype": "DocField",
- "fieldname": "ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -122,7 +122,7 @@
},
{
"doctype": "DocField",
- "fieldname": "adj_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount(%)",
@@ -155,7 +155,7 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -174,7 +174,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate",
@@ -188,7 +188,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -208,7 +208,7 @@
},
{
"doctype": "DocField",
- "fieldname": "basic_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Basic Rate (Company Currency)",
@@ -223,7 +223,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",
@@ -246,7 +246,7 @@
},
{
"doctype": "DocField",
- "fieldname": "reserved_warehouse",
+ "fieldname": "warehouse",
"fieldtype": "Link",
"in_list_view": 0,
"label": "Reserved Warehouse",
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
index 7caa89d..5d04992 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-22 13:15:44",
"docstatus": 0,
- "modified": "2013-12-31 18:23:03",
+ "modified": "2014-02-10 17:28:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -114,7 +114,7 @@
},
{
"doctype": "DocField",
- "fieldname": "ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -130,7 +130,7 @@
},
{
"doctype": "DocField",
- "fieldname": "adj_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount (%)",
@@ -163,7 +163,7 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -182,7 +182,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate",
@@ -197,7 +197,7 @@
},
{
"doctype": "DocField",
- "fieldname": "export_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -217,7 +217,7 @@
},
{
"doctype": "DocField",
- "fieldname": "basic_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Rate (Company Currency)",
@@ -232,7 +232,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",
diff --git a/erpnext/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt
index 8da0d4c..db83103 100644
--- a/erpnext/stock/doctype/item/item.txt
+++ b/erpnext/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
- "modified": "2014-01-20 17:48:47",
+ "modified": "2014-02-10 17:27:49",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -438,7 +438,7 @@
"depends_on": "eval:doc.is_purchase_item==\"Yes\"",
"description": "Default Purchase Account in which cost of the item will be debited.",
"doctype": "DocField",
- "fieldname": "purchase_account",
+ "fieldname": "expense_account",
"fieldtype": "Link",
"label": "Default Expense Account",
"oldfieldname": "purchase_account",
@@ -450,9 +450,9 @@
"depends_on": "eval:doc.is_purchase_item==\"Yes\"",
"description": "Default Cost Center for tracking expense for this item.",
"doctype": "DocField",
- "fieldname": "cost_center",
+ "fieldname": "buying_cost_center",
"fieldtype": "Link",
- "label": "Default Cost Center",
+ "label": "Default Buying Cost Center",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
"options": "Cost Center",
@@ -576,7 +576,7 @@
{
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"doctype": "DocField",
- "fieldname": "default_income_account",
+ "fieldname": "income_account",
"fieldtype": "Link",
"label": "Default Income Account",
"options": "Account",
@@ -585,9 +585,9 @@
{
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"doctype": "DocField",
- "fieldname": "default_sales_cost_center",
+ "fieldname": "selling_cost_center",
"fieldtype": "Link",
- "label": "Cost Center",
+ "label": "Default Selling Cost Center",
"options": "Cost Center",
"read_only": 0
},
diff --git a/erpnext/stock/doctype/item_price/item_price.txt b/erpnext/stock/doctype/item_price/item_price.txt
index 338e759..8b18876 100644
--- a/erpnext/stock/doctype/item_price/item_price.txt
+++ b/erpnext/stock/doctype/item_price/item_price.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-02 16:29:48",
"docstatus": 0,
- "modified": "2014-01-20 17:48:50",
+ "modified": "2014-02-10 17:27:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,7 +28,7 @@
"permlevel": 0
},
{
- "cancel": 1,
+ "cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
@@ -101,7 +101,7 @@
},
{
"doctype": "DocField",
- "fieldname": "ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_filter": 1,
"in_list_view": 1,
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 393e1ed..efc5a17 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:10",
"docstatus": 0,
- "modified": "2014-02-03 12:18:24",
+ "modified": "2014-02-10 17:29:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -179,7 +179,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_ref_rate",
+ "fieldname": "price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate",
@@ -189,7 +189,7 @@
},
{
"doctype": "DocField",
- "fieldname": "discount_rate",
+ "fieldname": "discount_percentage",
"fieldtype": "Float",
"in_list_view": 0,
"label": "Discount %",
@@ -203,7 +203,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_ref_rate",
+ "fieldname": "base_price_list_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Price List Rate (Company Currency)",
@@ -218,7 +218,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_rate",
+ "fieldname": "rate",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate",
@@ -232,7 +232,7 @@
},
{
"doctype": "DocField",
- "fieldname": "import_amount",
+ "fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
@@ -248,7 +248,7 @@
},
{
"doctype": "DocField",
- "fieldname": "purchase_rate",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Rate (Company Currency)",
@@ -263,7 +263,7 @@
},
{
"doctype": "DocField",
- "fieldname": "amount",
+ "fieldname": "base_amount",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Amount (Company Currency)",