Merge pull request #2488 from neilLasrado/bom-currency-fix
Bom Currency Fix
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/ae_uae_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/ae_uae_chart_template_standard.json
index 60ee04f..3b0bf94 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/ae_uae_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/ae_uae_chart_template_standard.json
@@ -83,13 +83,8 @@
"Items Delivered to Customs on temprary Base": {}
},
"Stock in Hand": {
- "Customs Duty": {},
- "Freight and Transport": {},
- "Shipment Insurance": {},
- "Shipment Other Charges": {},
- "Shipments Documentation Charges": {},
- "Supplier Cost": {},
- "account_type": "Stock"
+ "account_type": "Stock",
+ "group_or_ledger": "Group"
}
},
"Perliminary and Preoperating Expenses": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_schedule6.json b/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_schedule6.json
index 59b384e..b450cad 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_schedule6.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_schedule6.json
@@ -33,14 +33,8 @@
"Investment In Preference Shares": {}
},
"Inventories": {
- "Finished Goods": {},
- "Goods-In-Transit": {},
- "Loose Tools": {},
- "Other With Job Worker": {},
- "Raw Material": {},
- "Stock-In-Trade": {},
- "Stores And Spares": {},
- "Work-In-Progress": {}
+ "account_type": "Stock",
+ "group_or_ledger": "Group"
},
"Other Current Assets": {
"Duties and Taxes": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
index 4cf51cb..3d1c84c 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/in_indian_chart_template_standard.json
@@ -29,8 +29,8 @@
"Deposit Account": {}
},
"Inventories": {
- "Inventories": {},
- "account_type": "Warehouse"
+ "account_type": "Stock",
+ "group_or_ledger": "Group"
},
"Other Current Assets": {
"Prepaid Insurance": {}
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 1fa295e..9372d7b 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -183,7 +183,7 @@
],
"icon": "icon-user",
"idx": 1,
- "modified": "2014-09-10 17:53:09.286715",
+ "modified": "2014-09-11 17:53:09.286715",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 39f253b..54f2044 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -54,7 +54,7 @@
"erpnext.controllers.recurring_document.create_recurring_documents",
"erpnext.stock.reorder_item.reorder_item",
"erpnext.setup.doctype.email_digest.email_digest.send",
- "erpnext.support.doctype.support_ticket.support_ticket.auto_close_tickets",
+ "erpnext.support.doctype.issue.issue.auto_close_tickets",
"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year"
],
"daily_long": [
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index c7b4059..8aca9a6 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -58,7 +58,6 @@
frappe.set_user("test_employee@example.com")
self.assertTrue(salary_slip_test_employee.has_permission("read"))
- self.assertFalse(salary_slip_test_employee_2.has_permission("read"))
def make_employee(self, user):
if not frappe.db.get_value("User", user):
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index cec4dda..f716723 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -1,6 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext");
+frappe.provide("erpnext.utils");
$.extend(erpnext, {
get_currency: function(company) {
@@ -100,7 +101,8 @@
},
});
-erpnext.utils = {
+
+$.extend(erpnext.utils, {
render_address_and_contact: function(frm) {
// render address
$(frm.fields_dict['address_html'].wrapper)
@@ -121,4 +123,4 @@
);
}
}
-}
+})