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

[minor] removed company description and don't call apply_price_list if no items

Browse Source
This commit is contained in:
Rushabh Mehta 2015-01-30 16:57:24 +05:30
parent aff9a59f2d
commit 052bd624c1
9 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -117,7 +117,7 @@
"report_hide": 0 "report_hide": 0
}, },
{ {
"description": "Select the relevant company name if you have multiple companies", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -775,7 +775,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-15 07:34:27.901777", "modified": "2015-01-30 04:20:42.103367",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

4
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -117,7 +117,7 @@
"report_hide": 0 "report_hide": 0
}, },
{ {
"description": "Select the relevant company name if you have multiple companies", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -575,7 +575,7 @@
"icon": "icon-shopping-cart", "icon": "icon-shopping-cart",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-15 07:34:12.734538", "modified": "2015-01-30 04:20:19.719720",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

6
erpnext/public/js/transaction.js
View File

@ -394,9 +394,13 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
apply_price_list: function(item) { apply_price_list: function(item) {
var me = this; var me = this;
var args = this._get_args(item);
if(!args.item_list.length) {
return;
}
return this.frm.call({ return this.frm.call({
method: "erpnext.stock.get_item_details.apply_price_list", method: "erpnext.stock.get_item_details.apply_price_list",
args: { args: this._get_args(item) }, args: { args: args },
callback: function(r) { callback: function(r) {
if (!r.exc) { if (!r.exc) {
me.in_apply_price_list = true; me.in_apply_price_list = true;

4
erpnext/selling/doctype/installation_note/installation_note.json
View File

@ -168,7 +168,7 @@
"reqd": 1 "reqd": 1
}, },
{ {
"description": "Select the relevant company name if you have multiple companies.", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -237,7 +237,7 @@
"icon": "icon-wrench", "icon": "icon-wrench",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-07 10:50:31.542246", "modified": "2015-01-30 04:22:34.375717",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Installation Note", "name": "Installation Note",

4
erpnext/selling/doctype/quotation/quotation.json
View File

@ -151,7 +151,7 @@
"width": "150px" "width": "150px"
}, },
{ {
"description": "Select the relevant company name if you have multiple companies.", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -810,7 +810,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-01-15 07:33:06.919752", "modified": "2015-01-30 04:19:47.045878",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -125,7 +125,7 @@
"width": "150px" "width": "150px"
}, },
{ {
"description": "Select the relevant company name if you have multiple companies.", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -1034,7 +1034,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"modified": "2015-01-15 07:51:42.642249", "modified": "2015-01-30 04:20:02.166745",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -142,7 +142,7 @@
"width": "150px" "width": "150px"
}, },
{ {
"description": "Select the relevant company name if you have multiple companies", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -1024,7 +1024,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-15 07:33:24.245923", "modified": "2015-01-30 04:21:39.709704",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

4
erpnext/stock/doctype/material_request/material_request.json
View File

@ -54,7 +54,7 @@
"width": "150px" "width": "150px"
}, },
{ {
"description": "Select the relevant company name if you have multiple companies", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
@ -236,7 +236,7 @@
"icon": "icon-ticket", "icon": "icon-ticket",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-06 17:38:12.250644", "modified": "2015-01-30 04:21:23.753767",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -596,7 +596,7 @@
"report_hide": 1 "report_hide": 1
}, },
{ {
"description": "Select the relevant company name if you have multiple companies", "description": "",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
@ -767,7 +767,7 @@
"icon": "icon-truck", "icon": "icon-truck",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-15 07:34:39.475183", "modified": "2015-01-30 04:22:04.356498",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",