Minor fixes
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index b3e4f47..2c90115 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -190,27 +190,6 @@
"read_only": 1
},
{
- "fieldname": "shipping_address_name",
- "fieldtype": "Link",
- "hidden": 1,
- "in_filter": 1,
- "label": "Shipping Address Name",
- "options": "Address",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1
- },
- {
- "fieldname": "shipping_address",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Shipping Address",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "read_only": 1
- },
- {
"fieldname": "currency_section",
"fieldtype": "Section Break",
"label": "Currency and Price List",
@@ -1234,7 +1213,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-10-10 16:54:22.284284",
+ "modified": "2014-10-22 16:54:22.284284",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.js b/erpnext/setup/doctype/global_defaults/global_defaults.js
index 546fbd4..acc1c8e 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.js
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.js
@@ -7,7 +7,7 @@
this.timezone = doc.time_zone;
frappe.call({
- method: "frappe.country_info.get_country_timezone_info",
+ method: "frappe.geo.country_info.get_country_timezone_info",
callback: function(data) {
frappe.country_info = data.message.country_info;
frappe.all_timezones = data.message.all_timezones;
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index c02b5bf..44f6297 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -139,7 +139,7 @@
help: __('Select your home country and check the timezone and currency.'),
onload: function(slide, form) {
frappe.call({
- method:"frappe.country_info.get_country_timezone_info",
+ method:"frappe.geo.country_info.get_country_timezone_info",
callback: function(data) {
frappe.country_info = data.message.country_info;
frappe.all_timezones = data.message.all_timezones;