Merge pull request #2340 from neilLasrado/fixstockentryerror
Fix error in get_default_cost_center() function
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;
diff --git a/erpnext/templates/pages/address.html b/erpnext/templates/pages/address.html
index 95ddb76..0e221ac 100644
--- a/erpnext/templates/pages/address.html
+++ b/erpnext/templates/pages/address.html
@@ -92,7 +92,7 @@
frappe.call({
btn: $(this),
type: "POST",
- method: "shopping_cart.templates.pages.address.save_address",
+ method: "erpnext.templates.pages.address.save_address",
args: { fields: fields, address_fieldname: get_url_arg("address_fieldname") },
error_msg: "#address-error",
callback: function(r) {
diff --git a/erpnext/templates/pages/addresses.html b/erpnext/templates/pages/addresses.html
index 58a9798..5cb56c0 100644
--- a/erpnext/templates/pages/addresses.html
+++ b/erpnext/templates/pages/addresses.html
@@ -19,7 +19,7 @@
;(function() {
var fetch_addresses = function() {
frappe.call({
- method: "shopping_cart.templates.pages.addresses.get_addresses",
+ method: "erpnext.templates.pages.addresses.get_addresses",
callback: function(r) {
$("#address-list .progress").remove();
var $list = $("#address-list");
diff --git a/erpnext/templates/pages/invoice.py b/erpnext/templates/pages/invoice.py
index 5b55007..8109109 100644
--- a/erpnext/templates/pages/invoice.py
+++ b/erpnext/templates/pages/invoice.py
@@ -5,7 +5,7 @@
import frappe
from frappe import _
from frappe.utils import flt, fmt_money
-from shopping_cart.templates.utils import get_transaction_context
+from erpnext.templates.utils import get_transaction_context
no_cache = 1
no_sitemap = 1
diff --git a/erpnext/templates/pages/invoices.py b/erpnext/templates/pages/invoices.py
index 98c5140..87aff21 100644
--- a/erpnext/templates/pages/invoices.py
+++ b/erpnext/templates/pages/invoices.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from shopping_cart.templates.utils import get_currency_context
+from erpnext.templates.utils import get_currency_context
no_cache = 1
no_sitemap = 1
@@ -12,7 +12,7 @@
invoices_context = get_currency_context()
invoices_context.update({
"title": "Invoices",
- "method": "shopping_cart.templates.pages.invoices.get_invoices",
+ "method": "erpnext.templates.pages.invoices.get_invoices",
"icon": "icon-file-text",
"empty_list_message": "No Invoices Found",
"page": "invoice"
@@ -21,8 +21,8 @@
@frappe.whitelist()
def get_invoices(start=0):
- from shopping_cart.templates.utils import get_transaction_list
- from shopping_cart.templates.pages.invoice import modify_status
+ from erpnext.templates.utils import get_transaction_list
+ from erpnext.templates.pages.invoice import modify_status
invoices = get_transaction_list("Sales Invoice", start, ["outstanding_amount"])
for d in invoices:
modify_status(d)
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index 832a60e..527caba 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from shopping_cart.templates.utils import get_transaction_context
+from erpnext.templates.utils import get_transaction_context
no_cache = 1
no_sitemap = 1
diff --git a/erpnext/templates/pages/orders.py b/erpnext/templates/pages/orders.py
index c443b6a..ebf75b3 100644
--- a/erpnext/templates/pages/orders.py
+++ b/erpnext/templates/pages/orders.py
@@ -3,8 +3,8 @@
from __future__ import unicode_literals
import frappe
-from shopping_cart.templates.utils import get_currency_context, get_transaction_list
-from shopping_cart.templates.pages.order import modify_status
+from erpnext.templates.utils import get_currency_context, get_transaction_list
+from erpnext.templates.pages.order import modify_status
no_cache = 1
no_sitemap = 1
@@ -13,7 +13,7 @@
orders_context = get_currency_context()
orders_context.update({
"title": "My Orders",
- "method": "shopping_cart.templates.pages.orders.get_orders",
+ "method": "erpnext.templates.pages.orders.get_orders",
"icon": "icon-list",
"empty_list_message": "No Orders Yet",
"page": "order",
diff --git a/erpnext/templates/pages/shipment.py b/erpnext/templates/pages/shipment.py
index ba98e1d..a8047f5 100644
--- a/erpnext/templates/pages/shipment.py
+++ b/erpnext/templates/pages/shipment.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from shopping_cart.templates.utils import get_transaction_context
+from erpnext.templates.utils import get_transaction_context
no_cache = 1
no_sitemap = 1
diff --git a/erpnext/templates/pages/shipments.py b/erpnext/templates/pages/shipments.py
index fe28c7e..350b3e4 100644
--- a/erpnext/templates/pages/shipments.py
+++ b/erpnext/templates/pages/shipments.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from shopping_cart.templates.utils import get_currency_context
+from erpnext.templates.utils import get_currency_context
no_cache = 1
no_sitemap = 1
@@ -12,7 +12,7 @@
shipments_context = get_currency_context()
shipments_context.update({
"title": "Shipments",
- "method": "shopping_cart.templates.pages.shipments.get_shipments",
+ "method": "erpnext.templates.pages.shipments.get_shipments",
"icon": "icon-truck",
"empty_list_message": "No Shipments Found",
"page": "shipment"
@@ -21,5 +21,5 @@
@frappe.whitelist()
def get_shipments(start=0):
- from shopping_cart.templates.utils import get_transaction_list
+ from erpnext.templates.utils import get_transaction_list
return get_transaction_list("Delivery Note", start)
diff --git a/erpnext/templates/pages/ticket.html b/erpnext/templates/pages/ticket.html
index 39c69df..cff019c 100644
--- a/erpnext/templates/pages/ticket.html
+++ b/erpnext/templates/pages/ticket.html
@@ -90,7 +90,7 @@
} else {
frappe.call({
type: "POST",
- method: "shopping_cart.templates.pages.ticket.add_reply",
+ method: "erpnext.templates.pages.ticket.add_reply",
btn: this,
args: { ticket: "{{ doc.name }}", message: reply },
callback: function(r) {
diff --git a/erpnext/templates/pages/tickets.html b/erpnext/templates/pages/tickets.html
index 6c03313..40cd80e 100644
--- a/erpnext/templates/pages/tickets.html
+++ b/erpnext/templates/pages/tickets.html
@@ -65,7 +65,7 @@
} else {
frappe.call({
type: "POST",
- method: "shopping_cart.templates.pages.tickets.make_new_ticket",
+ method: "erpnext.templates.pages.tickets.make_new_ticket",
btn: this,
args: { subject: subject, message: message },
callback: function(r) {
diff --git a/erpnext/templates/pages/tickets.py b/erpnext/templates/pages/tickets.py
index 158173f..539cde6 100644
--- a/erpnext/templates/pages/tickets.py
+++ b/erpnext/templates/pages/tickets.py
@@ -11,7 +11,7 @@
def get_context(context):
return {
"title": "My Tickets",
- "method": "shopping_cart.templates.pages.tickets.get_tickets",
+ "method": "erpnext.templates.pages.tickets.get_tickets",
"icon": "icon-ticket",
"empty_list_message": "No Tickets Raised",
"page": "ticket"
diff --git a/erpnext/templates/pages/user.html b/erpnext/templates/pages/user.html
index b4a1a39..1d1d0b3 100644
--- a/erpnext/templates/pages/user.html
+++ b/erpnext/templates/pages/user.html
@@ -34,7 +34,7 @@
$("#fullname").val(getCookie("full_name") || "");
$("#update_user").click(function() {
frappe.call({
- method: "shopping_cart.templates.pages.user.update_user",
+ method: "erpnext.templates.pages.user.update_user",
type: "POST",
args: {
fullname: $("#fullname").val(),