From 53e36b34d32d8a93cf4268ba2556beb53ddbf398 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 29 Jan 2013 10:47:58 +0530 Subject: [PATCH 1/3] fixed syntax issue in financial statements --- .../page/financial_statements/financial_statements.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/page/financial_statements/financial_statements.js b/accounts/page/financial_statements/financial_statements.js index 2fd8afb5dbd..cc79668405b 100644 --- a/accounts/page/financial_statements/financial_statements.js +++ b/accounts/page/financial_statements/financial_statements.js @@ -86,10 +86,10 @@ pscript.stmt_new = function(stmt,company_name,level,period,year) { var company = sel_val($i('stmt_company')) var arg = { - statement:sel_val($i('stmt_type')) - ,company:company, - ,period:sel_val($i('stmt_period')) - ,year:sel_val($i('stmt_fiscal_year')) + statement:sel_val($i('stmt_type')), + company:company, + period:sel_val($i('stmt_period')), + year:sel_val($i('stmt_fiscal_year')) } $c_obj('MIS Control', 'get_statement', docstring(arg), function(r,rt) { From a0d6b3443e6d121c4fa3cc6927f4ab13eacf9cde Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 29 Jan 2013 10:48:33 +0530 Subject: [PATCH 2/3] removed patch of jan_mar period --- patches/patch_list.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index ef175427b71..7915a0f983e 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -12,15 +12,13 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . from __future__ import unicode_literals patch_list = [ "patches.mar_2012.so_rv_mapper_fix", "patches.mar_2012.clean_property_setter", - "patches.jan_mar_2012.sync_ref_db", "patches.april_2012.naming_series_patch", - "patches.jan_mar_2012.rename_dt", "patches.mar_2012.cleanup_control_panel", "patches.mar_2012.doctype_get_refactor", "patches.mar_2012.delete_docformat", From 763fcf735d17c4bd5d4837672487dcf1a65bcc76 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 29 Jan 2013 17:05:00 +0530 Subject: [PATCH 3/3] removed Accounts User role for accounts report pages --- .../financial_analytics.txt | 42 +++++++++---------- .../financial_statements.txt | 26 +++++------- accounts/page/trial_balance/trial_balance.txt | 42 +++++++++---------- 3 files changed, 49 insertions(+), 61 deletions(-) diff --git a/accounts/page/financial_analytics/financial_analytics.txt b/accounts/page/financial_analytics/financial_analytics.txt index 5572a0e50bb..499320077fb 100644 --- a/accounts/page/financial_analytics/financial_analytics.txt +++ b/accounts/page/financial_analytics/financial_analytics.txt @@ -1,40 +1,36 @@ [ { - "owner": "Administrator", + "creation": "2013-01-27 16:30:52", "docstatus": 0, - "creation": "2012-09-18 11:05:48", + "modified": "2013-01-29 13:11:00", "modified_by": "Administrator", - "modified": "2012-10-04 17:02:43" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Financial Analytics", - "module": "Accounts", "doctype": "Page", + "module": "Accounts", + "name": "__common__", "page_name": "financial-analytics", - "standard": "Yes" + "standard": "Yes", + "title": "Financial Analytics" }, { + "doctype": "Page Role", "name": "__common__", "parent": "financial-analytics", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "financial-analytics" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "financial-analytics", - "doctype": "Page" - }, - { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Accounts Manager", - "doctype": "Page Role" - }, - { - "role": "Accounts User", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Accounts Manager" } ] \ No newline at end of file diff --git a/accounts/page/financial_statements/financial_statements.txt b/accounts/page/financial_statements/financial_statements.txt index 77961031431..b8226d0b24a 100644 --- a/accounts/page/financial_statements/financial_statements.txt +++ b/accounts/page/financial_statements/financial_statements.txt @@ -1,35 +1,31 @@ [ { - "owner": "Administrator", + "creation": "2013-01-27 16:30:52", "docstatus": 0, - "creation": "2012-06-14 15:07:28", + "modified": "2013-01-29 13:11:17", "modified_by": "Administrator", - "modified": "2012-10-04 17:04:05" + "owner": "Administrator" }, { - "name": "__common__", - "module": "Accounts", - "page_name": "Financial Statements", "doctype": "Page", + "module": "Accounts", + "name": "__common__", + "page_name": "Financial Statements", "standard": "Yes" }, { + "doctype": "Page Role", "name": "__common__", "parent": "Financial Statements", - "doctype": "Page Role", + "parentfield": "roles", "parenttype": "Page", - "parentfield": "roles" + "role": "Accounts Manager" }, { - "name": "Financial Statements", - "doctype": "Page" + "doctype": "Page", + "name": "Financial Statements" }, { - "role": "Accounts User", - "doctype": "Page Role" - }, - { - "role": "Accounts Manager", "doctype": "Page Role" } ] \ No newline at end of file diff --git a/accounts/page/trial_balance/trial_balance.txt b/accounts/page/trial_balance/trial_balance.txt index eafc1d2f631..7c8560160fb 100644 --- a/accounts/page/trial_balance/trial_balance.txt +++ b/accounts/page/trial_balance/trial_balance.txt @@ -1,40 +1,36 @@ [ { - "owner": "Administrator", + "creation": "2013-01-27 16:30:52", "docstatus": 0, - "creation": "2012-09-18 11:05:48", + "modified": "2013-01-29 13:11:43", "modified_by": "Administrator", - "modified": "2012-10-04 17:01:47" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Trial Balance", - "module": "Accounts", "doctype": "Page", + "module": "Accounts", + "name": "__common__", "page_name": "trial-balance", - "standard": "Yes" + "standard": "Yes", + "title": "Trial Balance" }, { + "doctype": "Page Role", "name": "__common__", "parent": "trial-balance", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "trial-balance" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "trial-balance", - "doctype": "Page" - }, - { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Accounts Manager", - "doctype": "Page Role" - }, - { - "role": "Accounts User", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Accounts Manager" } ] \ No newline at end of file