From 7d8b189c8f88f533af7499c7ca20aaf5b025e429 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 8 Nov 2013 16:27:18 +0530 Subject: [PATCH] [cleanup] UI Fixes --- public/js/transaction.js | 3 +- public/js/utils.js | 2 +- .../stock_entry_detail/stock_entry_detail.txt | 58 ++++++++++++------- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/public/js/transaction.js b/public/js/transaction.js index b1201907c1..dc4698f7a9 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -455,7 +455,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ }).join("\n"); if(!rows) return ""; - return '
\ + return '

Show / Hide tax break-up

\ +
\ ' + headings + ' \ ' + rows + ' \
'; diff --git a/public/js/utils.js b/public/js/utils.js index 227aa32676..2f05ebf4ee 100644 --- a/public/js/utils.js +++ b/public/js/utils.js @@ -43,7 +43,7 @@ $.extend(erpnext, { var $btn = $('') .appendTo($("
") - .css({"margin-bottom": "10px", "margin-top": "-10px"}) + .css({"margin-bottom": "10px", "margin-left": "15px"}) .appendTo(grid_row.fields_dict.serial_no.$wrapper)); $btn.on("click", function() { diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt index 5218c1a4ed..b97928b961 100644 --- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt +++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-29 18:22:12", "docstatus": 0, - "modified": "2013-10-23 14:35:46", + "modified": "2013-11-08 16:15:44", "modified_by": "Administrator", "owner": "Administrator" }, @@ -110,25 +110,9 @@ }, { "doctype": "DocField", - "fieldname": "incoming_rate", - "fieldtype": "Currency", - "in_list_view": 1, - "label": "Valuation Rate", - "oldfieldname": "incoming_rate", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "read_only": 0, - "reqd": 0 - }, - { - "doctype": "DocField", - "fieldname": "amount", - "fieldtype": "Currency", - "label": "Amount", - "oldfieldname": "amount", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "read_only": 1 + "fieldname": "serial_no_batch", + "fieldtype": "Section Break", + "label": "Serial No / Batch" }, { "doctype": "DocField", @@ -152,6 +136,34 @@ "print_hide": 1, "read_only": 0 }, + { + "doctype": "DocField", + "fieldname": "accounting", + "fieldtype": "Section Break", + "label": "Accounting" + }, + { + "doctype": "DocField", + "fieldname": "incoming_rate", + "fieldtype": "Currency", + "in_list_view": 1, + "label": "Valuation Rate", + "oldfieldname": "incoming_rate", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "read_only": 0, + "reqd": 0 + }, + { + "doctype": "DocField", + "fieldname": "amount", + "fieldtype": "Currency", + "label": "Amount", + "oldfieldname": "amount", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "read_only": 1 + }, { "depends_on": "eval:sys_defaults.auto_accounting_for_stock", "doctype": "DocField", @@ -174,6 +186,12 @@ "read_only": 0, "reqd": 0 }, + { + "doctype": "DocField", + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info" + }, { "doctype": "DocField", "fieldname": "actual_qty",