From 757a7858725463fa39e27f3005c17e3268ae1156 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 19 Sep 2012 16:06:03 +0530 Subject: [PATCH] sales/ pur invoice listview fix --- .../doctype/purchase_invoice/purchase_invoice_list.js | 5 ++--- erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js index f9dd4cde9e..7bb25581f3 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js @@ -16,9 +16,8 @@ wn.doclistviews['Purchase Invoice'] = wn.views.ListView.extend({ prepare_data: function(data) { this._super(data); - data.paid = flt( - ((data.grand_total - data.outstanding_amount) / data.grand_total) * 100, - 2); + data.paid = data.docstatus == 1 ? + flt(((data.grand_total - data.outstanding_amount) / data.grand_total) * 100, 2) : 0; }, columns: [ diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js index 1c3b2d38ce..cbe1741ae3 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -14,7 +14,8 @@ wn.doclistviews['Sales Invoice'] = wn.views.ListView.extend({ }, prepare_data: function(data) { this._super(data); - data.paid = flt((data.grand_total - data.outstanding_amount) / data.grand_total * 100, 2); + data.paid = (data.docstatus == 1) ? + flt((data.grand_total - data.outstanding_amount) / data.grand_total * 100, 2) : 0; }, columns: [ {width: '3%', content: 'check'},