Image field and view added to all selling doctypes
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 8f93b2d..10cfc3a 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -99,13 +99,10 @@
args: {"item_code":d.item_code},
callback: function(r, rt) {
if(r.message) {
- frappe.model.set_value(d.doctype, d.name, "description", r.message.description);
- frappe.model.set_value(d.doctype, d.name, "item_name", r.message.item_name);
- frappe.model.set_value(d.doctype, d.name, "brand", r.message.brand);
- frappe.model.set_value(d.doctype, d.name, "uom", r.message.uom);
- frappe.model.set_value(d.doctype, d.name, "item_group", r.message.item_group);
- frappe.model.set_value(d.doctype, d.name, "image", r.message.image);
- refresh_field('image_view', d.name, 'items');
+ $.each(r.message, function(k, v) {
+ frappe.model.set_value(cdt, cdn, k, v);
+ });
+ refresh_field('image_view', d.name, 'items');
}
}
})
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index c8b028b..cea4d03 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -68,6 +68,7 @@
item_code: function(doc, cdt, cdn) {
var me = this;
+ var d = locals[cdt][cdn];
var item = frappe.get_doc(cdt, cdn);
if(item.item_code || item.barcode || item.serial_no) {
if(!this.validate_company_and_party()) {
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 04f0f10..a1031a3 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -67,6 +67,21 @@
"width": "300px"
},
{
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "label": "Image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "quantity_and_rate",
"fieldtype": "Section Break",
"label": "Quantity and Rate",
@@ -332,7 +347,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-01-01 14:29:59.329982",
+ "modified": "2015-02-10 15:21:17.447331",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 640e992..4d676ef 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -30,6 +30,11 @@
"read_only": 1
},
{
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
"fieldname": "item_name",
"fieldtype": "Data",
"in_list_view": 1,
@@ -44,9 +49,10 @@
"width": "150"
},
{
- "fieldname": "col_break1",
- "fieldtype": "Column Break",
- "permlevel": 0
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
},
{
"fieldname": "description",
@@ -64,6 +70,27 @@
"width": "300px"
},
{
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "label": "Image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "quantity_and_rate",
"fieldtype": "Section Break",
"label": "Quantity and Rate",
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index c6574ea..e5b7b69 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -20,6 +20,11 @@
"width": "100px"
},
{
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
"fieldname": "item_name",
"fieldtype": "Data",
"in_filter": 1,
@@ -35,9 +40,10 @@
"width": "100px"
},
{
- "fieldname": "col_break1",
- "fieldtype": "Column Break",
- "permlevel": 0
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
},
{
"fieldname": "description",
@@ -52,6 +58,27 @@
"width": "250px"
},
{
+ "fieldname": "column_break_6",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "label": "Image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "quantity_and_warehouse",
"fieldtype": "Section Break",
"in_list_view": 0,
@@ -235,7 +262,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-01-01 14:29:59.597199",
+ "modified": "2015-02-10 16:14:59.940476",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 7e737ef..98b5038 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -55,6 +55,11 @@
"search_index": 1
},
{
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
"fieldname": "item_name",
"fieldtype": "Data",
"label": "Item Name",
@@ -63,9 +68,10 @@
"read_only": 1
},
{
- "fieldname": "col_break2",
- "fieldtype": "Column Break",
- "permlevel": 0
+ "fieldname": "section_break_8",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
},
{
"fieldname": "description",
@@ -80,6 +86,27 @@
"width": "300px"
},
{
+ "fieldname": "column_break_10",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image",
+ "fieldtype": "Attach",
+ "label": "Image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "label": "Image View",
+ "options": "image",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "quantity_and_rate",
"fieldtype": "Section Break",
"label": "Quantity and Rate",
@@ -302,7 +329,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2014-08-11 03:54:49.688635",
+ "modified": "2015-02-10 16:18:48.313676",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 9d0f3b8..29897ef 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -147,7 +147,8 @@
out = frappe._dict({
"item_code": item.name,
"item_name": item.item_name,
- "description": cstr(item.description_html).strip() or cstr(item.description).strip(),
+ "description": cstr(item.description).strip(),
+ "image": cstr(item.image).strip(),
"warehouse": user_default_warehouse or args.warehouse or item.default_warehouse,
"income_account": get_default_income_account(args, item),
"expense_account": get_default_expense_account(args, item),