Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index 6989ad2..7d43bbe 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -55,7 +55,8 @@
wn.set_route("general-ledger");
});
- cur_frm.dashboard.add_progress()
+ var percent_paid = cint(flt(doc.grand_total - doc.outstanding_amount) / flt(doc.grand_total) * 100);
+ cur_frm.dashboard.add_progress(percent_paid + "% Paid", percent_paid);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
diff --git a/accounts/doctype/sales_invoice/sales_invoice_list.js b/accounts/doctype/sales_invoice/sales_invoice_list.js
index e83611a..5b6230d 100644
--- a/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -1,10 +1,10 @@
// render
wn.listview_settings['Sales Invoice'] = {
add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"],
- add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph",
+ add_columns: [{"content":"Percent Paid", width:"10%", type:"bar-graph",
label: "Payment Received"}],
prepare_data: function(data) {
- data.paid_amount = flt(data.grand_total) ? (((flt(data.grand_total) -
+ data["Percent Paid"] = flt(data.grand_total) ? (((flt(data.grand_total) -
flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0;
}
};
diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js
index e412a23..137edb8 100644
--- a/home/page/activity/activity.js
+++ b/home/page/activity/activity.js
@@ -56,7 +56,7 @@
// link
if(data.doc_name && data.feed_type!='Login') {
- data.link = repl('<a href="#!Form/%(doc_type)s/%(doc_name)s">%(doc_name)s</a>', data)
+ data.link = wn.format(data.doc_name, {"fieldtype":"Link", "options":data.doc_type})
} else {
data.link = "";
}
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index 27c82f6..cf757a6 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -397,7 +397,7 @@
// NOTE:
// write_off_amount is only for POS Invoice
// total_advance is only for non POS Invoice
- if(this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.docstatus < 2) {
+ if(this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.docstatus==0) {
wn.model.round_floats_in(this.frm.doc, ["grand_total", "total_advance", "write_off_amount",
"paid_amount"]);
var total_amount_to_pay = this.frm.doc.grand_total - this.frm.doc.write_off_amount;
diff --git a/setup/doctype/currency_exchange/currency_exchange.txt b/setup/doctype/currency_exchange/currency_exchange.txt
index f90ecc2..db20839 100644
--- a/setup/doctype/currency_exchange/currency_exchange.txt
+++ b/setup/doctype/currency_exchange/currency_exchange.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 15:40:29",
"docstatus": 0,
- "modified": "2013-07-05 14:33:47",
+ "modified": "2013-07-05 16:26:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,7 +11,7 @@
"description": "Specify Exchange Rate to convert one currency into another",
"doctype": "DocType",
"document_type": "Master",
- "icon": "icon-bitcoin",
+ "icon": "icon-exchange",
"module": "Setup",
"name": "__common__"
},
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index 548be2f..54725a1 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
- "modified": "2013-07-05 14:43:01",
+ "modified": "2013-07-05 16:24:34",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,7 +14,7 @@
"description": "A Product or a Service that is bought, sold or kept in stock.",
"doctype": "DocType",
"document_type": "Master",
- "icon": "icon-circle",
+ "icon": "icon-tag",
"max_attachments": 1,
"module": "Stock",
"name": "__common__",
diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js
index a59fe07..4528cd4 100644
--- a/stock/page/stock_home/stock_home.js
+++ b/stock/page/stock_home/stock_home.js
@@ -111,6 +111,7 @@
{
"route":"Sales Browser/Item Group",
"label": wn._("Item Group"),
+ "doctype": "Item Group",
"description": wn._("Item classification.")
},
{