Merge pull request #1771 from anandpdoshi/hotfix
Fix in HR patch
diff --git a/MANIFEST.in b/MANIFEST.in
index 53477f2..3e467e5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,4 +16,5 @@
recursive-include erpnext *.png
recursive-include erpnext *.py
recursive-include erpnext *.svg
+recursive-include erpnext/public *
recursive-exclude * *.pyc
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 7f7d2bc..1856386 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -186,7 +186,7 @@
"icon": "icon-list",
"idx": 1,
"in_create": 1,
- "modified": "2014-05-27 03:49:10.998572",
+ "modified": "2014-06-09 01:51:29.340077",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GL Entry",
@@ -197,6 +197,7 @@
"apply_user_permissions": 1,
"create": 0,
"email": 1,
+ "export": 1,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -209,6 +210,7 @@
"amend": 0,
"create": 0,
"email": 1,
+ "export": 1,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -216,17 +218,6 @@
"role": "Accounts Manager",
"submit": 0,
"write": 0
- },
- {
- "create": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "submit": 0,
- "write": 0
}
],
"search_fields": "voucher_no,account,posting_date,against_voucher",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index bd89582..fba0554 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -52,4 +52,7 @@
# WATCHOUT: This patch reload's documents
erpnext.patches.v4_0.reset_permissions_for_masters
+
erpnext.patches.v4_0.update_tax_amount_after_discount
+execute:frappe.reset_perms("GL Entry") #2014-06-09
+execute:frappe.reset_perms("Stock Ledger Entry") #2014-06-09
diff --git a/erpnext/patches/v4_0/fix_case_of_hr_module_def.py b/erpnext/patches/v4_0/fix_case_of_hr_module_def.py
index 117c2ac..73b4e7f 100644
--- a/erpnext/patches/v4_0/fix_case_of_hr_module_def.py
+++ b/erpnext/patches/v4_0/fix_case_of_hr_module_def.py
@@ -10,3 +10,4 @@
frappe.db.set_value("Module Def", "HR", "module_name", "HR")
frappe.clear_cache()
+ frappe.setup_module_map()
diff --git a/erpnext/patches/v4_0/new_address_template.py b/erpnext/patches/v4_0/new_address_template.py
index d0f5ab0..7a5dabc 100644
--- a/erpnext/patches/v4_0/new_address_template.py
+++ b/erpnext/patches/v4_0/new_address_template.py
@@ -5,7 +5,8 @@
if not frappe.db.sql("select name from `tabAddress Template`"):
try:
d = frappe.new_doc("Address Template")
- d.update({"country":frappe.db.get_default("country")})
+ d.update({"country":frappe.db.get_default("country") or
+ frappe.db.get_value("Global Defaults", "Global Defaults", "country")})
d.insert()
except:
print frappe.get_traceback()
diff --git a/erpnext/setup/doctype/item_group/item_group.js b/erpnext/setup/doctype/item_group/item_group.js
index 43a7117..2aaf558 100644
--- a/erpnext/setup/doctype/item_group/item_group.js
+++ b/erpnext/setup/doctype/item_group/item_group.js
@@ -11,7 +11,7 @@
if(!doc.__islocal && doc.show_in_website) {
cur_frm.appframe.add_button("View In Website", function() {
- window.open(doc.page_name);
+ window.open(doc.__onload.website_route);
}, "icon-globe");
}
}
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 319d67d..2b499c1 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -18,7 +18,7 @@
if(!doc.__islocal && doc.show_in_website) {
cur_frm.appframe.add_button("View In Website", function() {
- window.open(doc.page_name);
+ window.open(doc.__onload.website_route);
}, "icon-globe");
}
cur_frm.cscript.edit_prices_button();
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index c9e3b77..cdddabe 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -264,7 +264,7 @@
"icon": "icon-list",
"idx": 1,
"in_create": 1,
- "modified": "2014-05-27 03:49:19.837686",
+ "modified": "2014-06-09 01:51:44.014466",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
@@ -274,6 +274,7 @@
"amend": 0,
"apply_user_permissions": 1,
"create": 0,
+ "export": 1,
"permlevel": 0,
"read": 1,
"report": 1,
@@ -282,6 +283,7 @@
"write": 0
},
{
+ "export": 1,
"permlevel": 0,
"read": 1,
"report": 1,