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

Image field and view added to all stock doctypes

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-02-12 10:39:43 +05:30
parent 6f51c2e4cc
commit 3361df709c
3 changed files with 61 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@ -56,6 +56,12 @@
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"permlevel": 0,
"precision": ""
},
{
"fieldname": "description",
"fieldtype": "Small Text",
@ -69,6 +75,27 @@
"reqd": 1,
"width": "300px"
},
{
"fieldname": "column_break_8",
"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",
@ -438,7 +465,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-01-01 14:29:59.711539",
"modified": "2015-02-12 10:34:45.460334",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",

35
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -20,6 +20,12 @@
"search_index": 1,
"width": "100px"
},
{
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": ""
},
{
"fieldname": "item_name",
"fieldtype": "Data",
@ -35,9 +41,10 @@
"search_index": 0
},
{
"fieldname": "col_break1",
"fieldtype": "Column Break",
"permlevel": 0
"fieldname": "section_break_4",
"fieldtype": "Section Break",
"permlevel": 0,
"precision": ""
},
{
"fieldname": "description",
@ -52,6 +59,26 @@
"reqd": 1,
"width": "300px"
},
{
"fieldname": "col_break1",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"fieldname": "image",
"fieldtype": "Attach",
"label": "Image",
"permlevel": 0,
"precision": ""
},
{
"fieldname": "image_view",
"fieldtype": "Image",
"label": "Image View",
"options": "image",
"permlevel": 0,
"precision": ""
},
{
"fieldname": "received_and_accepted",
"fieldtype": "Section Break",
@ -559,7 +586,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-01-01 14:30:00.032715",
"modified": "2015-02-12 10:37:31.933726",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",

3
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -432,7 +432,7 @@ class StockEntry(StockController):
})
def get_item_details(self, args):
item = frappe.db.sql("""select stock_uom, description, item_name,
item = frappe.db.sql("""select stock_uom, description, image, item_name,
expense_account, buying_cost_center, item_group from `tabItem`
where name = %s and (ifnull(end_of_life,'0000-00-00')='0000-00-00' or end_of_life > now())""",
(args.get('item_code')), as_dict = 1)
@ -444,6 +444,7 @@ class StockEntry(StockController):
'uom' : item.stock_uom,
'stock_uom' : item.stock_uom,
'description' : item.description,
'image' : item.image,
'item_name' : item.item_name,
'expense_account' : args.get("expense_account") \
or frappe.db.get_value("Company", args.get("company"), "stock_adjustment_account"),