updates in purchase cycle's price list

This commit is contained in:
Anand Doshi
2013-01-17 20:20:56 +05:30
parent 9d9aec1ed4
commit f8f0c0d089
17 changed files with 1190 additions and 1055 deletions

View File

@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-28 11:01:35",
"creation": "2013-01-17 10:57:15",
"modified_by": "Administrator",
"modified": "2013-01-16 11:14:57"
"modified": "2013-01-17 11:22:07"
},
{
"allow_attach": 1,
@@ -32,8 +32,9 @@
"read": 1,
"submit": 0,
"doctype": "DocPerm",
"report": 1,
"amend": 0,
"parenttype": "DocType",
"report": 1,
"parentfield": "permissions"
},
{
@@ -49,15 +50,6 @@
"fieldtype": "Section Break",
"permlevel": 0
},
{
"oldfieldtype": "Small Text",
"doctype": "DocField",
"label": "Trash Reason",
"oldfieldname": "trash_reason",
"fieldname": "trash_reason",
"fieldtype": "Small Text",
"permlevel": 1
},
{
"description": "Item will be saved by this name in the data base.",
"oldfieldtype": "Data",
@@ -596,18 +588,6 @@
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"permlevel": 0
},
{
"description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.",
"oldfieldtype": "Table",
"doctype": "DocField",
"label": "Item Prices",
"oldfieldname": "ref_rate_details",
"options": "Item Price",
"fieldname": "ref_rate_details",
"fieldtype": "Table",
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"permlevel": 0
},
{
"description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
@@ -636,6 +616,25 @@
"fieldtype": "Table",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Price Lists and Rates",
"fieldname": "price_list_section",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.",
"oldfieldtype": "Table",
"doctype": "DocField",
"label": "Item Prices",
"oldfieldname": "ref_rate_details",
"options": "Item Price",
"fieldname": "ref_rate_details",
"fieldtype": "Table",
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"permlevel": 0
},
{
"oldfieldtype": "Section Break",
"doctype": "DocField",
@@ -691,6 +690,7 @@
"permlevel": 0
},
{
"read_only": 1,
"no_copy": 1,
"oldfieldtype": "Link",
"doctype": "DocField",
@@ -700,7 +700,7 @@
"fieldname": "default_bom",
"fieldtype": "Link",
"depends_on": "eval:doc.is_manufactured_item==\"Yes\"",
"permlevel": 1
"permlevel": 0
},
{
"description": "Selecting \"Yes\" will allow you to make a Production Order for this item.",
@@ -765,13 +765,14 @@
"permlevel": 0
},
{
"read_only": 1,
"description": "website page link",
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Page Name",
"fieldname": "page_name",
"fieldtype": "Data",
"permlevel": 1
"permlevel": 0
},
{
"description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.",
@@ -866,53 +867,32 @@
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "Material Master Manager",
"cancel": 1,
"permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"write": 0,
"role": "Material Manager",
"cancel": 0,
"permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"write": 0,
"role": "Material User",
"cancel": 0,
"permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"write": 0,
"role": "Material Master Manager",
"cancel": 0,
"permlevel": 1
"permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"write": 0,
"role": "Material Manager",
"cancel": 0,
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"write": 0,
"role": "Material User",
"permlevel": 0
},
{
"create": 0,
"doctype": "DocPerm",
"write": 0,
"cancel": 0,
"role": "Material Master Manager",
"permlevel": 1
},
{
"create": 0,
"doctype": "DocPerm",
"write": 0,
"cancel": 0,
"role": "Material User",
"permlevel": 1
}
]

View File

@@ -2,31 +2,24 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-03-27 14:36:36",
"creation": "2013-01-15 18:43:18",
"modified_by": "Administrator",
"modified": "2012-03-27 14:36:36"
"modified": "2013-01-17 17:53:42"
},
{
"section_style": "Tray",
"istable": 1,
"in_create": 1,
"module": "Stock",
"server_code_error": " ",
"read_only": 0,
"istable": 1,
"autoname": "RFD/.#####",
"name": "__common__",
"colour": "White:FFF",
"in_create": 1,
"doctype": "DocType",
"show_in_menu": 0,
"version": 3
"module": "Stock",
"name": "__common__"
},
{
"name": "__common__",
"parent": "Item Price",
"search_index": 1,
"doctype": "DocField",
"parenttype": "DocType",
"in_filter": 1,
"permlevel": 0,
"parentfield": "fields"
},
@@ -40,9 +33,11 @@
"label": "Price List Name",
"oldfieldname": "price_list_name",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"search_index": 1,
"reqd": 1,
"options": "link:Price List"
"options": "Price List",
"in_filter": 1
},
{
"oldfieldtype": "Currency",
@@ -51,7 +46,9 @@
"oldfieldname": "ref_rate",
"fieldname": "ref_rate",
"fieldtype": "Currency",
"reqd": 0
"search_index": 0,
"reqd": 0,
"in_filter": 1
},
{
"oldfieldtype": "Select",
@@ -60,7 +57,23 @@
"oldfieldname": "ref_currency",
"fieldname": "ref_currency",
"fieldtype": "Select",
"search_index": 1,
"reqd": 1,
"options": "link:Currency"
"options": "link:Currency",
"in_filter": 1
},
{
"description": "Allow this price in sales related forms",
"doctype": "DocField",
"label": "For Selling",
"fieldname": "selling",
"fieldtype": "Check"
},
{
"description": "Allow this price in purchase related forms",
"doctype": "DocField",
"label": "For Buying",
"fieldname": "buying",
"fieldtype": "Check"
}
]

View File

@@ -22,6 +22,29 @@ wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxe
wn.require('app/buying/doctype/purchase_common/purchase_common.js');
wn.require('app/utilities/doctype/sms_control/sms_control.js');
erpnext.buying.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
refresh: function() {
this._super();
if(this.frm.doc.docstatus == 1) {
if(flt(this.frm.doc.per_billed, 2) < 100) {
cur_frm.add_custom_button('Make Purchase Invoice',
cur_frm.cscript['Make Purchase Invoice']);
}
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
}
if(wn.boot.control_panel.country == 'India') {
unhide_field(['challan_no', 'challan_date']);
}
}
});
var new_cscript = new erpnext.buying.PurchaseReceiptController({frm: cur_frm});
// for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new_cscript);
//========================== On Load ================================================================
cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(!doc.fiscal_year && doc.__islocal){ wn.model.set_default_values(doc);}
@@ -38,26 +61,6 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
cur_frm.cscript.dynamic_label(doc, dt, dn, callback);
}
//========================== Refresh ===============================================================
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.clear_custom_buttons();
erpnext.hide_naming_series();
if(doc.supplier) $(cur_frm.fields_dict.contact_section.row.wrapper).toggle(true);
else $(cur_frm.fields_dict.contact_section.row.wrapper).toggle(false);
if (!cur_frm.cscript.is_onload) cur_frm.cscript.dynamic_label(doc, cdt, cdn);
if(doc.docstatus == 1){
if (flt(doc.per_billed, 2) < 100) cur_frm.add_custom_button('Make Purchase Invoice', cur_frm.cscript['Make Purchase Invoice']);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
}
if(wn.boot.control_panel.country == 'India') {
unhide_field(['challan_no', 'challan_date']);
}
}
//Supplier
cur_frm.cscript.supplier = function(doc,dt,dn) {
if (doc.supplier) {
@@ -65,7 +68,6 @@ cur_frm.cscript.supplier = function(doc,dt,dn) {
JSON.stringify({ supplier: doc.supplier }),'', doc, dt, dn, 1, function() {
cur_frm.refresh();
});
$(cur_frm.fields_dict.contact_section.row.wrapper).toggle(true);
}
}

View File

@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-03 17:56:26",
"creation": "2013-01-17 11:11:24",
"modified_by": "Administrator",
"modified": "2013-01-15 15:43:07"
"modified": "2013-01-17 20:17:44"
},
{
"autoname": "naming_series:",
@@ -222,26 +222,19 @@
},
{
"print_hide": 1,
"print_width": "150px",
"oldfieldtype": "Currency",
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Net Total",
"oldfieldname": "net_total",
"width": "150px",
"fieldname": "net_total",
"fieldtype": "Currency",
"reqd": 1,
"permlevel": 1
"label": "Get Current Stock",
"options": "get_current_stock",
"fieldname": "get_current_stock",
"fieldtype": "Button",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Net Total (Import)",
"oldfieldname": "net_total_import",
"fieldname": "net_total_import",
"fieldtype": "Currency",
"permlevel": 1
"fieldname": "column_break_18",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"oldfieldtype": "Button",
@@ -252,48 +245,9 @@
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Current Stock",
"options": "get_current_stock",
"fieldname": "get_current_stock",
"fieldtype": "Button",
"permlevel": 0
},
{
"print_width": "50%",
"oldfieldtype": "Column Break",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break2",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"description": "Supplier's currency",
"oldfieldtype": "Select",
"doctype": "DocField",
"label": "Currency",
"oldfieldname": "currency",
"options": "link:Currency",
"fieldname": "currency",
"fieldtype": "Select",
"reqd": 1,
"permlevel": 0
},
{
"print_hide": 1,
"description": "Rate at which supplier's currency is converted to company's base currency",
"default": "1.00",
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Conversion Rate",
"oldfieldname": "conversion_rate",
"fieldname": "conversion_rate",
"fieldtype": "Float",
"reqd": 1,
"fieldname": "section_break_20",
"fieldtype": "Section Break",
"permlevel": 0
},
{
@@ -319,6 +273,71 @@
"fieldtype": "Button",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Currency & Price List",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"print_hide": 1,
"description": "Supplier's currency",
"oldfieldtype": "Select",
"doctype": "DocField",
"label": "Currency",
"oldfieldname": "currency",
"options": "link:Currency",
"fieldname": "currency",
"fieldtype": "Select",
"reqd": 1,
"permlevel": 0
},
{
"print_hide": 1,
"description": "Rate at which supplier's currency is converted to company's base currency",
"default": "1.00",
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Exchange Rate",
"oldfieldname": "conversion_rate",
"fieldname": "conversion_rate",
"fieldtype": "Float",
"reqd": 1,
"permlevel": 0
},
{
"print_width": "50%",
"oldfieldtype": "Column Break",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break2",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Price List",
"options": "Price List",
"fieldname": "price_list_name",
"fieldtype": "Link",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Price List Currency",
"options": "Currency",
"fieldname": "price_list_currency",
"fieldtype": "Link",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Price List Exchange Rate",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
"permlevel": 0
},
{
"description": "Add / Edit Taxes and Charges",
"oldfieldtype": "Section Break",
@@ -369,16 +388,6 @@
"fieldtype": "Button",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Total Tax",
"oldfieldname": "total_tax",
"fieldname": "total_tax",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "HTML",
@@ -397,6 +406,107 @@
"fieldtype": "Section Break",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Net Total (Import)",
"oldfieldname": "net_total_import",
"fieldname": "net_total_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Added (Import)",
"oldfieldname": "other_charges_added_import",
"fieldname": "other_charges_added_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Deducted (Import)",
"oldfieldname": "other_charges_deducted_import",
"fieldname": "other_charges_deducted_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Grand Total (Import)",
"oldfieldname": "grand_total_import",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "In Words (Import)",
"oldfieldname": "in_words_import",
"fieldname": "in_words_import",
"fieldtype": "Data",
"permlevel": 1
},
{
"print_width": "50%",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break3",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"print_width": "150px",
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Net Total",
"oldfieldname": "net_total",
"width": "150px",
"fieldname": "net_total",
"fieldtype": "Currency",
"reqd": 1,
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Added",
"oldfieldname": "other_charges_added",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Deducted",
"oldfieldname": "other_charges_deducted",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Total Tax",
"oldfieldname": "total_tax",
"fieldname": "total_tax",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
@@ -428,74 +538,6 @@
"fieldtype": "Data",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Added",
"oldfieldname": "other_charges_added",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Deducted",
"oldfieldname": "other_charges_deducted",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_width": "50%",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break3",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Grand Total (Import)",
"oldfieldname": "grand_total_import",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "In Words (Import)",
"oldfieldname": "in_words_import",
"fieldname": "in_words_import",
"fieldtype": "Data",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Added (Import)",
"oldfieldname": "other_charges_added_import",
"fieldname": "other_charges_added_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Deducted (Import)",
"oldfieldname": "other_charges_deducted_import",
"fieldname": "other_charges_deducted_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"description": "Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.",
"oldfieldtype": "Section Break",
@@ -560,6 +602,12 @@
"fieldtype": "Link",
"permlevel": 0
},
{
"doctype": "DocField",
"fieldname": "column_break_57",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"doctype": "DocField",
@@ -623,6 +671,7 @@
},
{
"print_hide": 1,
"permlevel": 1,
"print_width": "150px",
"no_copy": 1,
"oldfieldtype": "Data",
@@ -633,22 +682,7 @@
"fieldname": "amended_from",
"fieldtype": "Data",
"hidden": 1,
"permlevel": 1
},
{
"print_hide": 1,
"description": "The date at which current entry is corrected in the system.",
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Date",
"doctype": "DocField",
"label": "Amendment Date",
"oldfieldname": "amendment_date",
"width": "100px",
"fieldname": "amendment_date",
"fieldtype": "Date",
"hidden": 1,
"permlevel": 0
"options": "Purchase Receipt"
},
{
"print_hide": 1,