listing with stats
diff --git a/erpnext/accounts/doctype/journal_voucher/listview.js b/erpnext/accounts/doctype/journal_voucher/listview.js
new file mode 100644
index 0000000..03c87f8
--- /dev/null
+++ b/erpnext/accounts/doctype/journal_voucher/listview.js
@@ -0,0 +1,13 @@
+wn.doclistviews['Journal Voucher'] = wn.pages.ListView.extend({
+ init: function(doctype) {
+ this._super(doctype);
+ this.fields = this.fields.concat([
+ '`tabJournal Voucher`.voucher_type'
+ ]);
+ this.stats = this.stats.concat(['voucher_type']);
+ },
+ render: function(row, data) {
+ this._super(row, data);
+ this.$main.html(data.voucher_type);
+ }
+});
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/listview.js b/erpnext/selling/doctype/sales_order/listview.js
index 3c4fcb7..e5d574f 100644
--- a/erpnext/selling/doctype/sales_order/listview.js
+++ b/erpnext/selling/doctype/sales_order/listview.js
@@ -1,21 +1,16 @@
// render
-wn.doclistviews['Sales Order'] = {
- fields: [
- { field: "name", name: "ID"},
- { field: "owner", name: "Created By"},
- { field: "modified", name: "Last Updated"},
- { field: "customer_name", name: "Customer", width:300},
- { field: "per_delivered", name: "% Delivered",
- query: "ifnull(per_delivered,0) as per_delivered"},
- { field: "per_billed", name: "% Billed",
- query: "ifnull(per_billed,0) as per_billed"},
- { field: "currency", name: "Currency"},
- { field: "grand_total_export", name: "Grand Total",
- query:"ifnull(grand_total_export,0) as grand_total_export"},
- { field: "docstatus", name: "Status"}
- ],
+wn.doclistviews['Sales Order'] = wn.pages.ListView.extend({
+ init: function(doctype) {
+ this._super(doctype)
+ this.fields = this.fields.concat([
+ "`tabSales Order`.customer_name",
+ "ifnull(`tabSales Order`.per_delivered,0) as per_delivered",
+ "ifnull(`tabSales Order`.per_billed,0) as per_billed",
+ "`tabSales Order`.currency",
+ "ifnull(`tabSales Order`.grand_total_export,0) as grand_total_export"
+ ]);
+ },
render: function(row, data, listobj) {
- data.modified_date = dateutil.str_to_user(data.modified).split(' ')[0];
// bar color for billed
data.bar_class_delivered = ''; data.bar_class_billed = '';
@@ -24,27 +19,30 @@
// lock for docstatus
data.icon = '';
- if(data.docstatus==1) {
+ data.item_color = 'grey';
+ if(data.docstatus==0) {
+ data.customer_name = '[Draft] ' + data.customer_name;
+ } else if(data.docstatus==1) {
data.icon = ' <i class="icon-lock" title="Submitted"></i>';
+ data.item_color = 'blue';
+ } else if(data.docstatus==2) {
+ data.icon = ' <i class="icon-remove" title="Cancelled"></i>';
+ data.item_color = 'red';
}
- $(row).html(repl('<span class="avatar-small"><img src="%(avatar)s" /></span>\
- <a href="#!Form/%(doctype)s/%(name)s">%(name)s</a>\
- %(icon)s\
- <span style="color:#444">%(customer_name)s</span>\
- <span class="bar-outer" style="width: 30px; float: right" \
- title="%(per_delivered)s% Delivered">\
- <span class="bar-inner %(bar_class_delivered)s" \
- style="width: %(per_delivered)s%;"></span>\
- </span>\
- <span class="bar-outer" style="width: 30px; float: right" \
- title="%(per_billed)s% Billed">\
- <span class="bar-inner %(bar_class_billed)s" \
- style="width: %(per_billed)s%;"></span>\
- </span>\
- <span style="float:right; font-size: 11px; color: #888;\
- margin-left: 7px;">%(modified_date)s</span>\
- <span style="color:#444; float: right;">%(currency)s %(grand_total_export)s</span>\
- ', data)).addClass('list-row');
+ this._super(row, data);
+ this.$main.html(repl('<span style="color:%(item_color)s">%(customer_name)s</span>\
+ <span class="bar-outer" style="width: 30px; float: right" \
+ title="%(per_delivered)s% Delivered">\
+ <span class="bar-inner %(bar_class_delivered)s" \
+ style="width: %(per_delivered)s%;"></span>\
+ </span>\
+ <span class="bar-outer" style="width: 30px; float: right" \
+ title="%(per_billed)s% Billed">\
+ <span class="bar-inner %(bar_class_billed)s" \
+ style="width: %(per_billed)s%;"></span>\
+ </span>\
+ <span style="color:#444; float: right;">%(currency)s %(grand_total_export)s</span>\
+ ', data))
}
-}
+});
diff --git a/erpnext/stock/Module Def/Stock/Stock.txt b/erpnext/stock/Module Def/Stock/Stock.txt
deleted file mode 100644
index 991d410..0000000
--- a/erpnext/stock/Module Def/Stock/Stock.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-# Module Def, Stock
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-07-01 17:40:49',
- 'docstatus': 0,
- 'modified': '2012-02-01 15:43:00',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Stock',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Stock',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'doctype_list': 'DocType Label, QA Inspection Report',
- 'is_hidden': 'No',
- 'module_desc': 'Material Management',
- 'module_icon': 'Stock.gif',
- 'module_label': 'Stock',
- 'module_name': 'Stock',
- 'module_seq': 7,
- 'name': '__common__'
- },
-
- # Module Def, Stock
- {
- 'doctype': u'Module Def',
- 'name': 'Stock'
- },
-
- # Module Def Item
- {
- 'description': 'Item master',
- 'display_name': 'Item',
- 'doc_name': 'Item',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'name\nitem_group\ndescription'
- },
-
- # Module Def Item
- {
- 'description': 'A unique number identifying each entity of an item',
- 'display_name': 'Serial No',
- 'doc_name': 'Serial No',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'item_code\nstatus\nwarehouse\npr_no\ndelivery_note_no\ncustomer'
- },
-
- # Module Def Item
- {
- 'description': 'Record of items added, removed or moved from one warehouse to another.',
- 'display_name': 'Stock Entry',
- 'doc_name': 'Stock Entry',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'transfer_date\npurpose\nfrom_warehouse\nto_warehouse\nremarks'
- },
-
- # Module Def Item
- {
- 'description': 'Record of items delivered to your customers along with the Printed Note',
- 'display_name': 'Delivery Note',
- 'doc_name': 'Delivery Note',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\ncustomer\nterritory\ngrand_total\nper_billed'
- },
-
- # Module Def Item
- {
- 'description': 'Generate Packing Slips based on a Delivery Note',
- 'display_name': 'Packing Slip',
- 'doc_name': 'Packing Slip',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'delivery_note\nfrom_case_no\nto_case_no\nnet_weight_pkg\ngross_weight_pkg'
- },
-
- # Module Def Item
- {
- 'description': 'Record of incoming material from your suppliers',
- 'display_name': 'Purchase Receipt',
- 'doc_name': 'Purchase Receipt',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\nsupplier\ngrand_total\nper_billed'
- },
-
- # Module Def Item
- {
- 'description': 'Details of Installation done after delivery',
- 'display_name': 'Installation Note',
- 'doc_name': 'Installation Note',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Create Quality Inspection Report for any item',
- 'display_name': 'Inspection Report',
- 'doc_name': 'QA Inspection Report',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'inspection_type\nitem_code\nreport_date\npurchase_receipt_no\ndelivery_note_no'
- },
-
- # Module Def Item
- {
- 'description': 'Reconcile your stock by uploading it form an excel file',
- 'display_name': 'Stock Reconciliation',
- 'doc_name': 'Stock Reconciliation',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'reconciliation_date\nreconciliation_time\nremark'
- },
-
- # Module Def Item
- {
- 'description': 'This utility tool will update Stock UOM in Item and will respectively update Actual Qty in Stock Ledger as per Conversion Factor.',
- 'display_name': 'Stock UOM Replace Utility',
- 'doc_name': 'Stock UOM Replace Utility',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'This utility will help in tracking stock for Sales Return and Purchase Return.',
- 'display_name': 'Sales and Purchase Return Wizard',
- 'doc_name': 'Sales and Purchase Return Wizard',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'You can create master template for landed cost wizard',
- 'display_name': 'Landed Cost Master',
- 'doc_name': 'Landed Cost Master',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'icon': 'accept.gif'
- },
-
- # Module Def Item
- {
- 'description': 'Add extra expenses into Purchase Receipt which should be consider for item valuation. The cost will be added proportionately as per purchase receipt value.',
- 'display_name': 'Landed Cost Wizard',
- 'doc_name': 'Landed Cost Wizard',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'icon': 'accept.gif'
- },
-
- # Module Def Item
- {
- 'display_name': 'Stock Ledger',
- 'doc_name': 'Stock Ledger Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Stock Level',
- 'doc_name': 'Bin',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Shortage To Indent',
- 'doc_name': 'Item',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Stock Value as per Item and Warehouse',
- 'display_name': 'Stock Report',
- 'doc_name': 'Stock Ledger Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Stock Aging Report',
- 'doc_name': 'Serial No',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Material User'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Material Master Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Material Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Quality Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/utilities/page/todo/todo.css b/erpnext/utilities/page/todo/todo.css
index 4ac49d6..b7c9f20 100644
--- a/erpnext/utilities/page/todo/todo.css
+++ b/erpnext/utilities/page/todo/todo.css
@@ -3,6 +3,7 @@
border-bottom: 1px solid #DEB85F;
margin-bottom: 5px;
height: 14px;
+ clear: both;
}
.todoitem .label {
diff --git a/erpnext/utilities/page/todo/todo.html b/erpnext/utilities/page/todo/todo.html
index 3400455..32a0a78 100644
--- a/erpnext/utilities/page/todo/todo.html
+++ b/erpnext/utilities/page/todo/todo.html
@@ -4,7 +4,7 @@
<br>
<div id="todo-list">
</div>
- <div style="margin-top: 21px">
+ <div style="margin-top: 21px; clear: both">
<button id="add-todo" class="btn btn-small"><i class="icon-plus"></i> Add</button>
</div>
</div>
\ No newline at end of file