diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 5b034f8b23..2f60dca904 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -16,7 +16,6 @@ class Account(Document):
if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.user.get_roles():
self.get("__onload").can_freeze_account = True
-
def autoname(self):
self.name = self.account_name.strip() + ' - ' + \
frappe.db.get_value("Company", self.company, "abbr")
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
index ac402662b6..187c59a3fc 100644
--- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
@@ -440,7 +440,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-05-27 03:49:12.326026",
+ "modified": "2014-07-31 05:05:03.294068",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Voucher",
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.html b/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.html
new file mode 100644
index 0000000000..aaa3854fef
--- /dev/null
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.html
@@ -0,0 +1,20 @@
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.get_formatted("posting_date") %}
+
+ {%= doc.voucher_type %}
+
+ {% if(doc.docstatus===0) { %}
+ {%= __("Draft") %}
+ {% } %}
+
+
+
+ {%= doc.get_formatted("total_debit") %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.supplier_name %}
+ {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
+ {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
+
+ {%= __("Overdue: ") + comment_when(doc.due_date) %}
+
+ {% } else { %}
+
+ {%= doc.get_formatted("due_date") %}
+ {% } %}
+ {% } %}
+ {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
+
+ {%= __("Paid") %}
+
+ {% } %}
+ {% if(doc.docstatus===0) { %}
+ {%= __("Draft") %}
+ {% } %}
+
+
+
+ {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+ {%= doc.get_formatted("grand_total_import") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer_name %}
+ {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
+ {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
+
+ {%= __("Overdue: ") + comment_when(doc.due_date) %}
+
+ {% } else { %}
+
+ {%= doc.get_formatted("due_date") %}
+ {% } %}
+ {% } %}
+ {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
+
+ {%= __("Paid") %}
+
+ {% } %}
+ {% if(doc.docstatus===0) { %}
+ {%= __("Draft") %}
+ {% } %}
+
+
+
+ {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+ {%= doc.get_formatted("grand_total_export") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.supplier_name %}
+ {% if(doc.per_received < 100 && doc.status!=="Stopped") { %}
+
+ {%= __("Pending") %}
+
+ {% } %}
+ {% if(doc.status==="Stopped" || doc.status==="Draft") { %}
+ {%= __(doc.status) %}
+ {% } %}
+ {% if(doc.per_received == 100 && doc.status!=="Stopped") { %}
+
+
+ {% } %}
+
+
+
+ {% var completed = doc.per_received, title = __("Received") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+ {% var completed = doc.per_billed, title = __("Billed") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+ {%= doc.get_formatted("grand_total_import") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(doc.supplier_name != doc.name) { %}
+
+ {%= doc.supplier_name %}
+ {% } %}
+
+ {%= doc.supplier_type %}
+
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.supplier %}
+
+
+ {%= doc.status %}
+
+
+
+
+ {%= doc.get_formatted("grand_total_import") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.status %}
+
+
+
+
+
+ {%= doc.get_formatted("att_date") %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {% if(doc.status==="Active") { %}
+
+
+
+ {% } %}
+
+ {% if(doc.designation) { %}
+
+ {%= doc.designation %}
+ {% } %}
+
+ {% if(doc.branch) { %}
+
+ {%= doc.branch %}
+
+ {% } %}
+
+ {% if(doc.department) { %}
+
+ {%= doc.department %}
+
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.employee_name %}
+
+
+ {%= doc.approval_status %}
+
+
+
+
+
+
+ {%= doc.get_formatted("total_claimed_amount") %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.employee_name %}
+
+
+ {%= __("{0} days from {1}",
+ [doc.total_leave_days, doc.get_formatted("from_date")]) %}
+
+
+ {%= doc.status %}
+
+
+
+ {%= doc.leave_type %}
+
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+
+ {%= doc.employee_name %}
+
+
+
+
+
+ {%= doc.month %}
+
+
+
+ {%= doc.fiscal_year %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(cint(doc.is_active)) { %}
+
+ {%= __("Active") %}
+ {% } %}
+ {% if(cint(doc.is_default)) { %}
+
+ {%= __("Default") %}
+ {% } %}
+
+
+
+ {%= doc.get_formatted("total_cost") %}
+
+
+
+
+ {% var per = 100 - cint((doc.qty - doc.produced_qty) * 100 / doc.qty); %}
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer_name %}
+ {% if(per < 100 && doc.status!=="Stopped") { %}
+ {% if(frappe.datetime.get_diff(doc.expected_delivery_date) < 0) { %}
+
+ {%= __("Overdue") %}
+
+ {% } else { %}
+
+ {%= doc.get_formatted("expected_delivery_date")%}
+ {% } %}
+ {% } %}
+ {% if(per == 100 && doc.status!=="Stopped") { %}
+
+
+ {% } %}
+ {% if(doc.status==="Stopped") { %}
+ {%= __("Stopped") %}
+ {% } %}
+
+ {%= doc.sales_order %}
+
+ {%= doc.bom_no %}
+
+
+
+ {% var completed = per, title = __("Completed") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.status %}
+
+
+ {%= doc.priority %}
+
+ {% if(doc.status==="Open" && doc.completion_date
+ && frappe.datetime.get_diff(doc.completion_date) <= 0) { %}
+
+ {%= __("Overdue") %}
+
+ {% } else if(doc.completion_date) { %}
+
+ {%= doc.get_formatted("completion_date") %}
+
+ {% } %}
+
+
+
+ {% var completed = doc.percent_complete, title = __("% Tasks Completed") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+ {% var completed = doc.percent_milestones_completed,
+ title = __("% Milestones Achieved") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(doc.project) { %}
+
+ {%= doc.project %}
+ {% } %}
+
+ {%= doc.status %}
+
+
+ {%= doc.priority %}
+
+ {% if(doc.status==="Open" && doc.exp_end_date
+ && frappe.datetime.get_diff(doc.exp_end_date) <= 0) { %}
+
+ {%= __("Overdue") %}
+
+ {% } else if(doc.exp_end_date) { %}
+
+ {%= doc.get_formatted("exp_end_date") %}
+
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(doc.billable) { %}
+
+
+
+ {% } %}
+
+ {%= doc.activity_type %}
+
+ ({%= doc.hours + " " + __("hours") %})
+
+ {% if(doc.project) { %}
+
+ {%= doc.project %}
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.status %}
+
+ ({%= doc.total_hours + " " + __("hours") %})
+
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(doc.customer_name != doc.name) { %}
+
+ {%= doc.customer_name %}
+ {% } %}
+
+ {% if(doc.customer_type==="Company") { %}
+
+ {% } else { %}
+
+ {% } %}
+
+
+ {%= doc.customer_group %}
+ {% if(doc.territory) { %}
+
+
+ {%= doc.territory %}
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.company_name %}
+ {%= doc.status %}
+ {% if(doc.territory) { %}
+
+
+ {%= doc.territory %}
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer_name %} ({%= doc.enquiry_from %})
+
+ {% if(doc.enquiry_type==="Sales") { %}
+
+ {% } else { %}
+
+ {% } %}
+
+ {%= doc.status %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer_name %} ({%= doc.quotation_to %})
+
+
+
+ {% if(doc.order_type==="Service") { %}
+
+ {% } else { %}
+
+ {% } %}
+
+ {%= doc.status %}
+
+
+
+
+ {%= doc.get_formatted("grand_total_export") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer_name %}
+ {% if(doc.per_delivered < 100 && doc.status!=="Stopped") { %}
+ {% if(frappe.datetime.get_diff(doc.delivery_date) < 0) { %}
+
+ {%= __("Overdue") %}
+
+ {% } else { %}
+
+ {%= doc.get_formatted("delivery_date")%}
+ {% } %}
+ {% } %}
+ {% if(doc.per_delivered == 100 && doc.status!=="Stopped") { %}
+
+
+ {% } %}
+ {% if(doc.status==="Stopped") { %}
+ {%= __("Stopped") %}
+ {% } %}
+
+
+
+ {% var completed = doc.per_delivered, title = __("Delivered") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+ {% var completed = doc.per_billed, title = __("Billed") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+ {%= doc.get_formatted("grand_total_export") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.item %}
+ {% if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { %}
+
+ {%= __("Expired") %}: {%= doc.get_formatted("expiry_date") %}
+
+ {% } else if(doc.expiry_date) { %}
+
+ {%= __("Expiry") %}: {%= doc.get_formatted("expiry_date") %}
+
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer_name %}
+ {% if(doc.transporter_name) { %}
+
+
+
+ {% } %}
+ {% if(doc.docstatus===0) { %}
+ {%= __("Draft") %}
+ {% } %}
+
+
+
+ {% var completed = doc.per_installed, title=__("% Installed") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+ {%= doc.get_formatted("grand_total_export") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% if(doc.item_name != doc.name) { %}
+ {%= doc.item_name %}
+ {% } %}
+ {% if(doc.is_stock_item==="Yes") { %}
+
+
+
+ {% } %}
+ {% if(doc.is_sales_item==="Yes") { %}
+
+
+
+ {% } %}
+ {% if(doc.is_purchase_item==="Yes") { %}
+
+
+
+ {% } %}
+ {% if(doc.is_manufactured_item==="Yes") { %}
+
+
+
+ {% } %}
+ {% if(doc.show_in_website) { %}
+
+
+
+ {% } %}
+
+ {%= doc.item_group %}
+
+
+
+ {% if(doc.image) { %}
+
+ {% } %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {% if(doc.material_request_type==="Purchase") { %}
+
+ {% } else { %}
+
+ {% } %}
+
+ {% if(doc.status=="Draft") { %}
+ {%= doc.status %}
+ {% } %}
+ {% if(doc.status=="Submitted" && doc.per_ordered < 100) { %}
+ {%= __("Pending") %}
+ {% } %}
+
+
+
+ {% var completed = doc.per_ordered, title = __("Ordered") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.supplier_name %}
+ {% if(cint(doc.is_subcontracted)) { %}
+
+
+
+ {% } %}
+ {% if(doc.transporter_name) { %}
+
+
+
+ {% } %}
+ {% if(doc.docstatus===0) { %}
+ {%= __("Draft") %}
+ {% } %}
+
+
+
+
+ {%= doc.get_formatted("grand_total_import") %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.item_code %}
+ {% var icon = {
+ "Available": ["icon-ok", "label-success"],
+ "Not Available": ["icon-remove", "label-danger"],
+ "Delivered": ["icon-truck", "label-success"],
+ "Purchase Returned": ["icon-retweet", "label-warning"],
+ "Sales Returned": ["icon-retweet", "label-warning"],
+ }[doc.status]; %}
+
+ {%= doc.status %}
+
+ {% if(doc.warehouse) { %}
+
+ {%= doc.warehouse %}
+
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+ {% var icon = {
+ "Material Issue": "icon-arrow-right",
+ "Material Receipt": "icon-arrow-left",
+ "Material Transfer": "icon-resize-horizontal",
+ "Manufacture/Repack": "icon-wrench",
+ "Sales Return": "icon-warning-sign",
+ "Purchase Return": "icon-warning-sign",
+ "Subcontract": "icon-truck"
+ }[doc.purpose]; %}
+
+
+
+ {% if(doc.from_warehouse) { %}
+
+ {%= doc.from_warehouse %}
+
+ {% } %}
+ {% if(doc.from_warehouse || doc.to_warehouse) { %}
+
+ {% } %}
+ {% if(doc.to_warehouse) { %}
+
+ {%= doc.to_warehouse %}
+
+ {% } %}
+ {% if(doc.production_order) { %}
+
+
+
+ {% } %}
+ {% if(doc.bom_no) { %}
+
+
+
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+ {%= doc.customer %}
+
+
+ {%= doc.status %}
+
+
+ {% if(doc.item_code) { %}
+
+ {%= doc.item_code %}
+
+ {% } %}
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+
+
+ {%= doc.customer_name %}
+
+
+ {% var style = {
+ "Scheduled": "default",
+ "Unscheduled": "default",
+ "Breakdown": "danger"
+ }[doc.maintenance_type] %}
+
+ {%= doc.maintenance_type %}
+
+ {% var style = doc.completion_status==="Partially Completed" ? "warning" : "success" %}
+
+ {%= doc.completion_status %}
+
+
+
+
+
+ {% var completed = doc.completed, title = __("Completed") %}
+ {% include "templates/form_grid/includes/progress.html" %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= cint(doc.email_sent) ? __("Sent") : __("Not Sent") %}
+
+
+ {%= doc.send_to_type %}
+
+
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {%= doc.status %}
+
+
+
+
+
+
+ {%= doc.raised_by %}
+
+
+
+
+ {%= __(df.label) %}:
+
+
+ {%= doc.get_formatted(df.fieldname) %}
+
+
+
{%= __("Item") %}
+
{%= __("Qty") %}
+
{%= __("Rate") %}
+
{%= __("Amount") %}
+
+
{%= doc.item_code %}
+ {% if(doc.item_name != doc.item_code) { %}
+
{%= doc.item_name %}{% } %}
+ {% if(doc.item_name != doc.description) { %}
+
{%= doc.description %}
{% } %}
+ {% if(doc.sales_order || doc.against_sales_order) { %}
+
+
+ {%= doc.sales_order || doc.against_sales_order %}
+
+ {% } %}
+ {% include "templates/form_grid/includes/visible_cols.html" %}
+ {% if(doc.schedule_date) { %}
+
+ {%= doc.get_formatted("schedule_date") %}
+
+ {% } %}
+
+
+
+
+ {%= doc.get_formatted("qty") %}
+
{%= doc.uom || doc.stock_uom %}
+ {% if(in_list(["Sales Order Item", "Purchase Order Item"],
+ doc.doctype) && frm.doc.docstatus===1) {
+ var delivered = doc.doctype==="Sales Order Item" ?
+ doc.delivered_qty : doc.received_qty,
+ completed =
+ 100 - cint((doc.qty - delivered) * 100 / doc.qty),
+ title = __("Delivered");
+ %}
+ {% include "templates/form_grid/includes/progress.html" %}
+ {% } %}
+ {% if(doc.warehouse) {
+ var label_class = "label-default",
+ title = "Warehouse",
+ actual_qty = (doc.doctype==="Sales Order"
+ ? doc.projected_qty : doc.actual_qty);
+ if(actual_qty != undefined) {
+ if(actual_qty > doc.qty) {
+ var label_class = "label-success";
+ var title = "In Stock"
+ } else {
+ var title = "Not In Stock"
+ }
+ }
+ %}
+
+
+ {%= doc.warehouse %}
+
+
+ {% } %}
+
+
+
+
+ {%= doc.get_formatted("rate") %}
+ {% if(doc.discount_percentage) { %}
+
+ {%= -1 * doc.discount_percentage %}%
+ {% }%}
+
+
+
+
+ {%= doc.get_formatted("amount") %}
+ {% if(in_list(["Sales Order Item", "Purchase Order Item"],
+ doc.doctype) && frm.doc.docstatus===1 && doc.amount) {
+ var completed =
+ 100 - cint((doc.amount - doc.billed_amt) * 100 / doc.amount),
+ title = __("Billed");
+ %}
+
+ {% include "templates/form_grid/includes/progress.html" %}
+ {% } %}
+
+
+
{%= __("Item") %}
+
{%= __("Qty") %}
+
+
{%= doc.item_code %}
+ {% if(doc.item_name != doc.item_code) { %}
+
{%= doc.item_name %}{% } %}
+ {% if(doc.item_name != doc.description) { %}
+
{%= doc.description %}
{% } %}
+ {% include "templates/form_grid/includes/visible_cols.html" %}
+ {% if(doc.schedule_date) { %}
+
+ {%= doc.get_formatted("schedule_date") %}
+ {% } %}
+
+
+
+
+ {%= doc.get_formatted("qty") %}
+
{%= doc.uom || doc.stock_uom %}
+ {% var completed =
+ 100 - cint((doc.qty - cint(doc.ordered_qty)) * 100 / doc.qty),
+ title = __("Ordered"); %}
+ {% include "templates/form_grid/includes/progress.html" %}
+ {% if(doc.warehouse) { %}
+
+
+ {%= doc.warehouse %}
+
+
+ {% } %}
+
+
+
{%= __("Item") %}
+
{%= __("Qty") %}
+
{%= __("Amount") %}
+
+
{%= doc.item_code %}
+ {% if(doc.item_name != doc.item_code) { %}
+
{%= doc.item_name %}{% } %}
+ {% if(doc.item_name != doc.description) { %}
+
{%= doc.description %}
{% } %}
+ {% include "templates/form_grid/includes/visible_cols.html" %}
+
+ {% if(doc.s_warehouse) { %}
+ {%= doc.s_warehouse || "" %}{% } %}
+
+ {% if(doc.t_warehouse) { %}
+ {%= doc.t_warehouse || "" %}{% } %}
+
+
+
+
+
+ {%= doc.get_formatted("qty") %}
+
{%= doc.uom || doc.stock_uom %}
+
+
+
+
+ {%= doc.get_formatted("amount") %}
+
+ {%= doc.get_formatted("incoming_rate") %}
+
+
+
+
+ {%= list.get_avatar_and_id(doc) %}
+
+ {% if(doc.public) { %}
+
+
+
+ {% } %}
+
+
+
+