Merge pull request #3618 from neilLasrado/naming
Validation added in Production Order
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 70d5f4a..809e352 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -605,7 +605,7 @@
"label": "Total Advance",
"oldfieldname": "total_advance",
"oldfieldtype": "Currency",
- "options": "",
+ "options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
@@ -618,7 +618,7 @@
"no_copy": 1,
"oldfieldname": "outstanding_amount",
"oldfieldtype": "Currency",
- "options": "currency",
+ "options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
@@ -671,7 +671,7 @@
"no_copy": 1,
"oldfieldname": "paid_amount",
"oldfieldtype": "Currency",
- "options": "currency",
+ "options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 0
@@ -711,7 +711,7 @@
"fieldtype": "Currency",
"label": "Write Off Amount",
"no_copy": 1,
- "options": "currency",
+ "options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1,
"read_only": 0
@@ -1253,7 +1253,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-07-03 03:25:40.519956",
+ "modified": "2015-07-09 17:33:28.583808",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index c71ed60..d2296ca 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -75,7 +75,7 @@
"permlevel": 0
},
{
- "depends_on": "eval:!doc.supplier && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "customer",
"fieldtype": "Link",
"label": "Customer",
@@ -86,7 +86,7 @@
"print_hide": 0
},
{
- "depends_on": "eval:!doc.supplier && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "customer_name",
"fieldtype": "Data",
"in_list_view": 0,
@@ -102,7 +102,7 @@
"width": "50%"
},
{
- "depends_on": "eval:!doc.customer && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "supplier",
"fieldtype": "Link",
"label": "Supplier",
@@ -111,7 +111,7 @@
},
{
"allow_on_submit": 0,
- "depends_on": "eval:!doc.customer && !doc.sales_partner",
+ "depends_on": "",
"fieldname": "supplier_name",
"fieldtype": "Data",
"in_list_view": 0,
@@ -120,7 +120,7 @@
"read_only": 1
},
{
- "depends_on": "eval:!doc.customer && !doc.supplier",
+ "depends_on": "",
"fieldname": "sales_partner",
"fieldtype": "Link",
"label": "Sales Partner",
@@ -177,7 +177,7 @@
"idx": 1,
"in_create": 0,
"in_dialog": 0,
- "modified": "2015-03-18 07:06:43.906702",
+ "modified": "2015-07-09 08:15:29.026935",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Contact",