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

[cleanup] UI Fixes

Browse Source
This commit is contained in:
Rushabh Mehta 2013-11-08 16:27:18 +05:30
parent 9939e9079d
commit 7d8b189c8f
3 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/transaction.js
View File

@ -455,7 +455,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
}).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>';

2
public/js/utils.js
View File

@ -43,7 +43,7 @@ $.extend(erpnext, {
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() {

58
stock/doctype/stock_entry_detail/stock_entry_detail.txt
View File

@ -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",