From 9732250a83a48e89e98459f0703981e4a1c63dd5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 30 Jan 2013 11:46:59 +0530 Subject: [PATCH 1/4] ignore create permission in gl control --- accounts/doctype/gl_control/gl_control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/gl_control/gl_control.py b/accounts/doctype/gl_control/gl_control.py index 0070f7c6f88..db927e94d65 100644 --- a/accounts/doctype/gl_control/gl_control.py +++ b/accounts/doctype/gl_control/gl_control.py @@ -51,7 +51,7 @@ class DocType: ac.doc.doctype = "Account" ac.doc.old_parent = "" ac.doc.freeze_account = "No" - ac.ignore_permission = 1 + ac.ignore_permissions = 1 ac.insert() return ac.doc.name @@ -62,7 +62,7 @@ class DocType: cc = webnotes.model_wrapper(eval(arg)) cc.doc.doctype = "Cost Center" cc.doc.old_parent = "" - cc.ignore_permission = 1 + cc.ignore_permissions = 1 cc.insert() return cc.doc.name From 86f0bc81a900a587c75cda17a45ded1921855534 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 30 Jan 2013 15:21:07 +0530 Subject: [PATCH 2/4] fixed currency in old report --- .../draft_sales_orders/draft_sales_orders.txt | 62 ++++++++----------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/selling/search_criteria/draft_sales_orders/draft_sales_orders.txt b/selling/search_criteria/draft_sales_orders/draft_sales_orders.txt index 84dc8fec4c3..af60e71713c 100644 --- a/selling/search_criteria/draft_sales_orders/draft_sales_orders.txt +++ b/selling/search_criteria/draft_sales_orders/draft_sales_orders.txt @@ -1,37 +1,29 @@ [ - { - 'add_col': None, - 'add_cond': None, - 'add_tab': None, - 'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Sales Order Date,Sales Order\x01Customer,Sales Order\x01P.O. No,Sales Order\x01Grand Total', - 'creation': '2010-08-08 17:09:31', - 'criteria_name': 'Draft Sales Orders', - 'custom_query': '', - 'description': 'List of Open Sales orders filtered by period, customer and other details', - 'dis_filters': None, - 'disabled': None, - 'doc_type': 'Sales Order', - 'docstatus': 0, - 'doctype': 'Search Criteria', - 'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Draft','Sales Order\x01Fiscal Year':''}", - 'graph_series': None, - 'graph_values': None, - 'group_by': None, - 'idx': None, - 'modified': '2010-06-01 15:19:41', - 'modified_by': 'Administrator', - 'module': 'CRM', - 'name': 'draft_sales_orders', - 'owner': 'Administrator', - 'page_len': 50, - 'parent': None, - 'parent_doc_type': None, - 'parentfield': None, - 'parenttype': None, - 'report_script': None, - 'server_script': None, - 'sort_by': '`tabSales Order`.`name`', - 'sort_order': 'DESC', - 'standard': 'Yes' - } + { + "creation": "2012-05-14 18:20:52", + "docstatus": 0, + "modified": "2013-01-30 15:19:07", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "columns": "Sales Order\u0001ID,Sales Order\u0001Status,Sales Order\u0001Sales Order Date,Sales Order\u0001Customer,Sales Order\u0001P.O. No,Sales Order\u0001Currency,Sales Order\u0001Grand Total (Export)", + "criteria_name": "Draft Sales Orders", + "custom_query": "", + "description": "List of Open Sales orders filtered by period, customer and other details", + "doc_type": "Sales Order", + "doctype": "Search Criteria", + "filters": "{\"Sales Order\\u0001Saved\":1,\"Sales Order\\u0001Submitted\":1,\"Sales Order\\u0001To Sales Order Date\\u0001upper\":\"2013-01-30\",\"Sales Order\\u0001Company\":\"Alpha\",\"Sales Order\\u0001Fiscal Year\":[\"\"],\"Sales Order\\u0001Status\":[\"Draft\"]}", + "module": "Selling", + "name": "__common__", + "page_len": 50, + "report_script": null, + "sort_by": "`tabSales Order`.`name`", + "sort_order": "DESC", + "standard": "Yes" + }, + { + "doctype": "Search Criteria", + "name": "draft_sales_orders" + } ] \ No newline at end of file From 028abd2d08ce9bfcba58aff53346089bfe2600f7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 31 Jan 2013 11:20:10 +0530 Subject: [PATCH 3/4] bugfix in session update and separated GET and POST queries --- public/js/startup.js | 1 + startup/event_handlers.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/js/startup.js b/public/js/startup.js index e2413f124d4..1ae3feb6139 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -117,6 +117,7 @@ erpnext.update_messages = function(reset) { wn.call({ method: 'startup.startup.get_global_status_messages', + type:"GET", callback: set_messages }); diff --git a/startup/event_handlers.py b/startup/event_handlers.py index 3f04dc797f9..2a74eeb58d4 100644 --- a/startup/event_handlers.py +++ b/startup/event_handlers.py @@ -25,9 +25,11 @@ def on_login_post_session(login_manager): # create feed from webnotes.utils import nowtime from webnotes.profile import get_user_fullname + webnotes.conn.begin() home.make_feed('Login', 'Profile', login_manager.user, login_manager.user, '%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()), - login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D') + login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D') + webnotes.conn.commit() def comment_added(doc): From 92455dc7ae2baaae04136e9c999ce5869e06ef8e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 31 Jan 2013 11:24:22 +0530 Subject: [PATCH 4/4] blog textarea --- website/templates/html/blog_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html index 87dcfef19ae..923738275de 100644 --- a/website/templates/html/blog_page.html +++ b/website/templates/html/blog_page.html @@ -46,7 +46,7 @@

-