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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait 2013-07-05 18:34:10 +05:30
commit 2d2d800f0f
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -55,7 +55,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
wn.set_route("general-ledger"); 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); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);

4
accounts/doctype/sales_invoice/sales_invoice_list.js
View File

@ -1,10 +1,10 @@
// render // render
wn.listview_settings['Sales Invoice'] = { wn.listview_settings['Sales Invoice'] = {
add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"], 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"}], label: "Payment Received"}],
prepare_data: function(data) { 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; flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0;
} }
}; };

2
home/page/activity/activity.js
View File

@ -56,7 +56,7 @@ erpnext.ActivityFeed = Class.extend({
// link // link
if(data.doc_name && data.feed_type!='Login') { 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 { } else {
data.link = ""; data.link = "";
} }

2
selling/doctype/sales_common/sales_common.js
View File

@ -397,7 +397,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
// NOTE: // NOTE:
// write_off_amount is only for POS Invoice // write_off_amount is only for POS Invoice
// total_advance is only for non 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", wn.model.round_floats_in(this.frm.doc, ["grand_total", "total_advance", "write_off_amount",
"paid_amount"]); "paid_amount"]);
var total_amount_to_pay = this.frm.doc.grand_total - this.frm.doc.write_off_amount; var total_amount_to_pay = this.frm.doc.grand_total - this.frm.doc.write_off_amount;

4
setup/doctype/currency_exchange/currency_exchange.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-06-20 15:40:29", "creation": "2013-06-20 15:40:29",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-05 14:33:47", "modified": "2013-07-05 16:26:11",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -11,7 +11,7 @@
"description": "Specify Exchange Rate to convert one currency into another", "description": "Specify Exchange Rate to convert one currency into another",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
"icon": "icon-bitcoin", "icon": "icon-exchange",
"module": "Setup", "module": "Setup",
"name": "__common__" "name": "__common__"
}, },

4
stock/doctype/item/item.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-03 10:45:46", "creation": "2013-05-03 10:45:46",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-05 14:43:01", "modified": "2013-07-05 16:24:34",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -14,7 +14,7 @@
"description": "A Product or a Service that is bought, sold or kept in stock.", "description": "A Product or a Service that is bought, sold or kept in stock.",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
"icon": "icon-circle", "icon": "icon-tag",
"max_attachments": 1, "max_attachments": 1,
"module": "Stock", "module": "Stock",
"name": "__common__", "name": "__common__",

1
stock/page/stock_home/stock_home.js
View File

@ -111,6 +111,7 @@ wn.module_page["Stock"] = [
{ {
"route":"Sales Browser/Item Group", "route":"Sales Browser/Item Group",
"label": wn._("Item Group"), "label": wn._("Item Group"),
"doctype": "Item Group",
"description": wn._("Item classification.") "description": wn._("Item classification.")
}, },
{ {