[cleanup] UI Fixes
diff --git a/public/js/transaction.js b/public/js/transaction.js
index b120190..dc4698f 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -455,7 +455,8 @@
}).join("\n");
if(!rows) return "";
- return '<div style="overflow-x: scroll;"><table class="table table-bordered table-hover">\
+ return '<p><a href="#" onclick="$(\'.tax-break-up\').toggleClass(\'hide\'); return false;">Show / Hide tax break-up</a><br><br></p>\
+ <div class="tax-break-up hide" style="overflow-x: auto;"><table class="table table-bordered table-hover">\
<thead><tr>' + headings + '</tr></thead> \
<tbody>' + rows + '</tbody> \
</table></div>';
diff --git a/public/js/utils.js b/public/js/utils.js
index 227aa32..2f05ebf 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -43,7 +43,7 @@
var $btn = $('<button class="btn btn-sm btn-default">'+wn._("Add Serial No")+'</button>')
.appendTo($("<div>")
- .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 5218c1a..b97928b 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",
@@ -153,6 +137,34 @@
"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",
"fieldname": "expense_account",
@@ -176,6 +188,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "actual_qty",
"fieldtype": "Float",
"in_filter": 1,