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

Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext

Browse Source 
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
This commit is contained in:
Nijil Y 2011-12-08 17:29:24 +05:30
commit edf8bc2a3e
7 changed files with 51 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
View File

@ -333,6 +333,7 @@ cur_frm.cscript.calc_total = function(doc) {
var el = getchildren('PV Detail',doc.name,'entries'); var el = getchildren('PV Detail',doc.name,'entries');
for(var i in el) { for(var i in el) {
if (flt(el[i].import_rate) > 0){ if (flt(el[i].import_rate) > 0){
set_multiple('PV Detail', el[i].name, {'purchase_ref_rate':flt(el[i].import_ref_rate)*flt(doc.conversion_rate)}, 'entries');
set_multiple('PV Detail', el[i].name, {'rate': flt(doc.conversion_rate) * flt(el[i].import_rate) }, 'entries'); set_multiple('PV Detail', el[i].name, {'rate': flt(doc.conversion_rate) * flt(el[i].import_rate) }, 'entries');
set_multiple('PV Detail', el[i].name, {'import_amount': flt(el[i].qty) * flt(el[i].import_rate) }, 'entries'); set_multiple('PV Detail', el[i].name, {'import_amount': flt(el[i].qty) * flt(el[i].import_rate) }, 'entries');
} }

142
erpnext/accounts/doctype/payable_voucher/payable_voucher.txt Normal file → Executable file
View File

@ -5,15 +5,16 @@
{ {
'creation': '2010-08-08 17:09:11', 'creation': '2010-08-08 17:09:11',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-06-21 17:01:01', 'modified': '2011-11-24 15:17:14',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1309508838', '_last_update': '1321601347',
'colour': 'White:FFF', 'colour': 'White:FFF',
'default_print_format': 'Standard',
'doctype': 'DocType', 'doctype': 'DocType',
'module': 'Accounts', 'module': 'Accounts',
'name': '__common__', 'name': '__common__',
@ -23,7 +24,7 @@
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'subject': 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding', 'subject': 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding',
'version': 518 'version': 522
}, },
# These values are common for all DocField # These values are common for all DocField
@ -57,7 +58,6 @@
'cancel': 0, 'cancel': 0,
'create': 0, 'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 1,
'permlevel': 1, 'permlevel': 1,
'role': 'Accounts Manager', 'role': 'Accounts Manager',
'submit': 0, 'submit': 0,
@ -70,7 +70,6 @@
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 2,
'permlevel': 0, 'permlevel': 0,
'role': 'Accounts Manager', 'role': 'Accounts Manager',
'submit': 1, 'submit': 1,
@ -83,7 +82,6 @@
'cancel': 0, 'cancel': 0,
'create': 0, 'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 3,
'permlevel': 1, 'permlevel': 1,
'role': 'Accounts User', 'role': 'Accounts User',
'submit': 0, 'submit': 0,
@ -93,7 +91,6 @@
# DocPerm # DocPerm
{ {
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 4,
'permlevel': 1, 'permlevel': 1,
'role': 'Purchase User' 'role': 'Purchase User'
}, },
@ -104,7 +101,6 @@
'cancel': 0, 'cancel': 0,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 5,
'permlevel': 0, 'permlevel': 0,
'role': 'Purchase User', 'role': 'Purchase User',
'submit': 0, 'submit': 0,
@ -117,7 +113,6 @@
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 6,
'permlevel': 0, 'permlevel': 0,
'role': 'Accounts User', 'role': 'Accounts User',
'submit': 1, 'submit': 1,
@ -127,7 +122,6 @@
# DocPerm # DocPerm
{ {
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 7,
'match': 'supplier', 'match': 'supplier',
'permlevel': 0, 'permlevel': 0,
'role': 'Supplier' 'role': 'Supplier'
@ -138,7 +132,6 @@
'allow_on_submit': 0, 'allow_on_submit': 0,
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 1,
'label': 'Basic Info', 'label': 'Basic Info',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -148,7 +141,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 2,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
@ -161,7 +153,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'naming_series', 'fieldname': 'naming_series',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 3,
'label': 'Series', 'label': 'Series',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'naming_series', 'oldfieldname': 'naming_series',
@ -179,7 +170,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'credit_to', 'fieldname': 'credit_to',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 4,
'in_filter': 1, 'in_filter': 1,
'label': 'Credit To', 'label': 'Credit To',
'oldfieldname': 'credit_to', 'oldfieldname': 'credit_to',
@ -197,7 +187,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'amended_from', 'fieldname': 'amended_from',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 5,
'label': 'Amended From', 'label': 'Amended From',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'amended_from', 'oldfieldname': 'amended_from',
@ -214,14 +203,12 @@
'fieldname': 'supplier', 'fieldname': 'supplier',
'fieldtype': 'Link', 'fieldtype': 'Link',
'hidden': 0, 'hidden': 0,
'idx': 6,
'label': 'Supplier', 'label': 'Supplier',
'oldfieldname': 'supplier', 'oldfieldname': 'supplier',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Supplier', 'options': 'Supplier',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
@ -230,11 +217,8 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'supplier_address', 'fieldname': 'supplier_address',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 7,
'label': 'Supplier Address', 'label': 'Supplier Address',
'options': 'Address', 'permlevel': 0
'permlevel': 0,
'print_hide': 1
}, },
# DocField # DocField
@ -242,7 +226,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_person', 'fieldname': 'contact_person',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 8,
'label': 'Contact Person', 'label': 'Contact Person',
'options': 'Contact', 'options': 'Contact',
'permlevel': 0, 'permlevel': 0,
@ -254,7 +237,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'supplier_name', 'fieldname': 'supplier_name',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 9,
'label': 'Name', 'label': 'Name',
'oldfieldname': 'supplier_name', 'oldfieldname': 'supplier_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@ -266,7 +248,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'address_display', 'fieldname': 'address_display',
'fieldtype': 'Small Text', 'fieldtype': 'Small Text',
'idx': 10,
'label': 'Address', 'label': 'Address',
'permlevel': 1 'permlevel': 1
}, },
@ -276,7 +257,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_display', 'fieldname': 'contact_display',
'fieldtype': 'Small Text', 'fieldtype': 'Small Text',
'idx': 11,
'label': 'Contact', 'label': 'Contact',
'permlevel': 1 'permlevel': 1
}, },
@ -286,7 +266,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_mobile', 'fieldname': 'contact_mobile',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 12,
'label': 'Mobile No', 'label': 'Mobile No',
'permlevel': 1 'permlevel': 1
}, },
@ -296,7 +275,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_email', 'fieldname': 'contact_email',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 13,
'label': 'Contact Email', 'label': 'Contact Email',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1 'print_hide': 1
@ -306,7 +284,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 14,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0, 'permlevel': 0,
'reqd': 0, 'reqd': 0,
@ -319,7 +296,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'voucher_date', 'fieldname': 'voucher_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 15,
'in_filter': 1, 'in_filter': 1,
'label': 'Voucher Date', 'label': 'Voucher Date',
'no_copy': 0, 'no_copy': 0,
@ -327,7 +303,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -335,7 +311,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'due_date', 'fieldname': 'due_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 16,
'in_filter': 1, 'in_filter': 1,
'label': 'Due Date', 'label': 'Due Date',
'no_copy': 0, 'no_copy': 0,
@ -343,7 +318,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -353,7 +328,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'posting_date', 'fieldname': 'posting_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 17,
'in_filter': 1, 'in_filter': 1,
'label': 'Posting Date', 'label': 'Posting Date',
'no_copy': 0, 'no_copy': 0,
@ -371,7 +345,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'bill_no', 'fieldname': 'bill_no',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 18,
'in_filter': 1, 'in_filter': 1,
'label': 'Bill No', 'label': 'Bill No',
'oldfieldname': 'bill_no', 'oldfieldname': 'bill_no',
@ -379,7 +352,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -387,7 +360,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'bill_date', 'fieldname': 'bill_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 19,
'in_filter': 1, 'in_filter': 1,
'label': 'Bill Date', 'label': 'Bill Date',
'oldfieldname': 'bill_date', 'oldfieldname': 'bill_date',
@ -395,7 +367,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -404,7 +376,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'amendment_date', 'fieldname': 'amendment_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 20,
'label': 'Amendment Date', 'label': 'Amendment Date',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'amendment_date', 'oldfieldname': 'amendment_date',
@ -418,7 +389,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'mode_of_payment', 'fieldname': 'mode_of_payment',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 21,
'label': 'Mode of Payment', 'label': 'Mode of Payment',
'oldfieldname': 'mode_of_payment', 'oldfieldname': 'mode_of_payment',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
@ -430,7 +400,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 22,
'label': 'Items', 'label': 'Items',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -443,7 +412,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'purchase_order_main', 'fieldname': 'purchase_order_main',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 23,
'label': 'Purchase Order', 'label': 'Purchase Order',
'oldfieldname': 'purchase_order_main', 'oldfieldname': 'purchase_order_main',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
@ -460,7 +428,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'purchase_receipt_main', 'fieldname': 'purchase_receipt_main',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 24,
'label': 'Purchase Receipt', 'label': 'Purchase Receipt',
'oldfieldname': 'purchase_receipt_main', 'oldfieldname': 'purchase_receipt_main',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
@ -475,7 +442,6 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 25,
'label': 'Get Items', 'label': 'Get Items',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'options': 'pull_details', 'options': 'pull_details',
@ -486,7 +452,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 26,
'permlevel': 0 'permlevel': 0
}, },
@ -495,14 +460,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'currency', 'fieldname': 'currency',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 27,
'label': 'Bill Currency', 'label': 'Bill Currency',
'oldfieldname': 'currency', 'oldfieldname': 'currency',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Currency', 'options': 'link:Currency',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1
'reqd': 1
}, },
# DocField # DocField
@ -512,29 +475,26 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'conversion_rate', 'fieldname': 'conversion_rate',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 28,
'label': 'Bill Conversion Rate', 'label': 'Bill Conversion Rate',
'oldfieldname': 'conversion_rate', 'oldfieldname': 'conversion_rate',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1
'reqd': 1
}, },
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 29,
'permlevel': 0 'permlevel': 0
}, },
# DocField # DocField
{ {
'allow_on_submit': 1,
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'entries', 'fieldname': 'entries',
'fieldtype': 'Table', 'fieldtype': 'Table',
'idx': 30,
'label': 'Entries', 'label': 'Entries',
'oldfieldname': 'entries', 'oldfieldname': 'entries',
'oldfieldtype': 'Table', 'oldfieldtype': 'Table',
@ -546,7 +506,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 31,
'label': 'Recalculate', 'label': 'Recalculate',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,
@ -559,7 +518,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'net_total', 'fieldname': 'net_total',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 32,
'label': 'Net Total', 'label': 'Net Total',
'oldfieldname': 'net_total', 'oldfieldname': 'net_total',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -573,7 +531,6 @@
'description': 'Add / Edit taxes and other charges', 'description': 'Add / Edit taxes and other charges',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 33,
'label': 'Taxes', 'label': 'Taxes',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -584,7 +541,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'purchase_other_charges', 'fieldname': 'purchase_other_charges',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 34,
'label': 'Purchase Other Charges', 'label': 'Purchase Other Charges',
'oldfieldname': 'purchase_other_charges', 'oldfieldname': 'purchase_other_charges',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
@ -597,7 +553,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 35,
'label': 'Get Tax Detail', 'label': 'Get Tax Detail',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'options': 'get_purchase_tax_details', 'options': 'get_purchase_tax_details',
@ -610,7 +565,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'purchase_tax_details', 'fieldname': 'purchase_tax_details',
'fieldtype': 'Table', 'fieldtype': 'Table',
'idx': 36,
'label': 'Purchase Tax Details', 'label': 'Purchase Tax Details',
'oldfieldname': 'purchase_tax_details', 'oldfieldname': 'purchase_tax_details',
'oldfieldtype': 'Table', 'oldfieldtype': 'Table',
@ -622,7 +576,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 37,
'label': 'Calculate Tax', 'label': 'Calculate Tax',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,
@ -634,7 +587,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 38,
'label': 'Tax Calculation', 'label': 'Tax Calculation',
'oldfieldtype': 'HTML', 'oldfieldtype': 'HTML',
'permlevel': 0, 'permlevel': 0,
@ -646,7 +598,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'total_tax', 'fieldname': 'total_tax',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 39,
'label': 'Total Tax', 'label': 'Total Tax',
'oldfieldname': 'total_tax', 'oldfieldname': 'total_tax',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -658,7 +609,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 40,
'label': 'More Info', 'label': 'More Info',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0, 'permlevel': 0,
@ -669,7 +619,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 41,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
@ -683,7 +632,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'is_opening', 'fieldname': 'is_opening',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 42,
'in_filter': 1, 'in_filter': 1,
'label': 'Is Opening', 'label': 'Is Opening',
'oldfieldname': 'is_opening', 'oldfieldname': 'is_opening',
@ -691,33 +639,15 @@
'options': 'No\nYes', 'options': 'No\nYes',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 0, 'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
# DocField
{
'colour': 'White:FFF',
'description': 'Track this Purchase Invoice against any Project',
'doctype': 'DocField',
'fieldname': 'project_name',
'fieldtype': 'Link',
'idx': 43,
'in_filter': 1,
'label': 'Project Name',
'oldfieldname': 'project_name',
'oldfieldtype': 'Link',
'options': 'Project',
'permlevel': 0,
'search_index': 1
},
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'aging_date', 'fieldname': 'aging_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 44,
'label': 'Aging Date', 'label': 'Aging Date',
'oldfieldname': 'aging_date', 'oldfieldname': 'aging_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
@ -733,7 +663,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'select_print_heading', 'fieldname': 'select_print_heading',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 45,
'label': 'Select Print Heading', 'label': 'Select Print Heading',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'select_print_heading', 'oldfieldname': 'select_print_heading',
@ -749,7 +678,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 46,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
@ -760,7 +688,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'company', 'fieldname': 'company',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 47,
'in_filter': 1, 'in_filter': 1,
'label': 'Company', 'label': 'Company',
'oldfieldname': 'company', 'oldfieldname': 'company',
@ -768,8 +695,7 @@
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'search_index': 1
'search_index': 0
}, },
# DocField # DocField
@ -777,7 +703,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'fiscal_year', 'fieldname': 'fiscal_year',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 48,
'in_filter': 1, 'in_filter': 1,
'label': 'Fiscal Year', 'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year', 'oldfieldname': 'fiscal_year',
@ -785,8 +710,7 @@
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'search_index': 1
'search_index': 0
}, },
# DocField # DocField
@ -796,7 +720,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'cancel_reason', 'fieldname': 'cancel_reason',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 49,
'label': 'Cancel Reason', 'label': 'Cancel Reason',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'cancel_reason', 'oldfieldname': 'cancel_reason',
@ -810,7 +733,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'remarks', 'fieldname': 'remarks',
'fieldtype': 'Small Text', 'fieldtype': 'Small Text',
'idx': 50,
'label': 'Remarks', 'label': 'Remarks',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'remarks', 'oldfieldname': 'remarks',
@ -824,7 +746,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 51,
'label': 'Advances', 'label': 'Advances',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0, 'permlevel': 0,
@ -835,7 +756,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 52,
'label': 'Get Advances Paid', 'label': 'Get Advances Paid',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'options': 'get_advances', 'options': 'get_advances',
@ -849,7 +769,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'advance_allocation_details', 'fieldname': 'advance_allocation_details',
'fieldtype': 'Table', 'fieldtype': 'Table',
'idx': 53,
'label': 'Advance Allocation Details', 'label': 'Advance Allocation Details',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'advance_allocation_details', 'oldfieldname': 'advance_allocation_details',
@ -863,7 +782,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 54,
'label': 'TDS', 'label': 'TDS',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -873,7 +791,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 55,
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
}, },
@ -883,7 +800,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'tds_applicable', 'fieldname': 'tds_applicable',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 56,
'label': 'TDS Applicable', 'label': 'TDS Applicable',
'oldfieldname': 'tds_applicable', 'oldfieldname': 'tds_applicable',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
@ -897,7 +813,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'tds_category', 'fieldname': 'tds_category',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 57,
'label': 'TDS Category', 'label': 'TDS Category',
'oldfieldname': 'tds_category', 'oldfieldname': 'tds_category',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
@ -911,7 +826,6 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 58,
'label': 'Get TDS', 'label': 'Get TDS',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'permlevel': 0, 'permlevel': 0,
@ -923,7 +837,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 59,
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
}, },
@ -933,7 +846,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'tax_code', 'fieldname': 'tax_code',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 60,
'label': 'TDS Account Head', 'label': 'TDS Account Head',
'oldfieldname': 'tax_code', 'oldfieldname': 'tax_code',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
@ -947,7 +859,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'rate', 'fieldname': 'rate',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 61,
'label': 'Rate', 'label': 'Rate',
'oldfieldname': 'rate', 'oldfieldname': 'rate',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -960,7 +871,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'ded_amount', 'fieldname': 'ded_amount',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 62,
'label': 'TDS Amount', 'label': 'TDS Amount',
'oldfieldname': 'ded_amount', 'oldfieldname': 'ded_amount',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -972,7 +882,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 63,
'label': 'Totals', 'label': 'Totals',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@ -982,7 +891,6 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 64,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
@ -993,7 +901,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'other_charges_added', 'fieldname': 'other_charges_added',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 65,
'label': 'Other Charges Added', 'label': 'Other Charges Added',
'oldfieldname': 'other_charges_added', 'oldfieldname': 'other_charges_added',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1006,7 +913,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'other_charges_deducted', 'fieldname': 'other_charges_deducted',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 66,
'label': 'Other Charges Deducted', 'label': 'Other Charges Deducted',
'oldfieldname': 'other_charges_deducted', 'oldfieldname': 'other_charges_deducted',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1019,7 +925,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'total_tds_on_voucher', 'fieldname': 'total_tds_on_voucher',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 67,
'label': 'Total TDS On Voucher', 'label': 'Total TDS On Voucher',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'total_tds_on_voucher', 'oldfieldname': 'total_tds_on_voucher',
@ -1034,7 +939,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'tds_amount_on_advance', 'fieldname': 'tds_amount_on_advance',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 68,
'label': 'TDS Amount On Advance', 'label': 'TDS Amount On Advance',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'tds_amount_on_advance', 'oldfieldname': 'tds_amount_on_advance',
@ -1048,7 +952,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'total_advance', 'fieldname': 'total_advance',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 69,
'label': 'Total Advance (Incl. TDS)', 'label': 'Total Advance (Incl. TDS)',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'total_advance', 'oldfieldname': 'total_advance',
@ -1063,7 +966,6 @@
'fieldname': 'total_amount_to_pay', 'fieldname': 'total_amount_to_pay',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'hidden': 0, 'hidden': 0,
'idx': 70,
'label': 'Total Amount To Pay', 'label': 'Total Amount To Pay',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'total_amount_to_pay', 'oldfieldname': 'total_amount_to_pay',
@ -1077,7 +979,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'outstanding_amount', 'fieldname': 'outstanding_amount',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 71,
'in_filter': 1, 'in_filter': 1,
'label': 'Outstanding Amount', 'label': 'Outstanding Amount',
'no_copy': 1, 'no_copy': 1,
@ -1085,14 +986,13 @@
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 72,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
@ -1104,7 +1004,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'grand_total', 'fieldname': 'grand_total',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 73,
'label': 'Grand Total', 'label': 'Grand Total',
'oldfieldname': 'grand_total', 'oldfieldname': 'grand_total',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1119,7 +1018,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'in_words', 'fieldname': 'in_words',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 74,
'label': 'In Words', 'label': 'In Words',
'oldfieldname': 'in_words', 'oldfieldname': 'in_words',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@ -1132,7 +1030,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'net_total_import', 'fieldname': 'net_total_import',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 75,
'label': 'Net Total (Import)', 'label': 'Net Total (Import)',
'oldfieldname': 'net_total_import', 'oldfieldname': 'net_total_import',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1145,7 +1042,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'other_charges_added_import', 'fieldname': 'other_charges_added_import',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 76,
'label': 'Other Charges Added (Import)', 'label': 'Other Charges Added (Import)',
'oldfieldname': 'other_charges_added_import', 'oldfieldname': 'other_charges_added_import',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1158,7 +1054,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'other_charges_deducted_import', 'fieldname': 'other_charges_deducted_import',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 77,
'label': 'Other Charges Deducted (Import)', 'label': 'Other Charges Deducted (Import)',
'oldfieldname': 'other_charges_deducted_import', 'oldfieldname': 'other_charges_deducted_import',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1171,7 +1066,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'grand_total_import', 'fieldname': 'grand_total_import',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 78,
'label': 'Grand Total (Import)', 'label': 'Grand Total (Import)',
'oldfieldname': 'grand_total_import', 'oldfieldname': 'grand_total_import',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
@ -1186,7 +1080,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'in_words_import', 'fieldname': 'in_words_import',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 79,
'label': 'In Words (Import)', 'label': 'In Words (Import)',
'oldfieldname': 'in_words_import', 'oldfieldname': 'in_words_import',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@ -1200,7 +1093,6 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 80,
'label': 'Actions', 'label': 'Actions',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0, 'permlevel': 0,
@ -1212,7 +1104,6 @@
'allow_on_submit': 1, 'allow_on_submit': 1,
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 81,
'label': 'Repair Outstanding Amt', 'label': 'Repair Outstanding Amt',
'oldfieldtype': 'Button', 'oldfieldtype': 'Button',
'options': 'repair_pv_outstanding', 'options': 'repair_pv_outstanding',
@ -1226,7 +1117,6 @@
'fieldname': 'against_expense_account', 'fieldname': 'against_expense_account',
'fieldtype': 'Small Text', 'fieldtype': 'Small Text',
'hidden': 1, 'hidden': 1,
'idx': 82,
'label': 'Against Expense Account', 'label': 'Against Expense Account',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'against_expense_account', 'oldfieldname': 'against_expense_account',

42
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': '2011-12-08 16:51:09', 'modified': '2011-12-08 15:58:58',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@ -21,7 +21,7 @@
'section_style': 'Tray', 'section_style': 'Tray',
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 30 'version': 28
}, },
# These values are common for all DocField # These values are common for all DocField
@ -123,15 +123,6 @@
'trigger': 'Client' 'trigger': 'Client'
}, },
# DocField
{
'doctype': 'DocField',
'fieldname': 'purchase_ref_rate',
'fieldtype': 'Currency',
'label': 'Ref Rate *',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
@ -146,15 +137,6 @@
'trigger': 'Client' 'trigger': 'Client'
}, },
# DocField
{
'doctype': 'DocField',
'fieldname': 'import_ref_rate',
'fieldtype': 'Currency',
'label': 'Ref Rate ',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
@ -321,5 +303,23 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 1 'report_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'purchase_ref_rate',
'fieldtype': 'Currency',
'label': 'Ref Rate *',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'import_ref_rate',
'fieldtype': 'Currency',
'label': 'Ref Rate ',
'permlevel': 0
} }
] ]

6
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': '2011-12-08 16:46:57', 'modified': '2011-12-08 16:05:27',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@ -21,7 +21,7 @@
'section_style': 'Tray', 'section_style': 'Tray',
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 56 'version': 54
}, },
# These values are common for all DocField # These values are common for all DocField
@ -435,4 +435,4 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1
} }
] ]

7
erpnext/patches/Discount_purchase_cycle.py Executable file
View File

@ -0,0 +1,7 @@
def execute():
import webnotes
from webnotes.modules.module_manager import reload_doc
reload_doc('accounts', 'doctype', 'pv_detail')
reload_doc('buying', 'doctype', 'po_detail')
reload_doc('stock', 'doctype', 'purchase_receipt_detail')

0
erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt Normal file → Executable file
View File

6
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': '2011-12-08 16:49:08', 'modified': '2011-12-08 17:28:34',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@ -21,7 +21,7 @@
'section_style': 'Tray', 'section_style': 'Tray',
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 66 'version': 69
}, },
# These values are common for all DocField # These values are common for all DocField
@ -555,4 +555,4 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1
} }
] ]