[new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 02a9842..ea632f1 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -151,6 +151,28 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "fieldname": "exchange_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Exchange Rate",
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "2_add_edit_gl_entries",
"fieldtype": "Section Break",
"hidden": 0,
@@ -1002,7 +1024,7 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
- "modified": "2015-08-27 03:19:18.634225",
+ "modified": "2015-08-27 16:07:33.265318",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Entry",
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index 718d96a..fa7fcf9 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -10,6 +10,8 @@
"fields": [
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "account",
"fieldtype": "Link",
"hidden": 0,
@@ -34,6 +36,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "currency",
"fieldtype": "Link",
"hidden": 1,
@@ -41,11 +45,11 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Currency",
- "no_copy": 0,
+ "no_copy": 1,
"options": "Currency",
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -55,6 +59,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "balance",
"fieldtype": "Currency",
"hidden": 0,
@@ -77,6 +83,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "balance_in_account_currency",
"fieldtype": "Currency",
"hidden": 1,
@@ -84,11 +92,11 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Balance in Account Currency",
- "no_copy": 0,
+ "no_copy": 1,
"options": "currency",
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -98,6 +106,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"default": ":Company",
"description": "If Income or Expense",
"fieldname": "cost_center",
@@ -124,6 +134,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "col_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -142,6 +154,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "party_type",
"fieldtype": "Link",
"hidden": 0,
@@ -162,6 +176,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "party",
"fieldtype": "Dynamic Link",
"hidden": 0,
@@ -182,6 +198,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "party_balance",
"fieldtype": "Currency",
"hidden": 0,
@@ -203,6 +221,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "party_balance_in_account_currency",
"fieldtype": "Currency",
"hidden": 1,
@@ -210,11 +230,11 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Party Balance in Account Currency",
- "no_copy": 0,
+ "no_copy": 1,
"options": "currency",
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -224,6 +244,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "sec_break1",
"fieldtype": "Section Break",
"hidden": 0,
@@ -243,6 +265,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "debit_in_account_currency",
"fieldtype": "Currency",
"hidden": 1,
@@ -264,6 +288,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "debit",
"fieldtype": "Currency",
"hidden": 0,
@@ -271,12 +297,12 @@
"in_filter": 0,
"in_list_view": 1,
"label": "Debit in Company Currency",
- "no_copy": 0,
+ "no_copy": 1,
"oldfieldname": "debit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -286,6 +312,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "col_break2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -304,6 +332,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "credit_in_account_currency",
"fieldtype": "Currency",
"hidden": 1,
@@ -325,6 +355,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "credit",
"fieldtype": "Currency",
"hidden": 0,
@@ -332,12 +364,12 @@
"in_filter": 0,
"in_list_view": 1,
"label": "Credit in Company Currency",
- "no_copy": 0,
+ "no_copy": 1,
"oldfieldname": "credit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -347,6 +379,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "reference",
"fieldtype": "Section Break",
"hidden": 0,
@@ -366,6 +400,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "reference_type",
"fieldtype": "Select",
"hidden": 0,
@@ -387,6 +423,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "reference_name",
"fieldtype": "Dynamic Link",
"hidden": 0,
@@ -408,6 +446,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "col_break3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -426,6 +466,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "is_advance",
"fieldtype": "Select",
"hidden": 0,
@@ -448,6 +490,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "against_account",
"fieldtype": "Text",
"hidden": 1,
@@ -476,7 +520,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
- "modified": "2015-08-27 12:52:20.914258",
+ "modified": "2015-08-27 16:09:43.872157",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Entry Account",