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

[selling] changed fieldtype of Price List to link

Browse Source
This commit is contained in:
Anand Doshi 2013-07-26 11:32:02 +05:30
parent 23de6df72e
commit 720a01a6f6
8 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/doctype/pos_setting/pos_setting.js
View File

@ -18,8 +18,10 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
$c_obj(make_doclist(cdt,cdn),'get_series','',function(r,rt){
if(r.message) set_field_options('naming_series', r.message);
});
cur_frm.set_query("price_list_name", function() {
return { filters: { buying_or_selling: "Selling" } };
});
}
//cash bank account

6
accounts/doctype/pos_setting/pos_setting.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 12:15:51",
"docstatus": 0,
"modified": "2013-07-05 14:50:33",
"modified": "2013-07-26 11:16:53",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -94,11 +94,11 @@
{
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"label": "Price List",
"oldfieldname": "price_list_name",
"oldfieldtype": "Select",
"options": "link:Price List",
"options": "Price List",
"read_only": 0,
"reqd": 1
},

6
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
"modified": "2013-07-25 16:08:10",
"modified": "2013-07-26 11:16:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -247,11 +247,11 @@
{
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"label": "Price List",
"oldfieldname": "price_list_name",
"oldfieldtype": "Select",
"options": "link:Price List",
"options": "Price List",
"print_hide": 1,
"read_only": 0,
"reqd": 1

6
selling/doctype/quotation/quotation.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
"modified": "2013-07-23 15:27:53",
"modified": "2013-07-26 11:16:53",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -281,12 +281,12 @@
"description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"in_filter": 1,
"label": "Price List",
"oldfieldname": "price_list_name",
"oldfieldtype": "Select",
"options": "link:Price List",
"options": "Price List",
"print_hide": 1,
"read_only": 0,
"reqd": 1,

16
selling/doctype/sales_common/sales_common.js
View File

@ -70,6 +70,22 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.frm.fields_dict.lead && this.frm.set_query("lead", function(doc,cdt,cdn) {
return{ query:"controllers.queries.lead_query" } });
if(this.frm.fields_dict.price_list_name) {
this.frm.set_query("price_list_name", function() {
return { filters: { buying_or_selling: "Selling" } };
});
this.frm.set_query("price_list_currency", function() {
return {
query: "controllers.queries.get_price_list_currency",
filters: {
price_list_name: me.frm.doc.price_list_name,
buying_or_selling: "Selling"
}
};
});
}
if(!this.fname) {
return;
}

6
selling/doctype/sales_order/sales_order.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-06-18 12:39:59",
"docstatus": 0,
"modified": "2013-07-23 15:27:39",
"modified": "2013-07-26 11:16:55",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -294,11 +294,11 @@
"description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"label": "Price List",
"oldfieldname": "price_list_name",
"oldfieldtype": "Select",
"options": "link:Price List",
"options": "Price List",
"print_hide": 1,
"reqd": 1,
"width": "100px"

4
setup/doctype/price_list/price_list.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-25 11:35:09",
"docstatus": 0,
"modified": "2013-07-23 12:03:25",
"modified": "2013-07-26 11:19:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -55,6 +55,7 @@
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Currency",
"options": "Currency",
"reqd": 1
@ -64,6 +65,7 @@
"doctype": "DocField",
"fieldname": "buying_or_selling",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Valid for Buying or Selling?",
"options": "Buying\nSelling",
"reqd": 1

6
stock/doctype/delivery_note/delivery_note.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
"modified": "2013-07-23 15:28:18",
"modified": "2013-07-26 11:16:57",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -286,11 +286,11 @@
"description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"label": "Price List",
"oldfieldname": "price_list_name",
"oldfieldtype": "Select",
"options": "link:Price List",
"options": "Price List",
"print_hide": 1,
"read_only": 0,
"reqd": 1