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

fixes after sync testing

Browse Source
This commit is contained in:
Anand Doshi 2012-04-10 19:14:37 +05:30
parent a9ccc7d6bd
commit 2424387651
15 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/page/accounts_home/accounts_home.html
View File

@ -98,7 +98,7 @@
<div class="section-item">
<a class="section-link"
title = "Terms of contract template"
href="#!List/Term">Order Terms Template</a>
href="#!List/Terms and Conditions">Terms and Conditions Template</a>
</div>
<div class="section-item">
<a class="section-link"

2
erpnext/buying/page/buying_home/buying_home.html
View File

@ -43,7 +43,7 @@
<div class="section-item">
<a class="section-link"
title = "Terms of contract template"
href="#!List/Term">Order Terms Template</a>
href="#!List/Terms and Conditions">Terms and Conditions Template</a>
</div>
</div>
</div>

4
erpnext/hr/page/hr_home/hr_home.html
View File

@ -93,7 +93,7 @@
<div class="section-item">
<a class="section-link"
title = "Template for employee performance appraisals"
href="#!List/Appraisal Template">Key Performance Area (KRA) Template</a>
href="#!List/Appraisal Template">Appraisal Template</a>
</div>
<div class="section-item">
<a class="section-link"
@ -120,4 +120,4 @@
</div>
</div>
<div style="clear: both;"></div>
</div>
</div>

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

@ -164,7 +164,7 @@ def update_dt_in_records(rendt):
webnotes.conn.sql("update `tabStock Ledger Entry` set voucher_type = replace(voucher_type, '%s', '%s') where voucher_type = '%s'" % (d, rendt[d], d))
# Custom fld: options
webnotes.conn.sql("update `tabCustom Field` set options = replace(options, %s, %s) where fieldtype in ('Link', 'Select')", (d, rendt[d]))
webnotes.conn.sql("update `tabCustom Field` set options = replace(options, %s, %s) where fieldtype in ('Link', 'Select', 'Table')", (d, rendt[d]))
#Property Setter: value (if property=options)
webnotes.conn.sql("update `tabProperty Setter` set value = replace(value, %s, %s) where property = 'Options'", (d, rendt[d]))

7
erpnext/production/page/production_home/production_home.html
View File

@ -40,11 +40,6 @@
title = "browse bill of materials in a tree"
href="#!Bill of Materials">BOM Browser</a>
</div>
<div class="section-item">
<a class="section-link"
title = "Replace item/sub-assembly from a sub-assembly from all BOMs"
href="#!Form/BOM Replace Utility/BOM Replace Utility">BOM Replace Item</a>
</div>
<div class="section-item">
<a class="section-link"
title = "Update delivery dates in all Sales Orders"
@ -55,4 +50,4 @@
</div>
</div>
<div style="clear: both;"></div>
</div>
</div>

4
erpnext/projects/page/projects_home/projects_home.html
View File

@ -8,7 +8,7 @@
<p class="help">Project master</p>
<h4><a href="#!List/Task">Task</a></h4>
<p class="help">Project activity / task</p>
<h4><a href="#!List/Task">Timesheet</a></h4>
<h4><a href="#!List/Timesheet">Timesheet</a></h4>
<p class="help">Timesheet for tasks</p>
</div>
<div style="width: 48%; float: right;">
@ -35,4 +35,4 @@
</div>
</div>
<div style="clear: both;"></div>
</div>
</div>

11
erpnext/setup/doctype/naming_series/naming_series.js
View File

@ -20,9 +20,14 @@ cur_frm.cscript.onload = function(doc, cdt, cdn){
set_field_options('select_doc_for_series', r.message);
}
$c_obj([doc],'get_transactions','',callback);
cur_frm.cscript.refresh();
// add page head
var ph = new PageHeader(cur_frm.fields_dict['Head HTML'].wrapper, 'Setup Series', 'Set prefix for numbering series on your transactions');
//var ph = new PageHeader(cur_frm.fields_dict['head_html'].wrapper, 'Setup Series', 'Set prefix for numbering series on your transactions');
}
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
// hide buttons
$(cur_frm.frm_head.page_head.toolbar_area).toggle(false);
}
cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
@ -32,4 +37,4 @@ cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
}
$c_obj([doc],'get_options','',callback)
}
}

19
erpnext/setup/doctype/naming_series/naming_series.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2012-03-27 14:36:21',
'creation': '2012-04-10 13:01:16',
'docstatus': 0,
'modified': '2012-03-27 14:36:21',
'modified': '2012-04-10 18:45:34',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -13,9 +13,10 @@
# These values are common for all DocType
{
'colour': u'White:FFF',
'description': u'Set prefix for numbering series on your transactions',
'doctype': 'DocType',
'hide_heading': 1,
'hide_toolbar': 1,
'hide_heading': 0,
'hide_toolbar': 0,
'issingle': 1,
'module': u'Setup',
'name': '__common__',
@ -23,7 +24,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
'version': 58
'version': 66
},
# These values are common for all DocField
@ -108,14 +109,6 @@
'label': u'Setup Series'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'head_html',
'fieldtype': u'HTML',
'label': u'Head HTML'
},
# DocField
{
'doctype': u'DocField',

12
erpnext/setup/page/modules_setup/modules_setup.js
View File

@ -4,11 +4,15 @@ $.extend(wn.pages.modules_setup, {
modules: ['Activity', 'Accounts', 'Selling', 'Buying', 'Stock', 'Production', 'Projects',
'Support', 'HR', 'Website', 'To Do', 'Messages', 'Calendar', 'Knowledge Base'],
onload: function(wrapper) {
wn.pages.modules_setup.refresh(wn.boot.modules_list);
wn.pages.modules_setup.refresh_page(wn.boot.modules_list);
},
refresh: function(ml) {
refresh_page: function(ml) {
$('#modules-list').empty();
// Hide Setup and Dashboard modules
ml.indexOf('Setup')!=-1 && ml.splice(ml.indexOf('Setup'), 1);
ml.indexOf('Dashboard')!=-1 && ml.splice(ml.indexOf('Dashboard'), 1);
// checked modules
for(i in ml) {
$('#modules-list').append(repl('<p style="cursor:move;">\
@ -47,4 +51,4 @@ $.extend(wn.pages.modules_setup, {
btn: $('#modules-update').get(0)
});
}
});
});

1
erpnext/startup/event_handlers.py
View File

@ -92,6 +92,7 @@ def boot_session(bootinfo):
bootinfo['docs'] += webnotes.model.doctype.get('Search Criteria')
bootinfo['modules_list'] = webnotes.conn.get_global('modules_list')
webnotes.msgprint(bootinfo['modules_list'])
# if no company, show a dialog box to create a new company
bootinfo['setup_complete'] = webnotes.conn.sql("""select name from

2
erpnext/startup/js/feature_setup.js
View File

@ -84,7 +84,7 @@ pscript.feature_dict = {
'Delivery Note': {'delivery_note_details':['serial_no'],'packing_details':['serial_no']},
'Installation Note': {'installed_item_details':['serial_no']},
'Item': {'fields':['has_serial_no']},
'Maintenance Schedule': {'item_maintenance_details':['serial_no'],'maintenance_schedule_details':['serial_no']},
'Maintenance Schedule': {'item_maintenance_detail':['serial_no'],'maintenance_schedule_detail':['serial_no']},
'Maintenance Visit': {'maintenance_visit_details':['serial_no']},
'Purchase Receipt': {'purchase_receipt_details':['serial_no']},
'Quality Inspection': {'fields':['item_serial_no']},

2
erpnext/stock/page/stock_home/stock_home.html
View File

@ -59,7 +59,7 @@
<div class="section-item">
<a class="section-link"
title = "Distribute costs on Purchase Receipts and add them to item value"
href="#!List/Landed Cost Wizard">Landed Cost Wizard</a>
href="#!Form/Landed Cost Wizard/Landed Cost Wizard">Landed Cost Wizard</a>
</div>
<div class="section-item">
<a class="section-link"

8
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@ -70,10 +70,10 @@ $.extend(cur_frm.cscript, {
// make thread listing
//
make_listing: function(doc) {
cur_frm.fields_dict['Thread HTML'].wrapper.innerHTML = '';
cur_frm.fields_dict['thread_html'].wrapper.innerHTML = '';
// render first message
new EmailMessage($a(cur_frm.fields_dict['Thread HTML'].wrapper, 'div'), {
new EmailMessage($a(cur_frm.fields_dict['thread_html'].wrapper, 'div'), {
from_email: doc.raised_by,
creation: doc.creation,
mail: doc.description,
@ -82,7 +82,7 @@ $.extend(cur_frm.cscript, {
// render thread
cs.thread_list = new wn.ui.Listing({
parent: $a(cur_frm.fields_dict['Thread HTML'].wrapper, 'div'),
parent: $a(cur_frm.fields_dict['thread_html'].wrapper, 'div'),
no_result_message: 'No responses yet',
get_query: function() {
return 'select mail, from_email, creation, content_type '+
@ -97,7 +97,7 @@ $.extend(cur_frm.cscript, {
},
Send: function(doc, dt, dn) {
send: function(doc, dt, dn) {
$c_obj([doc], 'send_response', '', function(r,rt) {
locals[dt][dn].new_response = '';
if(!(r.exc || r.server_messages)) {

2
js/all-app.js
View File

File diff suppressed because one or more lines are too long

2
version.num
View File

@ -1 +1 @@
1540
1565