From 296c17b7ae525f479585560d44cbabe191f176ec Mon Sep 17 00:00:00 2001 From: Nijil Date: Fri, 18 Nov 2011 14:12:06 +0530 Subject: [PATCH 01/11] checking --- .../doctype/purchase_common/purchase_common.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index f91b1d88c7..c17623521c 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -125,6 +125,12 @@ cur_frm.cscript.import_rate = function(doc, cdt, cdn) { cur_frm.cscript.calc_amount(doc, 1); } +//==================== Discount Rate ================================================================ +cur_frm.cscript.discount_rate = function(doc, cdt, cdn) { + // Calculate Amount + cur_frm.cscript.calc_amount(doc, 4); +} + //====================== Calculate Amount ============================================================ /*cur_frm.cscript.calc_amount = function(doc, n) { @@ -245,16 +251,25 @@ cur_frm.cscript.calc_amount = function(doc, n) { set_multiple(tname, cl[i].name, {'purchase_rate': flt(doc.conversion_rate) * flt(cl[i].import_rate) }, fname); set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(doc.conversion_rate) * flt(cl[i].import_rate))}, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].import_rate))}, fname); + //dicount value should be changed } if(n == 2){ set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate)), 'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate)) }, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); - } + //discount value should be changed + } if(n == 3){ set_multiple(tname, cl[i].name, {'purchase_rate': flt(flt(cl[i].amount) / flt(cl[i].qty)) }, fname); set_multiple(tname, cl[i].name, {'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); } + if( n==4){ + if(cl[i].purchase_ref_rate && !cl[i].import_ref_rate ){ + set_multiple(tname, cl[i].name, {' + } + + + if (n != 3){ net_total += flt(flt(cl[i].qty) * flt(cl[i].purchase_rate)); net_total_import += flt(flt(cl[i].qty) * flt(cl[i].import_rate)); From c7d64cf5a84d3e86b52cd4c50b70ae237214ccc8 Mon Sep 17 00:00:00 2001 From: Nijil Date: Sun, 20 Nov 2011 00:22:41 +0530 Subject: [PATCH 02/11] almost --- .../purchase_common/purchase_common.js | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index c17623521c..d652779d3f 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -130,6 +130,11 @@ cur_frm.cscript.discount_rate = function(doc, cdt, cdn) { // Calculate Amount cur_frm.cscript.calc_amount(doc, 4); } +//==================== Purchase Ref Rate ================================================================ +cur_frm.cscript.purchase_ref_rate = function(doc, cdt, cdn) { + // Calculate Amount + cur_frm.cscript.calc_amount(doc, 4); +} //====================== Calculate Amount ============================================================ @@ -251,25 +256,30 @@ cur_frm.cscript.calc_amount = function(doc, n) { set_multiple(tname, cl[i].name, {'purchase_rate': flt(doc.conversion_rate) * flt(cl[i].import_rate) }, fname); set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(doc.conversion_rate) * flt(cl[i].import_rate))}, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].import_rate))}, fname); + if(cl[i].import_ref_rate){ + set_multiple(tname, cl[i].name, {'purchase_ref_rate':flt(cl[i].import_ref_rate)*flt(doc.conversion_rate)}, fname); + } //dicount value should be changed } if(n == 2){ set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate)), 'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate)) }, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); - //discount value should be changed + set_multiple(tname, cl[i].name, {'purchase_ref_rate':flt(cl[i].import_ref_rate)*flt(doc.conversion_rate)}, fname); + //discount value should be changed } if(n == 3){ set_multiple(tname, cl[i].name, {'purchase_rate': flt(flt(cl[i].amount) / flt(cl[i].qty)) }, fname); set_multiple(tname, cl[i].name, {'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); } - if( n==4){ - if(cl[i].purchase_ref_rate && !cl[i].import_ref_rate ){ - set_multiple(tname, cl[i].name, {' - } - - - + if( n==4){ + set_multiple(tname, cl[i].name, {'import_ref_rate': flt(flt(cl[i].purchase_ref_rate) / flt(doc.conversion_rate))}, fname); + set_multiple(tname, cl[i].name, {'purchase_rate':flt( flt(cl[i].purchase_ref_rate) - flt(flt(cl[i].purchase_ref_rate)*flt(cl[i].discount_rate)/100) )}, fname); + set_multiple(tname, cl[i].name, {'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); + set_multiple(tname, cl[i].name, {'amount':flt(flt(cl[i].qty) * flt(cl[i].purchase_rate))}, fname); + set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); + + } if (n != 3){ net_total += flt(flt(cl[i].qty) * flt(cl[i].purchase_rate)); net_total_import += flt(flt(cl[i].qty) * flt(cl[i].import_rate)); From 4491f01ce4848cc87c5adb9f917d1ae8d0a183bc Mon Sep 17 00:00:00 2001 From: Nijil Date: Mon, 21 Nov 2011 11:31:27 +0530 Subject: [PATCH 03/11] discount rate on purchase --- .../purchase_common/purchase_common.js | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index d652779d3f..f123fd5cfc 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -135,6 +135,11 @@ cur_frm.cscript.purchase_ref_rate = function(doc, cdt, cdn) { // Calculate Amount cur_frm.cscript.calc_amount(doc, 4); } +//==================== Import Ref Rate ================================================================ +cur_frm.cscript.import_ref_rate = function(doc, cdt, cdn) { + // Calculate Amount + cur_frm.cscript.calc_amount(doc, 5); +} //====================== Calculate Amount ============================================================ @@ -253,19 +258,18 @@ cur_frm.cscript.calc_amount = function(doc, n) { for(var i=0;i Date: Tue, 22 Nov 2011 15:12:00 +0530 Subject: [PATCH 04/11] Added Discount in Purchase Cycle --- .../accounts/doctype/payable_voucher/payable_voucher.js | 1 + erpnext/buying/doctype/purchase_common/purchase_common.js | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js index 550c014997..8c61727e00 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js @@ -333,6 +333,7 @@ cur_frm.cscript.calc_total = function(doc) { var el = getchildren('PV Detail',doc.name,'entries'); for(var i in el) { 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, {'import_amount': flt(el[i].qty) * flt(el[i].import_rate) }, 'entries'); } diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index f123fd5cfc..029a413ccc 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -258,6 +258,7 @@ cur_frm.cscript.calc_amount = function(doc, n) { for(var i=0;i Date: Tue, 22 Nov 2011 15:21:42 +0530 Subject: [PATCH 05/11] patch for Discount Rate --- erpnext/patches/Discount_purchase_cycle.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 erpnext/patches/Discount_purchase_cycle.py diff --git a/erpnext/patches/Discount_purchase_cycle.py b/erpnext/patches/Discount_purchase_cycle.py new file mode 100644 index 0000000000..0edc6430fe --- /dev/null +++ b/erpnext/patches/Discount_purchase_cycle.py @@ -0,0 +1,7 @@ +def execute(): + import webnotes + from webnotes.modules.module_manager import reload_doc + + reload_doc('accounts', 'doctype', 'payable_voucher') + reload_doc('buying', 'doctype', 'purchase_common') + reload_doc('stock', 'doctype', 'purchase_receipt_detail') From c37dad26d95b6b24e51101b9746c30a3b6dcd9fe Mon Sep 17 00:00:00 2001 From: Nijil Date: Thu, 24 Nov 2011 15:07:54 +0530 Subject: [PATCH 06/11] txt files --- .../accounts/doctype/pv_detail/pv_detail.txt | 31 ++++++++++++++++-- .../buying/doctype/po_detail/po_detail.txt | 32 +++++++++++++++++-- 2 files changed, 59 insertions(+), 4 deletions(-) mode change 100644 => 100755 erpnext/accounts/doctype/pv_detail/pv_detail.txt mode change 100644 => 100755 erpnext/buying/doctype/po_detail/po_detail.txt diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt old mode 100644 new mode 100755 index 1c1c0ae97a..eb2497611c --- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt +++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:17', 'docstatus': 0, - 'modified': '2011-10-20 18:41:17', + 'modified': '2011-11-24 15:07:02', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 27 + 'version': 31 }, # These values are common for all DocField @@ -308,5 +308,32 @@ 'permlevel': 0, 'print_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 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount Rate', + 'permlevel': 0 } ] \ No newline at end of file diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt old mode 100644 new mode 100755 index bfd014e237..d79c8a676a --- a/erpnext/buying/doctype/po_detail/po_detail.txt +++ b/erpnext/buying/doctype/po_detail/po_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:12', 'docstatus': 0, - 'modified': '2011-10-20 18:39:20', + 'modified': '2011-11-24 15:04:47', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 54 + 'version': 68 }, # These values are common for all DocField @@ -134,6 +134,25 @@ 'width': '100px' }, + # DocField + { + 'default': '0', + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'purchase_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate *', + 'permlevel': 0 + }, + # DocField { 'default': '0.00', @@ -164,6 +183,15 @@ 'reqd': 1 }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate ', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', From ba40bc93fe4f56f0e1a7a220a05a53bce37f31d6 Mon Sep 17 00:00:00 2001 From: Nijil Date: Thu, 24 Nov 2011 15:14:09 +0530 Subject: [PATCH 07/11] payable voucher txt --- erpnext/accounts/doctype/payable_voucher/payable_voucher.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 erpnext/accounts/doctype/payable_voucher/payable_voucher.txt diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt old mode 100644 new mode 100755 From 2f82c2934870fb23facf0a94def31d9511afb9dd Mon Sep 17 00:00:00 2001 From: Nijil Date: Thu, 24 Nov 2011 15:18:17 +0530 Subject: [PATCH 08/11] .. --- .../payable_voucher/payable_voucher.txt | 142 ++---------------- 1 file changed, 16 insertions(+), 126 deletions(-) diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt index c77db19dd2..93014ec2b8 100755 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt @@ -5,15 +5,16 @@ { 'creation': '2010-08-08 17:09:11', 'docstatus': 0, - 'modified': '2011-06-21 17:01:01', + 'modified': '2011-11-24 15:17:14', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1309508838', + '_last_update': '1321601347', 'colour': 'White:FFF', + 'default_print_format': 'Standard', 'doctype': 'DocType', 'module': 'Accounts', 'name': '__common__', @@ -23,7 +24,7 @@ 'server_code_error': ' ', 'show_in_menu': 0, '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 @@ -57,7 +58,6 @@ 'cancel': 0, 'create': 0, 'doctype': 'DocPerm', - 'idx': 1, 'permlevel': 1, 'role': 'Accounts Manager', 'submit': 0, @@ -70,7 +70,6 @@ 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 2, 'permlevel': 0, 'role': 'Accounts Manager', 'submit': 1, @@ -83,7 +82,6 @@ 'cancel': 0, 'create': 0, 'doctype': 'DocPerm', - 'idx': 3, 'permlevel': 1, 'role': 'Accounts User', 'submit': 0, @@ -93,7 +91,6 @@ # DocPerm { 'doctype': 'DocPerm', - 'idx': 4, 'permlevel': 1, 'role': 'Purchase User' }, @@ -104,7 +101,6 @@ 'cancel': 0, 'create': 1, 'doctype': 'DocPerm', - 'idx': 5, 'permlevel': 0, 'role': 'Purchase User', 'submit': 0, @@ -117,7 +113,6 @@ 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 6, 'permlevel': 0, 'role': 'Accounts User', 'submit': 1, @@ -127,7 +122,6 @@ # DocPerm { 'doctype': 'DocPerm', - 'idx': 7, 'match': 'supplier', 'permlevel': 0, 'role': 'Supplier' @@ -138,7 +132,6 @@ 'allow_on_submit': 0, 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 1, 'label': 'Basic Info', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -148,7 +141,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 2, 'oldfieldtype': 'Column Break', 'permlevel': 0, 'width': '50%' @@ -161,7 +153,6 @@ 'doctype': 'DocField', 'fieldname': 'naming_series', 'fieldtype': 'Select', - 'idx': 3, 'label': 'Series', 'no_copy': 1, 'oldfieldname': 'naming_series', @@ -179,7 +170,6 @@ 'doctype': 'DocField', 'fieldname': 'credit_to', 'fieldtype': 'Link', - 'idx': 4, 'in_filter': 1, 'label': 'Credit To', 'oldfieldname': 'credit_to', @@ -197,7 +187,6 @@ 'doctype': 'DocField', 'fieldname': 'amended_from', 'fieldtype': 'Link', - 'idx': 5, 'label': 'Amended From', 'no_copy': 1, 'oldfieldname': 'amended_from', @@ -214,14 +203,12 @@ 'fieldname': 'supplier', 'fieldtype': 'Link', 'hidden': 0, - 'idx': 6, 'label': 'Supplier', 'oldfieldname': 'supplier', 'oldfieldtype': 'Link', 'options': 'Supplier', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1, 'trigger': 'Client' }, @@ -230,11 +217,8 @@ 'doctype': 'DocField', 'fieldname': 'supplier_address', 'fieldtype': 'Link', - 'idx': 7, 'label': 'Supplier Address', - 'options': 'Address', - 'permlevel': 0, - 'print_hide': 1 + 'permlevel': 0 }, # DocField @@ -242,7 +226,6 @@ 'doctype': 'DocField', 'fieldname': 'contact_person', 'fieldtype': 'Link', - 'idx': 8, 'label': 'Contact Person', 'options': 'Contact', 'permlevel': 0, @@ -254,7 +237,6 @@ 'doctype': 'DocField', 'fieldname': 'supplier_name', 'fieldtype': 'Text', - 'idx': 9, 'label': 'Name', 'oldfieldname': 'supplier_name', 'oldfieldtype': 'Data', @@ -266,7 +248,6 @@ 'doctype': 'DocField', 'fieldname': 'address_display', 'fieldtype': 'Small Text', - 'idx': 10, 'label': 'Address', 'permlevel': 1 }, @@ -276,7 +257,6 @@ 'doctype': 'DocField', 'fieldname': 'contact_display', 'fieldtype': 'Small Text', - 'idx': 11, 'label': 'Contact', 'permlevel': 1 }, @@ -286,7 +266,6 @@ 'doctype': 'DocField', 'fieldname': 'contact_mobile', 'fieldtype': 'Text', - 'idx': 12, 'label': 'Mobile No', 'permlevel': 1 }, @@ -296,7 +275,6 @@ 'doctype': 'DocField', 'fieldname': 'contact_email', 'fieldtype': 'Text', - 'idx': 13, 'label': 'Contact Email', 'permlevel': 1, 'print_hide': 1 @@ -306,7 +284,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 14, 'oldfieldtype': 'Column Break', 'permlevel': 0, 'reqd': 0, @@ -319,7 +296,6 @@ 'doctype': 'DocField', 'fieldname': 'voucher_date', 'fieldtype': 'Date', - 'idx': 15, 'in_filter': 1, 'label': 'Voucher Date', 'no_copy': 0, @@ -327,7 +303,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -335,7 +311,6 @@ 'doctype': 'DocField', 'fieldname': 'due_date', 'fieldtype': 'Date', - 'idx': 16, 'in_filter': 1, 'label': 'Due Date', 'no_copy': 0, @@ -343,7 +318,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'print_hide': 0, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -353,7 +328,6 @@ 'doctype': 'DocField', 'fieldname': 'posting_date', 'fieldtype': 'Date', - 'idx': 17, 'in_filter': 1, 'label': 'Posting Date', 'no_copy': 0, @@ -371,7 +345,6 @@ 'doctype': 'DocField', 'fieldname': 'bill_no', 'fieldtype': 'Data', - 'idx': 18, 'in_filter': 1, 'label': 'Bill No', 'oldfieldname': 'bill_no', @@ -379,7 +352,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -387,7 +360,6 @@ 'doctype': 'DocField', 'fieldname': 'bill_date', 'fieldtype': 'Date', - 'idx': 19, 'in_filter': 1, 'label': 'Bill Date', 'oldfieldname': 'bill_date', @@ -395,7 +367,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -404,7 +376,6 @@ 'doctype': 'DocField', 'fieldname': 'amendment_date', 'fieldtype': 'Date', - 'idx': 20, 'label': 'Amendment Date', 'no_copy': 1, 'oldfieldname': 'amendment_date', @@ -418,7 +389,6 @@ 'doctype': 'DocField', 'fieldname': 'mode_of_payment', 'fieldtype': 'Select', - 'idx': 21, 'label': 'Mode of Payment', 'oldfieldname': 'mode_of_payment', 'oldfieldtype': 'Select', @@ -430,7 +400,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 22, 'label': 'Items', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -443,7 +412,6 @@ 'doctype': 'DocField', 'fieldname': 'purchase_order_main', 'fieldtype': 'Link', - 'idx': 23, 'label': 'Purchase Order', 'oldfieldname': 'purchase_order_main', 'oldfieldtype': 'Link', @@ -460,7 +428,6 @@ 'doctype': 'DocField', 'fieldname': 'purchase_receipt_main', 'fieldtype': 'Link', - 'idx': 24, 'label': 'Purchase Receipt', 'oldfieldname': 'purchase_receipt_main', 'oldfieldtype': 'Link', @@ -475,7 +442,6 @@ 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 25, 'label': 'Get Items', 'oldfieldtype': 'Button', 'options': 'pull_details', @@ -486,7 +452,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 26, 'permlevel': 0 }, @@ -495,14 +460,12 @@ 'doctype': 'DocField', 'fieldname': 'currency', 'fieldtype': 'Select', - 'idx': 27, 'label': 'Bill Currency', 'oldfieldname': 'currency', 'oldfieldtype': 'Select', 'options': 'link:Currency', 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1 + 'print_hide': 1 }, # DocField @@ -512,29 +475,26 @@ 'doctype': 'DocField', 'fieldname': 'conversion_rate', 'fieldtype': 'Currency', - 'idx': 28, 'label': 'Bill Conversion Rate', 'oldfieldname': 'conversion_rate', 'oldfieldtype': 'Currency', 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1 + 'print_hide': 1 }, # DocField { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 29, 'permlevel': 0 }, # DocField { + 'allow_on_submit': 1, 'doctype': 'DocField', 'fieldname': 'entries', 'fieldtype': 'Table', - 'idx': 30, 'label': 'Entries', 'oldfieldname': 'entries', 'oldfieldtype': 'Table', @@ -546,7 +506,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 31, 'label': 'Recalculate', 'oldfieldtype': 'Button', 'permlevel': 0, @@ -559,7 +518,6 @@ 'doctype': 'DocField', 'fieldname': 'net_total', 'fieldtype': 'Currency', - 'idx': 32, 'label': 'Net Total', 'oldfieldname': 'net_total', 'oldfieldtype': 'Currency', @@ -573,7 +531,6 @@ 'description': 'Add / Edit taxes and other charges', 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 33, 'label': 'Taxes', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -584,7 +541,6 @@ 'doctype': 'DocField', 'fieldname': 'purchase_other_charges', 'fieldtype': 'Link', - 'idx': 34, 'label': 'Purchase Other Charges', 'oldfieldname': 'purchase_other_charges', 'oldfieldtype': 'Link', @@ -597,7 +553,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 35, 'label': 'Get Tax Detail', 'oldfieldtype': 'Button', 'options': 'get_purchase_tax_details', @@ -610,7 +565,6 @@ 'doctype': 'DocField', 'fieldname': 'purchase_tax_details', 'fieldtype': 'Table', - 'idx': 36, 'label': 'Purchase Tax Details', 'oldfieldname': 'purchase_tax_details', 'oldfieldtype': 'Table', @@ -622,7 +576,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 37, 'label': 'Calculate Tax', 'oldfieldtype': 'Button', 'permlevel': 0, @@ -634,7 +587,6 @@ { 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 38, 'label': 'Tax Calculation', 'oldfieldtype': 'HTML', 'permlevel': 0, @@ -646,7 +598,6 @@ 'doctype': 'DocField', 'fieldname': 'total_tax', 'fieldtype': 'Currency', - 'idx': 39, 'label': 'Total Tax', 'oldfieldname': 'total_tax', 'oldfieldtype': 'Currency', @@ -658,7 +609,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 40, 'label': 'More Info', 'oldfieldtype': 'Section Break', 'permlevel': 0, @@ -669,7 +619,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 41, 'oldfieldtype': 'Column Break', 'permlevel': 0, 'print_hide': 0, @@ -683,7 +632,6 @@ 'doctype': 'DocField', 'fieldname': 'is_opening', 'fieldtype': 'Select', - 'idx': 42, 'in_filter': 1, 'label': 'Is Opening', 'oldfieldname': 'is_opening', @@ -691,33 +639,15 @@ 'options': 'No\nYes', 'permlevel': 0, 'print_hide': 1, - 'search_index': 0, + 'search_index': 1, '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 { 'doctype': 'DocField', 'fieldname': 'aging_date', 'fieldtype': 'Date', - 'idx': 44, 'label': 'Aging Date', 'oldfieldname': 'aging_date', 'oldfieldtype': 'Date', @@ -733,7 +663,6 @@ 'doctype': 'DocField', 'fieldname': 'select_print_heading', 'fieldtype': 'Link', - 'idx': 45, 'label': 'Select Print Heading', 'no_copy': 1, 'oldfieldname': 'select_print_heading', @@ -749,7 +678,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 46, 'oldfieldtype': 'Column Break', 'permlevel': 0, 'width': '50%' @@ -760,7 +688,6 @@ 'doctype': 'DocField', 'fieldname': 'company', 'fieldtype': 'Link', - 'idx': 47, 'in_filter': 1, 'label': 'Company', 'oldfieldname': 'company', @@ -768,8 +695,7 @@ 'options': 'Company', 'permlevel': 0, 'print_hide': 1, - 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -777,7 +703,6 @@ 'doctype': 'DocField', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', - 'idx': 48, 'in_filter': 1, 'label': 'Fiscal Year', 'oldfieldname': 'fiscal_year', @@ -785,8 +710,7 @@ 'options': 'link:Fiscal Year', 'permlevel': 0, 'print_hide': 1, - 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -796,7 +720,6 @@ 'doctype': 'DocField', 'fieldname': 'cancel_reason', 'fieldtype': 'Data', - 'idx': 49, 'label': 'Cancel Reason', 'no_copy': 1, 'oldfieldname': 'cancel_reason', @@ -810,7 +733,6 @@ 'doctype': 'DocField', 'fieldname': 'remarks', 'fieldtype': 'Small Text', - 'idx': 50, 'label': 'Remarks', 'no_copy': 1, 'oldfieldname': 'remarks', @@ -824,7 +746,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 51, 'label': 'Advances', 'oldfieldtype': 'Section Break', 'permlevel': 0, @@ -835,7 +756,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 52, 'label': 'Get Advances Paid', 'oldfieldtype': 'Button', 'options': 'get_advances', @@ -849,7 +769,6 @@ 'doctype': 'DocField', 'fieldname': 'advance_allocation_details', 'fieldtype': 'Table', - 'idx': 53, 'label': 'Advance Allocation Details', 'no_copy': 1, 'oldfieldname': 'advance_allocation_details', @@ -863,7 +782,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 54, 'label': 'TDS', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -873,7 +791,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 55, 'permlevel': 0, 'width': '50%' }, @@ -883,7 +800,6 @@ 'doctype': 'DocField', 'fieldname': 'tds_applicable', 'fieldtype': 'Select', - 'idx': 56, 'label': 'TDS Applicable', 'oldfieldname': 'tds_applicable', 'oldfieldtype': 'Select', @@ -897,7 +813,6 @@ 'doctype': 'DocField', 'fieldname': 'tds_category', 'fieldtype': 'Select', - 'idx': 57, 'label': 'TDS Category', 'oldfieldname': 'tds_category', 'oldfieldtype': 'Select', @@ -911,7 +826,6 @@ 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 58, 'label': 'Get TDS', 'oldfieldtype': 'Button', 'permlevel': 0, @@ -923,7 +837,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 59, 'permlevel': 0, 'width': '50%' }, @@ -933,7 +846,6 @@ 'doctype': 'DocField', 'fieldname': 'tax_code', 'fieldtype': 'Link', - 'idx': 60, 'label': 'TDS Account Head', 'oldfieldname': 'tax_code', 'oldfieldtype': 'Link', @@ -947,7 +859,6 @@ 'doctype': 'DocField', 'fieldname': 'rate', 'fieldtype': 'Currency', - 'idx': 61, 'label': 'Rate', 'oldfieldname': 'rate', 'oldfieldtype': 'Currency', @@ -960,7 +871,6 @@ 'doctype': 'DocField', 'fieldname': 'ded_amount', 'fieldtype': 'Currency', - 'idx': 62, 'label': 'TDS Amount', 'oldfieldname': 'ded_amount', 'oldfieldtype': 'Currency', @@ -972,7 +882,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 63, 'label': 'Totals', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -982,7 +891,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 64, 'oldfieldtype': 'Column Break', 'permlevel': 0, 'width': '50%' @@ -993,7 +901,6 @@ 'doctype': 'DocField', 'fieldname': 'other_charges_added', 'fieldtype': 'Currency', - 'idx': 65, 'label': 'Other Charges Added', 'oldfieldname': 'other_charges_added', 'oldfieldtype': 'Currency', @@ -1006,7 +913,6 @@ 'doctype': 'DocField', 'fieldname': 'other_charges_deducted', 'fieldtype': 'Currency', - 'idx': 66, 'label': 'Other Charges Deducted', 'oldfieldname': 'other_charges_deducted', 'oldfieldtype': 'Currency', @@ -1019,7 +925,6 @@ 'doctype': 'DocField', 'fieldname': 'total_tds_on_voucher', 'fieldtype': 'Currency', - 'idx': 67, 'label': 'Total TDS On Voucher', 'no_copy': 1, 'oldfieldname': 'total_tds_on_voucher', @@ -1034,7 +939,6 @@ 'doctype': 'DocField', 'fieldname': 'tds_amount_on_advance', 'fieldtype': 'Currency', - 'idx': 68, 'label': 'TDS Amount On Advance', 'no_copy': 1, 'oldfieldname': 'tds_amount_on_advance', @@ -1048,7 +952,6 @@ 'doctype': 'DocField', 'fieldname': 'total_advance', 'fieldtype': 'Currency', - 'idx': 69, 'label': 'Total Advance (Incl. TDS)', 'no_copy': 1, 'oldfieldname': 'total_advance', @@ -1063,7 +966,6 @@ 'fieldname': 'total_amount_to_pay', 'fieldtype': 'Currency', 'hidden': 0, - 'idx': 70, 'label': 'Total Amount To Pay', 'no_copy': 1, 'oldfieldname': 'total_amount_to_pay', @@ -1077,7 +979,6 @@ 'doctype': 'DocField', 'fieldname': 'outstanding_amount', 'fieldtype': 'Currency', - 'idx': 71, 'in_filter': 1, 'label': 'Outstanding Amount', 'no_copy': 1, @@ -1085,14 +986,13 @@ 'oldfieldtype': 'Currency', 'permlevel': 1, 'print_hide': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 72, 'oldfieldtype': 'Column Break', 'permlevel': 0, 'print_hide': 1, @@ -1104,7 +1004,6 @@ 'doctype': 'DocField', 'fieldname': 'grand_total', 'fieldtype': 'Currency', - 'idx': 73, 'label': 'Grand Total', 'oldfieldname': 'grand_total', 'oldfieldtype': 'Currency', @@ -1119,7 +1018,6 @@ 'doctype': 'DocField', 'fieldname': 'in_words', 'fieldtype': 'Data', - 'idx': 74, 'label': 'In Words', 'oldfieldname': 'in_words', 'oldfieldtype': 'Data', @@ -1132,7 +1030,6 @@ 'doctype': 'DocField', 'fieldname': 'net_total_import', 'fieldtype': 'Currency', - 'idx': 75, 'label': 'Net Total (Import)', 'oldfieldname': 'net_total_import', 'oldfieldtype': 'Currency', @@ -1145,7 +1042,6 @@ 'doctype': 'DocField', 'fieldname': 'other_charges_added_import', 'fieldtype': 'Currency', - 'idx': 76, 'label': 'Other Charges Added (Import)', 'oldfieldname': 'other_charges_added_import', 'oldfieldtype': 'Currency', @@ -1158,7 +1054,6 @@ 'doctype': 'DocField', 'fieldname': 'other_charges_deducted_import', 'fieldtype': 'Currency', - 'idx': 77, 'label': 'Other Charges Deducted (Import)', 'oldfieldname': 'other_charges_deducted_import', 'oldfieldtype': 'Currency', @@ -1171,7 +1066,6 @@ 'doctype': 'DocField', 'fieldname': 'grand_total_import', 'fieldtype': 'Currency', - 'idx': 78, 'label': 'Grand Total (Import)', 'oldfieldname': 'grand_total_import', 'oldfieldtype': 'Currency', @@ -1186,7 +1080,6 @@ 'doctype': 'DocField', 'fieldname': 'in_words_import', 'fieldtype': 'Data', - 'idx': 79, 'label': 'In Words (Import)', 'oldfieldname': 'in_words_import', 'oldfieldtype': 'Data', @@ -1200,7 +1093,6 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 80, 'label': 'Actions', 'oldfieldtype': 'Section Break', 'permlevel': 0, @@ -1212,7 +1104,6 @@ 'allow_on_submit': 1, 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 81, 'label': 'Repair Outstanding Amt', 'oldfieldtype': 'Button', 'options': 'repair_pv_outstanding', @@ -1226,7 +1117,6 @@ 'fieldname': 'against_expense_account', 'fieldtype': 'Small Text', 'hidden': 1, - 'idx': 82, 'label': 'Against Expense Account', 'no_copy': 1, 'oldfieldname': 'against_expense_account', From 1530b93a6e536b9a3cf1acfccffac37e7f36a0b2 Mon Sep 17 00:00:00 2001 From: Nijil Date: Thu, 24 Nov 2011 15:53:56 +0530 Subject: [PATCH 09/11] purchase recipt --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt old mode 100644 new mode 100755 From 4e54d7a434847c9af615a1fc39c220757c284379 Mon Sep 17 00:00:00 2001 From: Nijil Date: Thu, 24 Nov 2011 16:18:42 +0530 Subject: [PATCH 10/11] pvdetail and patch --- erpnext/patches/Discount_purchase_cycle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 erpnext/patches/Discount_purchase_cycle.py diff --git a/erpnext/patches/Discount_purchase_cycle.py b/erpnext/patches/Discount_purchase_cycle.py old mode 100644 new mode 100755 index 0edc6430fe..6be37f242b --- a/erpnext/patches/Discount_purchase_cycle.py +++ b/erpnext/patches/Discount_purchase_cycle.py @@ -2,6 +2,6 @@ def execute(): import webnotes from webnotes.modules.module_manager import reload_doc - reload_doc('accounts', 'doctype', 'payable_voucher') - reload_doc('buying', 'doctype', 'purchase_common') + reload_doc('accounts', 'doctype', 'pv_detail') + reload_doc('buying', 'doctype', 'po_detail') reload_doc('stock', 'doctype', 'purchase_receipt_detail') From 630256f65bb496f9e79e871fdadfdc3a35f56599 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Thu, 8 Dec 2011 13:01:43 +0530 Subject: [PATCH 11/11] purchase recipt detail --- .../purchase_receipt_detail.txt | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) mode change 100644 => 100755 erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt old mode 100644 new mode 100755 index 2e3514e36f..733e864d90 --- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt +++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:16', 'docstatus': 0, - 'modified': '2011-11-16 15:43:36', + 'modified': '2011-12-08 13:00:59', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -14,7 +14,6 @@ { 'autoname': 'GRND/.#######', 'colour': 'White:FFF', - 'default_print_format': 'Standard', 'doctype': 'DocType', 'istable': 1, 'module': 'Stock', @@ -22,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 63 + 'version': 60 }, # These values are common for all DocField @@ -179,6 +178,15 @@ 'width': '100px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount Rate %', + 'permlevel': 0 + }, + # DocField { 'colour': 'White:FFF', @@ -195,6 +203,15 @@ 'width': '100px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -319,7 +336,6 @@ 'doctype': 'DocField', 'fieldname': 'serial_no', 'fieldtype': 'Text', - 'in_filter': 1, 'label': 'Serial No', 'no_copy': 1, 'oldfieldname': 'serial_no', @@ -373,19 +389,6 @@ 'width': '100px' }, - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', - 'in_filter': 1, - 'label': 'Project Name', - 'options': 'Project', - 'permlevel': 0, - 'print_hide': 1 - }, - # DocField { 'colour': 'White:FFF', @@ -451,7 +454,6 @@ # DocField { - 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldname': 'item_tax_amount', 'fieldtype': 'Currency', @@ -502,7 +504,6 @@ # DocField { - 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldname': 'valuation_rate', 'fieldtype': 'Currency', @@ -519,7 +520,6 @@ # DocField { - 'colour': 'White:FFF', 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', 'doctype': 'DocField', 'fieldname': 'item_tax_rate',