[minor] removed company description and don't call apply_price_list if no items
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index b43af26..e103196 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -117,7 +117,7 @@
"report_hide": 0
},
{
- "description": "Select the relevant company name if you have multiple companies",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -775,7 +775,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-15 07:34:27.901777",
+ "modified": "2015-01-30 04:20:42.103367",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index a938481..a6c7ae7 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -117,7 +117,7 @@
"report_hide": 0
},
{
- "description": "Select the relevant company name if you have multiple companies",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -575,7 +575,7 @@
"icon": "icon-shopping-cart",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-15 07:34:12.734538",
+ "modified": "2015-01-30 04:20:19.719720",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",
diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js
index f202fb7..bf10c15 100644
--- a/erpnext/public/js/transaction.js
+++ b/erpnext/public/js/transaction.js
@@ -394,9 +394,13 @@
apply_price_list: function(item) {
var me = this;
+ var args = this._get_args(item);
+ if(!args.item_list.length) {
+ return;
+ }
return this.frm.call({
method: "erpnext.stock.get_item_details.apply_price_list",
- args: { args: this._get_args(item) },
+ args: { args: args },
callback: function(r) {
if (!r.exc) {
me.in_apply_price_list = true;
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 7251a67..ca48808 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -168,7 +168,7 @@
"reqd": 1
},
{
- "description": "Select the relevant company name if you have multiple companies.",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -237,7 +237,7 @@
"icon": "icon-wrench",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-07 10:50:31.542246",
+ "modified": "2015-01-30 04:22:34.375717",
"modified_by": "Administrator",
"module": "Selling",
"name": "Installation Note",
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 38cce98..bb912a7 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -151,7 +151,7 @@
"width": "150px"
},
{
- "description": "Select the relevant company name if you have multiple companies.",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -810,7 +810,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 1,
- "modified": "2015-01-15 07:33:06.919752",
+ "modified": "2015-01-30 04:19:47.045878",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index e834e00..a142d03 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -125,7 +125,7 @@
"width": "150px"
},
{
- "description": "Select the relevant company name if you have multiple companies.",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -1034,7 +1034,7 @@
"idx": 1,
"is_submittable": 1,
"issingle": 0,
- "modified": "2015-01-15 07:51:42.642249",
+ "modified": "2015-01-30 04:20:02.166745",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 8d00f94..9fa0b7d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -142,7 +142,7 @@
"width": "150px"
},
{
- "description": "Select the relevant company name if you have multiple companies",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -1024,7 +1024,7 @@
"idx": 1,
"in_create": 0,
"is_submittable": 1,
- "modified": "2015-01-15 07:33:24.245923",
+ "modified": "2015-01-30 04:21:39.709704",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index bd7dab6..4a14380 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -54,7 +54,7 @@
"width": "150px"
},
{
- "description": "Select the relevant company name if you have multiple companies",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
@@ -236,7 +236,7 @@
"icon": "icon-ticket",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-06 17:38:12.250644",
+ "modified": "2015-01-30 04:21:23.753767",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 9a84d3d..119c770 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -596,7 +596,7 @@
"report_hide": 1
},
{
- "description": "Select the relevant company name if you have multiple companies",
+ "description": "",
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
@@ -767,7 +767,7 @@
"icon": "icon-truck",
"idx": 1,
"is_submittable": 1,
- "modified": "2015-01-15 07:34:39.475183",
+ "modified": "2015-01-30 04:22:04.356498",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",