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

Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

Browse Source
This commit is contained in:
Nabin Hait 2012-05-02 14:56:17 +05:30
commit 7ef8168dbc
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/all-web.css
View File

@ -2553,7 +2553,7 @@ header .container, .content {
}
div#body_div {
padding-top: 90px;
padding-top: 80px;
min-height: 400px;
}

2
erpnext/patches/jan_mar_2012/sync_ref_db.py
View File

@ -20,7 +20,7 @@ def execute():
'Invest 80 Declaration Detail', 'IT Checklist', 'Chapter VI A Detail', 'Declaration Detail',
'Personalize', 'Salary Slip Control Panel', 'Question Control'
],
'Page' : ['File Browser', 'Bill of Materials'],
'Page' : ['File Browser', 'Bill of Materials', 'question-view'],
'DocType Mapper': ['Production Forecast-Production Planning Tool', 'Production Forecast-Production Plan', 'Sales Order-Production Plan'],
}

4
erpnext/startup/startup.js
View File

@ -110,8 +110,8 @@ erpnext.startup.start = function() {
}
erpnext.set_about();
$('#startup_div').toggle(false);
if(wn.control_panel.custom_startup_code)
eval(wn.control_panel.custom_startup_code);
}
// chart of accounts

2
erpnext/website/css/website.css
View File

@ -3,7 +3,7 @@ header .container, .content {
}
div#body_div {
padding-top: 90px;
padding-top: 80px;
min-height: 400px;
}

3
js/all-app.js
View File

@ -2241,7 +2241,8 @@ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.
</div>',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('<div class="expiry-info"> \
This ERPNext subscription <b>has expired</b>. \
</div>',{expiry_string:expiry_string}));}}}
erpnext.set_about();$('#startup_div').toggle(false);}
erpnext.set_about();if(wn.control_panel.custom_startup_code)
eval(wn.control_panel.custom_startup_code);}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
else if(nm=='Accounts Browser')
pscript.make_chart(chart_type);}

3
js/all-web.js
View File

@ -852,7 +852,8 @@ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.
</div>',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('<div class="expiry-info"> \
This ERPNext subscription <b>has expired</b>. \
</div>',{expiry_string:expiry_string}));}}}
erpnext.set_about();$('#startup_div').toggle(false);}
erpnext.set_about();if(wn.control_panel.custom_startup_code)
eval(wn.control_panel.custom_startup_code);}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
else if(nm=='Accounts Browser')
pscript.make_chart(chart_type);}