From 296c17b7ae525f479585560d44cbabe191f176ec Mon Sep 17 00:00:00 2001 From: Nijil Date: Fri, 18 Nov 2011 14:12:06 +0530 Subject: [PATCH 01/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] .. --- .../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/19] 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/19] 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/19] 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', From 4499851ceb0a89ad1ced345223900740140be6e9 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Thu, 8 Dec 2011 14:14:11 +0530 Subject: [PATCH 12/19] checking.. --- .../buying/doctype/po_detail/po_detail.txt | 163 ++++++++++-------- 1 file changed, 88 insertions(+), 75 deletions(-) mode change 100644 => 100755 erpnext/buying/doctype/po_detail/po_detail.txt 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..1cdc972fe0 --- 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-12-08 14:09:24', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -14,7 +14,6 @@ { 'autoname': 'POD/.#####', 'colour': 'White:FFF', - 'default_print_format': 'Standard', 'doctype': 'DocType', 'istable': 1, 'module': 'Buying', @@ -22,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 54 + 'version': 52 }, # These values are common for all DocField @@ -103,37 +102,6 @@ 'width': '300px' }, - # DocField - { - 'default': '0.00', - 'doctype': 'DocField', - 'fieldname': 'qty', - 'fieldtype': 'Currency', - 'label': 'Quantity', - 'oldfieldname': 'qty', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'reqd': 1, - 'trigger': 'Client', - 'width': '60px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'uom', - 'fieldtype': 'Link', - 'label': 'UOM', - 'oldfieldname': 'uom', - 'oldfieldtype': 'Link', - 'options': 'UOM', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' - }, - # DocField { 'default': '0.00', @@ -150,6 +118,25 @@ 'width': '100px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'purchase_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount Rate %', + 'permlevel': 0, + 'trigger': 'Client' + }, + # DocField { 'default': '0.00', @@ -164,13 +151,28 @@ 'reqd': 1 }, + # DocField + { + 'default': '0.00', + 'doctype': 'DocField', + 'fieldname': 'qty', + 'fieldtype': 'Currency', + 'label': 'Quantity', + 'oldfieldname': 'qty', + 'oldfieldtype': 'Currency', + 'permlevel': 0, + 'reqd': 1, + 'trigger': 'Client', + 'width': '60px' + }, + # DocField { 'doctype': 'DocField', 'fieldname': 'import_rate', 'fieldtype': 'Currency', 'hidden': 0, - 'label': 'Rate', + 'label': 'Rate *', 'oldfieldname': 'import_rate', 'oldfieldtype': 'Currency', 'permlevel': 0, @@ -178,6 +180,31 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate *', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'uom', + 'fieldtype': 'Link', + 'label': 'UOM', + 'oldfieldname': 'uom', + 'oldfieldtype': 'Link', + 'options': 'UOM', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 1, + 'trigger': 'Client', + 'width': '100px' + }, + # DocField { 'doctype': 'DocField', @@ -226,17 +253,15 @@ { 'colour': 'White:FFF', 'doctype': 'DocField', - 'fieldname': 'stock_qty', - 'fieldtype': 'Currency', - 'hidden': 0, - 'label': 'Stock Qty', - 'no_copy': 1, - 'oldfieldname': 'stock_qty', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client', - 'width': '100px' + 'fieldname': 'prevdoc_doctype', + 'fieldtype': 'Data', + 'hidden': 1, + 'label': 'Prevdoc DocType', + 'no_copy': 0, + 'oldfieldname': 'prevdoc_doctype', + 'oldfieldtype': 'Data', + 'permlevel': 1, + 'print_hide': 1 }, # DocField @@ -254,34 +279,6 @@ 'width': '100px' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Link', - 'in_filter': 1, - 'label': 'Project Name', - 'options': 'Project', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_doctype', - 'fieldtype': 'Data', - 'hidden': 1, - 'label': 'Prevdoc DocType', - 'no_copy': 0, - 'oldfieldname': 'prevdoc_doctype', - 'oldfieldtype': 'Data', - 'permlevel': 1, - 'print_hide': 1 - }, - # DocField { 'colour': 'White:FFF', @@ -363,6 +360,22 @@ 'search_index': 1 }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'stock_qty', + 'fieldtype': 'Currency', + 'hidden': 0, + 'label': 'Stock Qty', + 'no_copy': 1, + 'oldfieldname': 'stock_qty', + 'oldfieldtype': 'Currency', + 'permlevel': 0, + 'print_hide': 1, + 'trigger': 'Client', + 'width': '100px' + }, + # DocField { 'doctype': 'DocField', @@ -410,7 +423,7 @@ # DocField { - 'allow_on_submit': 0, + 'allow_on_submit': 1, 'doctype': 'DocField', 'fieldname': 'page_break', 'fieldtype': 'Check', From d8e5bed9e54f5d9f58ad1c77c18a8b8ae2d9bf63 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Thu, 8 Dec 2011 16:09:18 +0530 Subject: [PATCH 13/19] Discount in purchase cycle --- .../accounts/doctype/pv_detail/pv_detail.txt | 49 +++++++---- .../buying/doctype/po_detail/po_detail.txt | 12 +-- .../purchase_common/purchase_common.js | 65 ++++++++++++++- .../purchase_receipt_detail.txt | 83 ++++++++++--------- 4 files changed, 146 insertions(+), 63 deletions(-) mode change 100644 => 100755 erpnext/accounts/doctype/pv_detail/pv_detail.txt mode change 100644 => 100755 erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_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..557697f526 --- 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-12-08 15:58:58', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -14,7 +14,6 @@ { 'autoname': 'EVD.######', 'colour': 'White:FFF', - 'default_print_format': 'Standard', 'doctype': 'DocType', 'istable': 1, 'module': 'Accounts', @@ -22,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 27 + 'version': 28 }, # These values are common for all DocField @@ -115,7 +114,7 @@ 'doctype': 'DocField', 'fieldname': 'rate', 'fieldtype': 'Currency', - 'label': 'Rate (Default Curr.)', + 'label': 'Rate *(Default Curr.)', 'oldfieldname': 'rate', 'oldfieldtype': 'Currency', 'permlevel': 0, @@ -129,7 +128,7 @@ 'doctype': 'DocField', 'fieldname': 'import_rate', 'fieldtype': 'Currency', - 'label': 'Rate', + 'label': 'Rate ', 'oldfieldname': 'import_rate', 'oldfieldtype': 'Currency', 'permlevel': 0, @@ -138,6 +137,15 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount %', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -210,19 +218,6 @@ 'width': '120px' }, - # 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 { 'doctype': 'DocField', @@ -308,5 +303,23 @@ '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 } ] \ 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 index 1cdc972fe0..ec854c3491 100755 --- 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-12-08 14:09:24', + 'modified': '2011-12-08 16:05:27', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 52 + 'version': 54 }, # These values are common for all DocField @@ -108,7 +108,7 @@ 'doctype': 'DocField', 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', - 'label': 'Rate (Default Curr.)', + 'label': 'Rate (Default Curr.) *', 'oldfieldname': 'purchase_rate', 'oldfieldtype': 'Currency', 'permlevel': 0, @@ -123,7 +123,7 @@ 'doctype': 'DocField', 'fieldname': 'purchase_ref_rate', 'fieldtype': 'Currency', - 'label': 'Ref Rate', + 'label': 'Ref Rate *', 'permlevel': 0 }, @@ -172,7 +172,7 @@ 'fieldname': 'import_rate', 'fieldtype': 'Currency', 'hidden': 0, - 'label': 'Rate *', + 'label': 'Rate ', 'oldfieldname': 'import_rate', 'oldfieldtype': 'Currency', 'permlevel': 0, @@ -185,7 +185,7 @@ 'doctype': 'DocField', 'fieldname': 'import_ref_rate', 'fieldtype': 'Currency', - 'label': 'Ref Rate *', + 'label': 'Ref Rate ', 'permlevel': 0 }, diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index f91b1d88c7..029a413ccc 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -125,6 +125,22 @@ 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); +} +//==================== Purchase Ref Rate ================================================================ +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 ============================================================ /*cur_frm.cscript.calc_amount = function(doc, n) { @@ -242,19 +258,64 @@ cur_frm.cscript.calc_amount = function(doc, n) { for(var i=0;i Date: Thu, 8 Dec 2011 16:53:12 +0530 Subject: [PATCH 14/19] Discount in purchase cycle --- .../accounts/doctype/pv_detail/pv_detail.txt | 40 +++++++++---------- .../buying/doctype/po_detail/po_detail.txt | 4 +- .../purchase_receipt_detail.txt | 4 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index 557697f526..6d4c788968 100755 --- 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-12-08 15:58:58', + 'modified': '2011-12-08 16:51:09', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 28 + 'version': 30 }, # These values are common for all DocField @@ -123,6 +123,15 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'purchase_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate *', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -137,6 +146,15 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate ', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -303,23 +321,5 @@ '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 } ] \ 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 index ec854c3491..c64112bc9a 100755 --- 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-12-08 16:05:27', + 'modified': '2011-12-08 16:46:57', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 54 + 'version': 56 }, # These values are common for all DocField diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index 3816e4543d..3c0c43d9a8 100755 --- 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-12-08 16:06:08', + 'modified': '2011-12-08 16:49:08', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 64 + 'version': 66 }, # These values are common for all DocField From 38821f6104d87dd19152260b837afb3db02d75d6 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Thu, 8 Dec 2011 18:32:58 +0530 Subject: [PATCH 15/19] txt order update --- .../accounts/doctype/pv_detail/pv_detail.txt | 100 +++++++++--------- .../buying/doctype/po_detail/po_detail.txt | 64 +++++------ .../purchase_receipt_detail.txt | 26 ++--- 3 files changed, 95 insertions(+), 95 deletions(-) diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index 4e05a5cf80..c4b58ea183 100755 --- 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-12-08 15:58:58', + 'modified': '2011-12-08 18:31:28', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 28 + 'version': 33 }, # These values are common for all DocField @@ -109,6 +109,20 @@ 'search_index': 1 }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'qty', + 'fieldtype': 'Currency', + 'label': 'Qty', + 'oldfieldname': 'qty', + 'oldfieldtype': 'Currency', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 1, + 'trigger': 'Client' + }, + # DocField { 'doctype': 'DocField', @@ -123,6 +137,37 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'purchase_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate *', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'label': 'Amount (Default Curr.)', + 'oldfieldname': 'amount', + 'oldfieldtype': 'Currency', + 'permlevel': 1, + 'print_hide': 1, + 'reqd': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount %', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -140,39 +185,12 @@ # DocField { 'doctype': 'DocField', - 'fieldname': 'discount_rate', + 'fieldname': 'import_ref_rate', 'fieldtype': 'Currency', - 'label': 'Discount %', + 'label': 'Ref Rate ', 'permlevel': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'qty', - 'fieldtype': 'Currency', - 'label': 'Qty', - 'oldfieldname': 'qty', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'label': 'Amount (Default Curr.)', - 'oldfieldname': 'amount', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1, - 'reqd': 1 - }, - # DocField { 'doctype': 'DocField', @@ -303,23 +321,5 @@ '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 } -] +] \ 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 index aac949def1..6a275e607a 100755 --- 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-12-08 16:05:27', + 'modified': '2011-12-08 18:30:54', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 54 + 'version': 58 }, # These values are common for all DocField @@ -102,6 +102,21 @@ 'width': '300px' }, + # DocField + { + 'default': '0.00', + 'doctype': 'DocField', + 'fieldname': 'qty', + 'fieldtype': 'Currency', + 'label': 'Quantity', + 'oldfieldname': 'qty', + 'oldfieldtype': 'Currency', + 'permlevel': 0, + 'reqd': 1, + 'trigger': 'Client', + 'width': '60px' + }, + # DocField { 'default': '0.00', @@ -127,16 +142,6 @@ 'permlevel': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'discount_rate', - 'fieldtype': 'Currency', - 'label': 'Discount Rate %', - 'permlevel': 0, - 'trigger': 'Client' - }, - # DocField { 'default': '0.00', @@ -153,17 +158,12 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', - 'fieldname': 'qty', + 'fieldname': 'discount_rate', 'fieldtype': 'Currency', - 'label': 'Quantity', - 'oldfieldname': 'qty', - 'oldfieldtype': 'Currency', + 'label': 'Discount %', 'permlevel': 0, - 'reqd': 1, - 'trigger': 'Client', - 'width': '60px' + 'trigger': 'Client' }, # DocField @@ -189,6 +189,17 @@ 'permlevel': 0 }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_amount', + 'fieldtype': 'Currency', + 'label': 'Amount', + 'oldfieldname': 'import_amount', + 'oldfieldtype': 'Currency', + 'permlevel': 1 + }, + # DocField { 'doctype': 'DocField', @@ -205,17 +216,6 @@ 'width': '100px' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'import_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - # DocField { 'doctype': 'DocField', @@ -435,4 +435,4 @@ 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index 9fa0c40ecb..e1bc597f6f 100755 --- 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-12-08 17:28:34', + 'modified': '2011-12-08 18:32:23', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 69 + 'version': 70 }, # These values are common for all DocField @@ -192,16 +192,7 @@ 'doctype': 'DocField', 'fieldname': 'discount_rate', 'fieldtype': 'Currency', - 'label': 'Discount Rate %', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', + 'label': 'Discount %', 'permlevel': 0 }, @@ -221,6 +212,15 @@ 'width': '100px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate ', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -555,4 +555,4 @@ 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file From b54d7282a754e8fb83095e4349694ff1d4995a0f Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Mon, 12 Dec 2011 10:31:23 +0530 Subject: [PATCH 16/19] pvdetail --- .../accounts/doctype/pv_detail/pv_detail.txt | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index c4b58ea183..f789f1262a 100755 --- 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-12-08 18:31:28', + 'modified': '2011-12-09 18:46:35', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 33 + 'version': 36 }, # These values are common for all DocField @@ -126,7 +126,16 @@ # DocField { 'doctype': 'DocField', - 'fieldname': 'rate', + 'fieldname': 'purchase_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate *', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', 'label': 'Rate *(Default Curr.)', 'oldfieldname': 'rate', @@ -137,15 +146,6 @@ 'trigger': 'Client' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'purchase_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate *', - 'permlevel': 0 - }, - # DocField { 'doctype': 'DocField', @@ -161,6 +161,7 @@ # DocField { + 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'discount_rate', 'fieldtype': 'Currency', @@ -168,6 +169,15 @@ 'permlevel': 0 }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate ', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -182,15 +192,6 @@ 'trigger': 'Client' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', - 'permlevel': 0 - }, - # DocField { 'doctype': 'DocField', From fdc7fc62a52cc9321f7706264ef0774f87919a95 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Mon, 12 Dec 2011 10:50:18 +0530 Subject: [PATCH 17/19] payable voucher.js --- .../doctype/payable_voucher/payable_voucher.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js index 8c61727e00..5b950b0d53 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js @@ -187,7 +187,7 @@ cur_frm.cscript.qty = function(doc,dt,dn) { cur_frm.cscript.calc_exp_row(doc,dt // ------------ cur_frm.cscript.import_rate = function(doc,dt,dn) { var d = locals[dt][dn]; - set_multiple('PV Detail', d.name, {'rate': flt(d.import_rate) * flt(doc.conversion_rate) }, 'entries'); + set_multiple('PV Detail', d.name, {'purchase_rate': flt(d.import_rate) * flt(doc.conversion_rate) }, 'entries'); cur_frm.cscript.calc_exp_row(doc,dt,dn) } @@ -334,10 +334,10 @@ cur_frm.cscript.calc_total = function(doc) { 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, {'purchase_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, {'amount': flt(el[i].qty) * flt(el[i].rate) }, 'entries') + set_multiple('PV Detail', el[i].name, {'amount': flt(el[i].qty) * flt(el[i].purchase_rate) }, 'entries') t_exp += flt(el[i].amount); } doc.net_total = flt(t_exp); @@ -369,13 +369,13 @@ var calc_total_advance = function(doc,cdt,cdn) { cur_frm.cscript.calc_exp_row = function(doc,dt,dn) { var d = locals[dt][dn]; - d.amount = flt(d.qty * d.rate); + d.amount = flt(d.qty * d.purchase_rate); refresh_field('amount',dn,'entries'); if (!doc.conversion_rate){ doc.conversion_rate = 1; refresh_field('conversion_rate'); } - set_multiple('PV Detail', dn, {'import_rate': flt(d.rate) / flt(doc.conversion_rate) }, 'entries'); - set_multiple('PV Detail', dn, {'import_amount': flt(d.qty) * flt(d.rate) / flt(doc.conversion_rate) }, 'entries'); + set_multiple('PV Detail', dn, {'import_rate': flt(d.purchase_rate) / flt(doc.conversion_rate) }, 'entries'); + set_multiple('PV Detail', dn, {'import_amount': flt(d.qty) * flt(d.purchase_rate) / flt(doc.conversion_rate) }, 'entries'); cur_frm.cscript.calc_total(doc) } From 8fb260504a03c254ba2ea5c7fff4dd0e7a3cac54 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Tue, 13 Dec 2011 18:14:15 +0530 Subject: [PATCH 18/19] purchase discount --- .../payable_voucher/payable_voucher.js | 113 ++-------- .../accounts/doctype/pv_detail/pv_detail.txt | 16 +- .../buying/doctype/po_detail/po_detail.txt | 8 +- .../purchase_common/purchase_common.js | 198 ++++++------------ .../purchase_common/purchase_common.py | 15 +- .../purchase_receipt_detail.txt | 7 +- 6 files changed, 104 insertions(+), 253 deletions(-) diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js index 5b950b0d53..ca79387e3d 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js @@ -77,13 +77,6 @@ cur_frm.cscript.supplier_address = cur_frm.cscript.contact_person = function(doc if(doc.supplier) get_server_fields('get_supplier_address', JSON.stringify({supplier: doc.supplier, address: doc.supplier_address, contact: doc.contact_person}),'', doc, dt, dn, 1); } -cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) { - return 'SELECT name,address_line1,city FROM tabAddress WHERE supplier = "'+ doc.supplier +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; -} - -cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { - return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE supplier = "'+ doc.supplier +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; -} cur_frm.fields_dict.supplier_address.on_new = function(dn) { @@ -111,12 +104,6 @@ cur_frm.cscript.credit_to = function(doc,dt,dn) { -// Get Print Heading -cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) { - return 'SELECT `tabPrint Heading`.name FROM `tabPrint Heading` WHERE `tabPrint Heading`.docstatus !=2 AND `tabPrint Heading`.name LIKE "%s" ORDER BY `tabPrint Heading`.name ASC LIMIT 50'; -} - - //Set expense_head and cost center on adding new row //---------------------------------------------- cur_frm.fields_dict['entries'].grid.onrowadd = function(doc, cdt, cdn){ @@ -142,18 +129,10 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { if (doc.is_opening == 'Yes') unhide_field('aging_date'); } -/* ******************************** TRIGGERS **************************************** */ - -// Conversion Rate -// ---------------- -cur_frm.cscript.conversion_rate = function(doc,cdt,cdn) { - cur_frm.cscript.calc_total(doc,cdt,cdn); -} - // Recalculate Button // ------------------- cur_frm.cscript['Recalculate'] = function(doc, dt, dn) { - cur_frm.cscript.calc_total(doc, cdt, cdn); + cur_frm.cscript['Calculate Tax'](doc,cdt,cdn); calc_total_advance(doc,cdt,cdn); } @@ -179,31 +158,16 @@ cur_frm.cscript.item_code = function(doc,cdt,cdn){ } } -// Quantity -// --------- -cur_frm.cscript.qty = function(doc,dt,dn) { cur_frm.cscript.calc_exp_row(doc,dt,dn); } - -// Import Rate -// ------------ -cur_frm.cscript.import_rate = function(doc,dt,dn) { - var d = locals[dt][dn]; - set_multiple('PV Detail', d.name, {'purchase_rate': flt(d.import_rate) * flt(doc.conversion_rate) }, 'entries'); - cur_frm.cscript.calc_exp_row(doc,dt,dn) -} - - -// ============== TDS =============== - // Rate in Deduct Taxes (TDS) // -------------------------- cur_frm.cscript.rate = function(doc,dt,dn) { //This is done as Purchase tax detail and PV detail both contain the same fieldname 'rate' - if(dt != 'Purchase Tax Detail') cur_frm.cscript.calc_exp_row(doc,dt,dn); + if(dt != 'Purchase Tax Detail') cur_frm.cscript.calc_amount(doc, 2); } // Amount // ------- -cur_frm.cscript.ded_amount = function(doc,dt,dn) { cur_frm.cscript.calc_total(doc); } +cur_frm.cscript.ded_amount = function(doc,dt,dn) {calculate_outstanding(doc);} // Get TDS Button // --------------- @@ -211,7 +175,7 @@ cur_frm.cscript['Get TDS'] = function(doc, dt, dn) { var callback = function(r,rt) { cur_frm.refresh(); refresh_field('ded_amount'); - cur_frm.cscript.calc_total(locals[dt][dn]); + //cur_frm.cscript.calc_total(locals[dt][dn]); } $c_obj(make_doclist(dt,dn), 'get_tds', '', callback); } @@ -244,6 +208,15 @@ cur_frm.cscript['Make Bank Voucher'] = function(doc, dt, dn) { /* ***************************** GET QUERY Functions *************************** */ + +cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) { + return 'SELECT name,address_line1,city FROM tabAddress WHERE supplier = "'+ doc.supplier +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; +} + +cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { + return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE supplier = "'+ doc.supplier +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; +} + // Item Code // ---------- cur_frm.fields_dict['entries'].grid.get_field("item_code").get_query = function(doc, cdt, cdn) { @@ -277,6 +250,12 @@ cur_frm.fields_dict['purchase_receipt_main'].get_query = function(doc) { } } +// Get Print Heading +cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) { + return 'SELECT `tabPrint Heading`.name FROM `tabPrint Heading` WHERE `tabPrint Heading`.docstatus !=2 AND `tabPrint Heading`.name LIKE "%s" ORDER BY `tabPrint Heading`.name ASC LIMIT 50'; +} + + // ================== PV Details Table =================== // Expense Head // ------------- @@ -324,28 +303,6 @@ cur_frm.cscript.tax_code = function(doc, dt, dn) { /* ***************************** UTILITY FUNCTIONS ************************ */ -// Calculate -// --------- -cur_frm.cscript.calc_total = function(doc) { - - // expense - var t_exp = 0.0; - 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, {'purchase_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, {'amount': flt(el[i].qty) * flt(el[i].purchase_rate) }, 'entries') - t_exp += flt(el[i].amount); - } - doc.net_total = flt(t_exp); - refresh_field('net_total'); - cur_frm.cscript.val_cal_charges(doc, cdt, cdn, cur_frm.cscript.tname, cur_frm.cscript.fname, cur_frm.cscript.other_fname); -} - - // Calculate Advance // ------------------ var calc_total_advance = function(doc,cdt,cdn) { @@ -366,30 +323,12 @@ var calc_total_advance = function(doc,cdt,cdn) { refresh_many(['total_advance','outstanding_amount','tds_amount_on_advance', 'total_amount_to_pay']); } - -cur_frm.cscript.calc_exp_row = function(doc,dt,dn) { - var d = locals[dt][dn]; - d.amount = flt(d.qty * d.purchase_rate); - refresh_field('amount',dn,'entries'); - - if (!doc.conversion_rate){ doc.conversion_rate = 1; refresh_field('conversion_rate'); } - - set_multiple('PV Detail', dn, {'import_rate': flt(d.purchase_rate) / flt(doc.conversion_rate) }, 'entries'); - set_multiple('PV Detail', dn, {'import_amount': flt(d.qty) * flt(d.purchase_rate) / flt(doc.conversion_rate) }, 'entries'); - - cur_frm.cscript.calc_total(doc) -} - - // Make JV // -------- cur_frm.cscript.make_jv = function(doc, dt, dn, det) { var jv = LocalDB.create('Journal Voucher'); jv = locals['Journal Voucher'][jv]; jv.voucher_type = 'Bank Voucher'; - //jv.voucher_series = det.def_bv_series; - //jv.voucher_date = doc.voucher_date; - //jv.posting_date = doc.posting_date; jv.remark = repl('Payment against voucher %(vn)s for %(rem)s', {vn:doc.name, rem:doc.remarks}); jv.total_debit = doc.outstanding_amount; jv.total_credit = doc.outstanding_amount; @@ -400,20 +339,17 @@ cur_frm.cscript.make_jv = function(doc, dt, dn, det) { var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries'); d1.account = doc.credit_to; d1.debit = doc.outstanding_amount; - //d1.balance = det.acc_balance; d1.against_voucher = doc.name; // credit to bank var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries'); - //d1.account = det.def_bank_account; - //d1.balance = det.bank_balance; d1.credit = doc.outstanding_amount; loaddoc('Journal Voucher', jv.name); } // ***************** Get project name ***************** -cur_frm.fields_dict['pv_details'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) { +cur_frm.fields_dict['entries'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) { return 'SELECT `tabProject`.name FROM `tabProject` WHERE `tabProject`.status = "Open" AND `tabProject`.name LIKE "%s" ORDER BY `tabProject`.name ASC LIMIT 50'; } @@ -427,15 +363,6 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ cur_frm.pformat.print_heading = "Purchase Invoice"; } -/* *********************** Client Side Validation **************************** */ -// Validate -// --------- -cur_frm.cscript.validate = function(doc, cdt, cdn) { - is_item_table(doc,cdt,cdn); - cur_frm.cscript.calc_total(doc, cdt, cdn); - calc_total_advance(doc, cdt, cdn); -} - /****************** Get Accounting Entry *****************/ cur_frm.cscript['View Ledger Entry'] = function(){ var callback = function(report){ diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index f789f1262a..f14b44b01e 100755 --- 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-12-09 18:46:35', + 'modified': '2011-12-13 12:06:35', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 36 + 'version': 39 }, # These values are common for all DocField @@ -129,13 +129,14 @@ 'fieldname': 'purchase_ref_rate', 'fieldtype': 'Currency', 'label': 'Ref Rate *', - 'permlevel': 0 + 'permlevel': 0, + 'trigger': 'Client' }, # DocField { 'doctype': 'DocField', - 'fieldname': 'purchase_rate', + 'fieldname': 'rate', 'fieldtype': 'Currency', 'label': 'Rate *(Default Curr.)', 'oldfieldname': 'rate', @@ -161,12 +162,12 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'discount_rate', 'fieldtype': 'Currency', 'label': 'Discount %', - 'permlevel': 0 + 'permlevel': 0, + 'trigger': 'Client' }, # DocField @@ -175,7 +176,8 @@ 'fieldname': 'import_ref_rate', 'fieldtype': 'Currency', 'label': 'Ref Rate ', - 'permlevel': 0 + 'permlevel': 0, + 'trigger': 'Client' }, # DocField diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt index 6a275e607a..c8d831b8dc 100755 --- 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-12-08 18:30:54', + 'modified': '2011-12-13 13:02:05', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 58 + 'version': 59 }, # These values are common for all DocField @@ -104,7 +104,6 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'qty', 'fieldtype': 'Currency', @@ -119,7 +118,6 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', @@ -144,7 +142,6 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'amount', 'fieldtype': 'Currency', @@ -392,7 +389,6 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'billed_qty', 'fieldtype': 'Currency', diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 029a413ccc..a429b6894c 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -13,14 +13,6 @@ cur_frm.cscript.get_default_schedule_date = function(doc) { } } -/* -// ======================== Supplier ================================================= -cur_frm.cscript.supplier = function(doc, cdt, cdn) { - if(doc.supplier) get_server_fields('get_supplier_details', doc.supplier,'', doc, cdt, cdn, 1); -} - -*/ - // ======================== Conversion Rate ========================================== cur_frm.cscript.conversion_rate = function(doc,cdt,cdn) { @@ -54,22 +46,11 @@ cur_frm.cscript.update_stock_qty = function(doc,cdt,cdn){ } } -//==================== Purchase UOM Get Query ======================================================= -//cur_frm.fields_dict[fname].grid.get_field("uom").get_query = function(doc, cdt, cdn) { -// var d = locals[this.doctype][this.docname]; -// return 'SELECT `tabUOM Conversion Detail`.`uom` FROM `tabUOM Conversion Detail` WHERE `tabUOM Conversion Detail`.`parent` = "' + d.item_code + '" AND `tabUOM Conversion Detail`.uom LIKE "%s"' -//} - - //==================== UOM ====================================================================== cur_frm.cscript.uom = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if (d.item_code && d.uom) { call_back = function(doc, cdt, cdn){ - //refresh_field('purchase_rate', d.name, fname); - //refresh_field('qty' , d.name, fname); - //refresh_field('conversion_factor' , d.name, fname); - //var doc = locals[cdt][cdn]; cur_frm.cscript.calc_amount(doc, 2); } str_arg = {'item_code':d.item_code, 'uom':d.uom, 'stock_qty':flt(d.stock_qty), 'qty': flt(d.qty)} @@ -115,64 +96,27 @@ cur_frm.cscript.qty = function(doc, cdt, cdn) { //=================== Purchase Rate ============================================================== cur_frm.cscript.purchase_rate = function(doc, cdt, cdn) { - // Calculate Amount cur_frm.cscript.calc_amount(doc, 2); } //==================== Import Rate ================================================================ cur_frm.cscript.import_rate = function(doc, cdt, cdn) { - // Calculate Amount 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); } //==================== Purchase Ref Rate ================================================================ 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 ============================================================ -/*cur_frm.cscript.calc_amount = function(doc, n) { - // Set defaults - doc = locals[doc.doctype][doc.name] - if (! doc.conversion_rate) doc.conversion_rate = 1; - if(!n) n=0; - var net_total = 0; - var net_total_import = 0; - - var cl = getchildren(tname, doc.name, fname); - - for(var i=0;iGet all childrens/ rows from Detail Table @@ -189,18 +133,11 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) { is_item_table(doc,cdt,cdn); // Step 2:=> Calculate Amount cur_frm.cscript.calc_amount(doc, 1); + + // calculate advances if pv + if(doc.doctype == 'Payable Voucher') calc_total_advance(doc, cdt, cdn); } - - -/*cur_frm.cscript.other_fname = "purchase_tax_details"; -other_charges ===> purchase_tax_details -RV Tax Detail ===> Purchase Tax Detail -cur_frm.cscript.recalc ===> cur_frm.cscript.calc_amount -export ===> import -other_charges_total ===> total_tax -Other Charges Calculation ===> Tax Calculation*/ - // **************** RE-CALCULATE VALUES *************************** cur_frm.cscript['Re-Calculate Values'] = function(doc, cdt, cdn) { @@ -221,8 +158,7 @@ cur_frm.cscript['Calculate Tax'] = function(doc, cdt, cdn) { validated = false; } } - if(doc.doctype != 'Payable Voucher') cur_frm.cscript.calc_amount(doc, 1); - else if(doc.doctype == 'Payable Voucher') cur_frm.cscript.calc_total(doc); + cur_frm.cscript.calc_amount(doc, 1); } @@ -234,10 +170,6 @@ cur_frm.cscript.get_item_wise_tax_detail = function( doc, rate, cl, i, tax, t) { return detail; } - //if(cur_frm.cscript.custom_recalc)cur_frm.cscript.custom_recalc(doc); - - - cur_frm.cscript.amount = function(doc, cdt, cdn) { cur_frm.cscript.calc_amount(doc, 3); } @@ -257,70 +189,56 @@ cur_frm.cscript.calc_amount = function(doc, n) { for(var i=0;i now())"% cstr(d.item_code), as_dict = 1 ) - d.purchase_rate = rate and flt(rate[0]['last_purchase_rate']) * flt(d.conversion_factor) or 0 - + d.purchase_rate = rate and flt(rate[0]['last_purchase_rate']) * flt(d.conversion_factor) or 0 if not rate[0]['last_purchase_rate']: msgprint("%s has no Last Purchase Rate."% d.item_code) diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index e1bc597f6f..afe8d997c8 100755 --- 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-12-08 18:32:23', + 'modified': '2011-12-13 13:03:11', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 70 + 'version': 71 }, # These values are common for all DocField @@ -141,7 +141,6 @@ # DocField { 'colour': 'White:FFF', - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', @@ -157,7 +156,6 @@ # DocField { - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'amount', 'fieldtype': 'Currency', @@ -199,7 +197,6 @@ # DocField { 'colour': 'White:FFF', - 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'import_rate', 'fieldtype': 'Currency', From f6a3441d990caea763768731643dc0213c461214 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Tue, 13 Dec 2011 18:31:42 +0530 Subject: [PATCH 19/19] patch --- erpnext/patches/Discount_purchase_cycle.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/patches/Discount_purchase_cycle.py b/erpnext/patches/Discount_purchase_cycle.py index 6be37f242b..8c41d5dd27 100755 --- a/erpnext/patches/Discount_purchase_cycle.py +++ b/erpnext/patches/Discount_purchase_cycle.py @@ -5,3 +5,5 @@ def execute(): reload_doc('accounts', 'doctype', 'pv_detail') reload_doc('buying', 'doctype', 'po_detail') reload_doc('stock', 'doctype', 'purchase_receipt_detail') + if webnotes.conn.sql("select name from 'tabDocField` where parent = 'PO Detail' and fieldname = 'discount'"): + webnotes.conn.sql("update `tabPO Detail` set discount_rate=discount")