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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2013-01-29 17:54:04 +05:30
commit abf8fe414b
5 changed files with 54 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
accounts/page/financial_analytics/financial_analytics.txt
View File

@ -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"
}
]

8
accounts/page/financial_statements/financial_statements.js
View File

@ -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) {

26
accounts/page/financial_statements/financial_statements.txt
View File

@ -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"
}
]

42
accounts/page/trial_balance/trial_balance.txt
View File

@ -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"
}
]

4
patches/patch_list.py
View File

@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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",