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

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

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Rushabh Mehta 2012-03-05 11:31:04 +01:00
commit 23d366a0be
14 changed files with 355 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
erpnext/accounts/doctype/pv_detail/pv_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:17', 'creation': '2010-08-08 17:09:17',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 10:54:12', 'modified': '2012-03-05 15:02:25',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 45 'version': 46
}, },
# These values are common for all DocField # These values are common for all DocField
@ -100,9 +100,9 @@
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'purchase_ref_rate', 'fieldname': u'import_ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Ref Rate *', 'label': u'Ref Rate ',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'trigger': u'Client' 'trigger': u'Client'
@ -119,6 +119,43 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_rate',
'fieldtype': u'Currency',
'label': u'Rate ',
'oldfieldname': u'import_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 0,
'reqd': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'import_amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'purchase_ref_rate',
'fieldtype': u'Currency',
'label': u'Ref Rate *',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -146,43 +183,6 @@
'reqd': 1 'reqd': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_ref_rate',
'fieldtype': u'Currency',
'label': u'Ref Rate ',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_rate',
'fieldtype': u'Currency',
'label': u'Rate ',
'oldfieldname': u'import_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 0,
'reqd': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'import_amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',

94
erpnext/accounts/doctype/rv_detail/rv_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:20', 'creation': '2010-08-08 17:09:20',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 10:50:03', 'modified': '2012-03-05 15:01:04',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 28 'version': 29
}, },
# These values are common for all DocField # These values are common for all DocField
@ -109,14 +109,17 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'base_ref_rate', 'fieldname': u'ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Price List Rate*', 'label': u'Price List Rate',
'oldfieldname': u'base_ref_rate', 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency', 'oldfieldtype': u'Currency',
'permlevel': 1, 'permlevel': 0,
'print_hide': 1 'print_hide': 1,
'reqd': 0,
'trigger': u'Client'
}, },
# DocField # DocField
@ -133,6 +136,43 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'export_rate',
'fieldtype': u'Currency',
'label': u'Basic Rate',
'oldfieldname': u'export_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'export_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'export_amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'base_ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate*',
'oldfieldname': u'base_ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -163,46 +203,6 @@
'reqd': 1 'reqd': 1
}, },
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate',
'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'export_rate',
'fieldtype': u'Currency',
'label': u'Basic Rate',
'oldfieldname': u'export_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'export_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'export_amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

78
erpnext/buying/doctype/po_detail/po_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:12', 'creation': '2010-08-08 17:09:12',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 10:50:51', 'modified': '2012-03-05 15:01:31',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 64 'version': 65
}, },
# These values are common for all DocField # These values are common for all DocField
@ -121,9 +121,9 @@
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'purchase_ref_rate', 'fieldname': u'import_ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Ref Rate *', 'label': u'Ref Rate ',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1
}, },
@ -139,6 +139,41 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_rate',
'fieldtype': u'Currency',
'hidden': 0,
'label': u'Rate ',
'oldfieldname': u'import_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 0,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'import_amount',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'purchase_ref_rate',
'fieldtype': u'Currency',
'label': u'Ref Rate *',
'permlevel': 0,
'print_hide': 1
},
# DocField # DocField
{ {
'default': u'0.00', 'default': u'0.00',
@ -169,41 +204,6 @@
'reqd': 1 'reqd': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_ref_rate',
'fieldtype': u'Currency',
'label': u'Ref Rate ',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_rate',
'fieldtype': u'Currency',
'hidden': 0,
'label': u'Rate ',
'oldfieldname': u'import_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 0,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'import_amount',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

6
erpnext/buying/doctype/purchase_common/purchase_common.js
View File

@ -100,19 +100,19 @@ var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) {
for (d in item_cols_import) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_import[d]+' ('+doc.currency+')'); for (d in item_cols_import) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_import[d]+' ('+doc.currency+')');
var hide = (doc.currency == sys_defaults['currency']) ? false : true; var hide = (doc.currency == sys_defaults['currency']) ? false : true;
for (f in item_cols_import) { for (f in item_cols_base) {
cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide);
} }
if (doc.doctype == 'Payable Voucher') { if (doc.doctype == 'Payable Voucher') {
$('[data-grid-fieldname="'+cur_frm.cscript.tname+'-rate"]').html('Rate ('+base_curr+')'); $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-rate"]').html('Rate ('+base_curr+')');
//cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide); cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide);
// advance table flds // advance table flds
adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount', 'tds_amount': 'TDS Amount', 'tds_allocated': 'TDS Allocated'} adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount', 'tds_amount': 'TDS Amount', 'tds_allocated': 'TDS Allocated'}
for (d in adv_cols) $('[data-grid-fieldname="Advance Allocation Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')'); for (d in adv_cols) $('[data-grid-fieldname="Advance Allocation Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')');
} }
else { else {
$('[data-grid-fieldname="'+cur_frm.cscript.tname+'-purchase_rate"]').html('Rate ('+base_curr+')'); $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-purchase_rate"]').html('Rate ('+base_curr+')');
//cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide); cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide);
} }
//tax table flds //tax table flds

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

@ -2,8 +2,10 @@ def execute():
import webnotes import webnotes
from webnotes.modules.module_manager import reload_doc from webnotes.modules.module_manager import reload_doc
reload_doc('selling', 'doctype', 'quotation_detail') reload_doc('selling', 'doctype', 'quotation_detail')
reload_doc('selling', 'doctype', 'sales_order_detail')
reload_doc('stock', 'doctype', 'delivery_note_detail') reload_doc('stock', 'doctype', 'delivery_note_detail')
reload_doc('stock', 'doctype', 'purchase_receipt_detail') reload_doc('stock', 'doctype', 'purchase_receipt_detail')
reload_doc('buying', 'doctype', 'po_detail') reload_doc('buying', 'doctype', 'po_detail')
reload_doc('accounts', 'doctype', 'rv_detail') reload_doc('accounts', 'doctype', 'rv_detail')
reload_doc('accounts', 'doctype', 'pv_detail') reload_doc('accounts', 'doctype', 'pv_detail')

116
erpnext/selling/doctype/quotation_detail/quotation_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:18', 'creation': '2010-08-08 17:09:18',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 10:48:27', 'modified': '2012-03-05 15:00:10',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -23,7 +23,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 32 'version': 33
}, },
# These values are common for all DocField # These values are common for all DocField
@ -110,14 +110,17 @@
# DocField # DocField
{ {
'default': u'0.00',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'base_ref_rate', 'fieldname': u'ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Price List Rate*', 'label': u'Price List Rate',
'oldfieldname': u'base_ref_rate', 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency', 'oldfieldtype': u'Currency',
'permlevel': 1, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'100px' 'width': u'100px'
}, },
@ -136,58 +139,6 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'in_filter': 0,
'label': u'Basic Rate*',
'oldfieldname': u'basic_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'search_index': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'amount',
'fieldtype': u'Currency',
'in_filter': 0,
'label': u'Amount*',
'oldfieldname': u'amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'search_index': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate',
'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField # DocField
{ {
'default': u'0.00', 'default': u'0.00',
@ -223,6 +174,55 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'base_ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate*',
'oldfieldname': u'base_ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'in_filter': 0,
'label': u'Basic Rate*',
'oldfieldname': u'basic_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'search_index': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'amount',
'fieldtype': u'Currency',
'in_filter': 0,
'label': u'Amount*',
'oldfieldname': u'amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'search_index': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',

10
erpnext/selling/doctype/sales_common/sales_common.js
View File

@ -121,7 +121,7 @@ var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) {
for (d in item_cols_export) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_export[d]+' ('+doc.currency+')'); for (d in item_cols_export) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_export[d]+' ('+doc.currency+')');
var hide = (doc.currency == sys_defaults['currency']) ? false : true; var hide = (doc.currency == sys_defaults['currency']) ? false : true;
for (f in item_cols_export) { for (f in item_cols_base) {
cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide);
} }
@ -658,10 +658,10 @@ cur_frm.cscript.update_fname_table = function(doc , tname , fname , n, other_fna
'basic_rate': flt(flt(cl[i].export_rate) * flt(doc.conversion_rate)), 'basic_rate': flt(flt(cl[i].export_rate) * flt(doc.conversion_rate)),
'amount': roundNumber(flt((flt(cl[i].export_rate) * flt(doc.conversion_rate)) * flt(cl[i].qty)), 2) 'amount': roundNumber(flt((flt(cl[i].export_rate) * flt(doc.conversion_rate)) * flt(cl[i].qty)), 2)
}, fname); }, fname);
var base_ref_rate = flt(cl[i].basic_rate) + flt(flt(cl[i].basic_rate) * flt(cl[i].adj_rate) / 100); //var base_ref_rate = flt(cl[i].basic_rate) + flt(flt(cl[i].basic_rate) * flt(cl[i].adj_rate) / 100);
set_multiple(tname, cl[i].name, { //set_multiple(tname, cl[i].name, {
'base_ref_rate': flt(base_ref_rate) // 'base_ref_rate': flt(base_ref_rate)
}, fname); //}, fname);
} else if(consider_incl_rate) { } else if(consider_incl_rate) {
if(flt(cl[i].export_rate) > 0) { if(flt(cl[i].export_rate) > 0) {

110
erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:22', 'creation': '2010-08-08 17:09:22',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-02 15:49:26', 'modified': '2012-03-05 14:59:43',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 53 'version': 54
}, },
# These values are common for all DocField # These values are common for all DocField
@ -117,15 +117,18 @@
# DocField # DocField
{ {
'default': u'0.00',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'base_ref_rate', 'fieldname': u'ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Price List Rate*', 'label': u'Price List Rate',
'oldfieldname': u'base_ref_rate', 'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency', 'oldfieldtype': u'Currency',
'permlevel': 1, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'width': u'100px' 'reqd': 0,
'trigger': u'Client',
'width': u'70px'
}, },
# DocField # DocField
@ -143,54 +146,6 @@
'width': u'70px' 'width': u'70px'
}, },
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'label': u'Basic Rate*',
'oldfieldname': u'basic_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'amount',
'fieldtype': u'Currency',
'label': u'Amount*',
'no_copy': 0,
'oldfieldname': u'amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate',
'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'70px'
},
# DocField # DocField
{ {
'default': u'0.00', 'default': u'0.00',
@ -221,6 +176,51 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'base_ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate*',
'oldfieldname': u'base_ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'label': u'Basic Rate*',
'oldfieldname': u'basic_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'amount',
'fieldtype': u'Currency',
'label': u'Amount*',
'no_copy': 0,
'oldfieldname': u'amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'width': u'100px'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

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

@ -122,18 +122,18 @@ pscript.feature_dict = {
'Sales Order': {'sales_order_details':['page_break']} 'Sales Order': {'sales_order_details':['page_break']}
}, },
'fs_exports': { 'fs_exports': {
'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['ref_rate','export_amount','export_rate']}, 'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['base_ref_rate','amount','basic_rate']},
'POS Setting': {'fields':['conversion_rate','currency']}, 'POS Setting': {'fields':['conversion_rate','currency']},
'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['ref_rate','export_amount','export_rate']}, 'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['base_ref_rate','amount','basic_rate']},
'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['ref_rate','export_amount','export_rate']}, 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['base_ref_rate','amount','basic_rate']},
'Item': {'ref_rate_details':['ref_currency']}, 'Item': {'ref_rate_details':['ref_currency']},
'Sales BOM': {'fields':['currency']}, 'Sales BOM': {'fields':['currency']},
'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['ref_rate','export_amount','export_rate']} 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','amount','basic_rate']}
}, },
'fs_imports': { 'fs_imports': {
'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['import_amount','import_rate']}, 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['purchase_ref_rate', 'amount','rate']},
'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['import_amount','import_rate']}, 'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['purchase_ref_rate', 'amount','purchase_rate']},
'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['import_amount','import_rate']}, 'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['purchase_ref_rate','amount','purchase_rate']},
'Supplier Quotation': {'fields':['conversion_rate','currency']} 'Supplier Quotation': {'fields':['conversion_rate','currency']}
}, },
'fs_item_advanced': { 'fs_item_advanced': {

106
erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:08:58', 'creation': '2010-08-08 17:08:58',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 10:49:39', 'modified': '2012-03-05 15:00:39',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -23,7 +23,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 55 'version': 56
}, },
# These values are common for all DocField # These values are common for all DocField
@ -117,14 +117,18 @@
# DocField # DocField
{ {
'default': u'0.00',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'base_ref_rate', 'fieldname': u'ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Price List Rate*', 'label': u'Price List Rate',
'oldfieldname': u'base_ref_rate', 'no_copy': 0,
'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency', 'oldfieldtype': u'Currency',
'permlevel': 1, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'100px' 'width': u'100px'
}, },
@ -143,53 +147,6 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'label': u'Rate*',
'oldfieldname': u'basic_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'150px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'amount',
'fieldtype': u'Currency',
'label': u'Amount*',
'oldfieldname': u'amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate',
'no_copy': 0,
'oldfieldname': u'ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -219,6 +176,49 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'base_ref_rate',
'fieldtype': u'Currency',
'label': u'Price List Rate*',
'oldfieldname': u'base_ref_rate',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'width': u'100px'
},
# DocField
{
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'basic_rate',
'fieldtype': u'Currency',
'label': u'Rate*',
'oldfieldname': u'basic_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'trigger': u'Client',
'width': u'150px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'amount',
'fieldtype': u'Currency',
'label': u'Amount*',
'oldfieldname': u'amount',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'width': u'100px'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

82
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:16', 'creation': '2010-08-08 17:09:16',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-05 10:51:18', 'modified': '2012-03-05 15:01:58',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 76 'version': 77
}, },
# These values are common for all DocField # These values are common for all DocField
@ -135,9 +135,9 @@
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'purchase_ref_rate', 'fieldname': u'import_ref_rate',
'fieldtype': u'Currency', 'fieldtype': u'Currency',
'label': u'Ref Rate *', 'label': u'Ref Rate ',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1
}, },
@ -152,6 +152,43 @@
'print_hide': 1 'print_hide': 1
}, },
# DocField
{
'colour': u'White:FFF',
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'import_rate',
'fieldtype': u'Currency',
'label': u'Rate',
'oldfieldname': u'import_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'import_amount',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'purchase_ref_rate',
'fieldtype': u'Currency',
'label': u'Ref Rate *',
'permlevel': 0,
'print_hide': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -185,43 +222,6 @@
'width': u'100px' 'width': u'100px'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_ref_rate',
'fieldtype': u'Currency',
'label': u'Ref Rate ',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'default': u'0.00',
'doctype': u'DocField',
'fieldname': u'import_rate',
'fieldtype': u'Currency',
'label': u'Rate',
'oldfieldname': u'import_rate',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 0,
'trigger': u'Client',
'width': u'100px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'import_amount',
'fieldtype': u'Currency',
'label': u'Amount',
'oldfieldname': u'import_amount',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

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

@ -18,7 +18,7 @@
<p class="help">Single unit of an Item</p> <p class="help">Single unit of an Item</p>
<h4><a href="#!List/Batch">Batch</a></h4> <h4><a href="#!List/Batch">Batch</a></h4>
<p class="help">Batch of units of an Item</p> <p class="help">Batch of units of an Item</p>
<h4><a href="#!List/Item">Warehouse</a></h4> <h4><a href="#!List/Warehouse">Warehouse</a></h4>
<p class="help">Warehouse is where items are stored</p> <p class="help">Warehouse is where items are stored</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>

2
js/all-app.js
View File

File diff suppressed because one or more lines are too long