From 390efdc8843e8cb7dca044f6f1b3c8cc2b5f7c0e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Jun 2014 10:28:04 +0530 Subject: [PATCH 1/4] Fix in HR patch --- erpnext/patches/v4_0/fix_case_of_hr_module_def.py | 1 + 1 file changed, 1 insertion(+) 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 117c2acba9d..73b4e7f56c8 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 @@ def execute(): frappe.db.set_value("Module Def", "HR", "module_name", "HR") frappe.clear_cache() + frappe.setup_module_map() From cdfa9a371d44b4fe231799adeab6afcb9e0a0476 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Jun 2014 11:26:50 +0530 Subject: [PATCH 2/4] Export perm for GL Entry and Stock Ledger Entry --- erpnext/accounts/doctype/gl_entry/gl_entry.json | 15 +++------------ erpnext/patches.txt | 3 +++ .../stock_ledger_entry/stock_ledger_entry.json | 4 +++- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json index 7f7d2bcfcfb..1856386237b 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 bd895827433..fba05546a59 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -52,4 +52,7 @@ erpnext.patches.v4_0.fix_address_template # 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json index c9e3b776fce..cdddabedf20 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, From edb9efd9a63e2a096a580d4c08a7f3ba51af533f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Jun 2014 13:22:47 +0530 Subject: [PATCH 3/4] Fixed manifest and website --- MANIFEST.in | 1 + erpnext/setup/doctype/item_group/item_group.js | 2 +- erpnext/stock/doctype/item/item.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 53477f2ed00..3e467e53621 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -16,4 +16,5 @@ recursive-include erpnext *.md recursive-include erpnext *.png recursive-include erpnext *.py recursive-include erpnext *.svg +recursive-include erpnext/public * recursive-exclude * *.pyc diff --git a/erpnext/setup/doctype/item_group/item_group.js b/erpnext/setup/doctype/item_group/item_group.js index 43a71170833..2aaf558642d 100644 --- a/erpnext/setup/doctype/item_group/item_group.js +++ b/erpnext/setup/doctype/item_group/item_group.js @@ -11,7 +11,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { 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 319d67dc905..2b499c168e0 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -18,7 +18,7 @@ cur_frm.cscript.refresh = function(doc) { 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(); From be3f914acd6b616bd794957d495f0a189556522f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Jun 2014 15:18:45 +0530 Subject: [PATCH 4/4] Fixed add address template --- erpnext/patches/v4_0/new_address_template.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v4_0/new_address_template.py b/erpnext/patches/v4_0/new_address_template.py index d0f5ab0b148..7a5dabc006f 100644 --- a/erpnext/patches/v4_0/new_address_template.py +++ b/erpnext/patches/v4_0/new_address_template.py @@ -5,7 +5,8 @@ def execute(): 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()