Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1771 from anandpdoshi/hotfix

Browse Source 
Fix in HR patch
This commit is contained in:
Nabin Hait 2014-06-09 15:33:14 +05:30
commit d9ff118b40
8 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -16,4 +16,5 @@ recursive-include erpnext *.md
recursive-include erpnext *.png recursive-include erpnext *.png
recursive-include erpnext *.py recursive-include erpnext *.py
recursive-include erpnext *.svg recursive-include erpnext *.svg
recursive-include erpnext/public *
recursive-exclude * *.pyc recursive-exclude * *.pyc

15
erpnext/accounts/doctype/gl_entry/gl_entry.json
View File

@ -186,7 +186,7 @@
"icon": "icon-list", "icon": "icon-list",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-05-27 03:49:10.998572", "modified": "2014-06-09 01:51:29.340077",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",
@ -197,6 +197,7 @@
"apply_user_permissions": 1, "apply_user_permissions": 1,
"create": 0, "create": 0,
"email": 1, "email": 1,
"export": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
@ -209,6 +210,7 @@
"amend": 0, "amend": 0,
"create": 0, "create": 0,
"email": 1, "email": 1,
"export": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
@ -216,17 +218,6 @@
"role": "Accounts Manager", "role": "Accounts Manager",
"submit": 0, "submit": 0,
"write": 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", "search_fields": "voucher_no,account,posting_date,against_voucher",

3
erpnext/patches.txt
View File

@ -52,4 +52,7 @@ erpnext.patches.v4_0.fix_address_template
# WATCHOUT: This patch reload's documents # WATCHOUT: This patch reload's documents
erpnext.patches.v4_0.reset_permissions_for_masters erpnext.patches.v4_0.reset_permissions_for_masters
erpnext.patches.v4_0.update_tax_amount_after_discount 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

1
erpnext/patches/v4_0/fix_case_of_hr_module_def.py
View File

@ -10,3 +10,4 @@ def execute():
frappe.db.set_value("Module Def", "HR", "module_name", "HR") frappe.db.set_value("Module Def", "HR", "module_name", "HR")
frappe.clear_cache() frappe.clear_cache()
frappe.setup_module_map()

3
erpnext/patches/v4_0/new_address_template.py
View File

@ -5,7 +5,8 @@ def execute():
if not frappe.db.sql("select name from `tabAddress Template`"): if not frappe.db.sql("select name from `tabAddress Template`"):
try: try:
d = frappe.new_doc("Address Template") 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() d.insert()
except: except:
print frappe.get_traceback() print frappe.get_traceback()

2
erpnext/setup/doctype/item_group/item_group.js
View File

@ -11,7 +11,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
if(!doc.__islocal && doc.show_in_website) { if(!doc.__islocal && doc.show_in_website) {
cur_frm.appframe.add_button("View In Website", function() { cur_frm.appframe.add_button("View In Website", function() {
window.open(doc.page_name); window.open(doc.__onload.website_route);
}, "icon-globe"); }, "icon-globe");
} }
} }

2
erpnext/stock/doctype/item/item.js
View File

@ -18,7 +18,7 @@ cur_frm.cscript.refresh = function(doc) {
if(!doc.__islocal && doc.show_in_website) { if(!doc.__islocal && doc.show_in_website) {
cur_frm.appframe.add_button("View In Website", function() { cur_frm.appframe.add_button("View In Website", function() {
window.open(doc.page_name); window.open(doc.__onload.website_route);
}, "icon-globe"); }, "icon-globe");
} }
cur_frm.cscript.edit_prices_button(); cur_frm.cscript.edit_prices_button();

4
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
View File

@ -264,7 +264,7 @@
"icon": "icon-list", "icon": "icon-list",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-05-27 03:49:19.837686", "modified": "2014-06-09 01:51:44.014466",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Ledger Entry", "name": "Stock Ledger Entry",
@ -274,6 +274,7 @@
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 1,
"create": 0, "create": 0,
"export": 1,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 1, "report": 1,
@ -282,6 +283,7 @@
"write": 0 "write": 0
}, },
{ {
"export": 1,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 1, "report": 1,