[report] add total row
diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py
index 34c8ccd..a10dc7e 100644
--- a/accounts/report/accounts_payable/accounts_payable.py
+++ b/accounts/report/accounts_payable/accounts_payable.py
@@ -19,7 +19,6 @@
and nowdate() or filters.get("report_date")
data = []
- total_invoiced_amount = total_paid = total_outstanding = 0
for gle in entries:
if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \
or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date:
@@ -36,7 +35,7 @@
paid_amount = get_paid_amount(gle, filters.get("report_date") or nowdate(),
entries_after_report_date)
outstanding_amount = invoiced_amount - paid_amount
-
+
if abs(flt(outstanding_amount)) > 0.01:
row = [gle.posting_date, gle.account, gle.voucher_type, gle.voucher_no,
gle.remarks, account_supplier_type_map.get(gle.account), due_date, bill_no,
@@ -47,16 +46,9 @@
ageing_based_on_date = due_date
else:
ageing_based_on_date = gle.posting_date
+
row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount)
-
- # Add to total
- total_invoiced_amount += flt(invoiced_amount)
- total_paid += flt(paid_amount)
- total_outstanding += flt(outstanding_amount)
data.append(row)
- if data:
- data.append(["", "", "", "", "", "", "", "Total", "", total_invoiced_amount, total_paid,
- total_outstanding, "", "", "", ""])
return columns, data
diff --git a/accounts/report/accounts_payable/accounts_payable.txt b/accounts/report/accounts_payable/accounts_payable.txt
index 8920a0b..6de97f6 100644
--- a/accounts/report/accounts_payable/accounts_payable.txt
+++ b/accounts/report/accounts_payable/accounts_payable.txt
@@ -2,11 +2,12 @@
{
"creation": "2013-04-22 16:16:03",
"docstatus": 0,
- "modified": "2013-04-23 14:54:27",
+ "modified": "2013-04-30 17:55:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
+ "add_total_row": 1,
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py
index d385b36..a8c6d23 100644
--- a/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/accounts/report/accounts_receivable/accounts_receivable.py
@@ -18,7 +18,6 @@
and nowdate() or filters.get("report_date")
data = []
- total_invoiced_amount = total_payment = total_outstanding = 0
for gle in entries:
if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \
or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date:
@@ -41,17 +40,9 @@
else:
ageing_based_on_date = gle.posting_date
row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount)
-
- # Add to total
- total_invoiced_amount += flt(invoiced_amount)
- total_payment += flt(payment_amount)
- total_outstanding += flt(outstanding_amount)
-
+
data.append(row)
- if data:
- data.append(["", "", "", "", "", "", "Total", total_invoiced_amount, total_payment,
- total_outstanding, "", "", "", ""])
-
+
return columns, data
def get_columns():
diff --git a/accounts/report/accounts_receivable/accounts_receivable.txt b/accounts/report/accounts_receivable/accounts_receivable.txt
index 28f7e4f..7eb344f 100644
--- a/accounts/report/accounts_receivable/accounts_receivable.txt
+++ b/accounts/report/accounts_receivable/accounts_receivable.txt
@@ -2,11 +2,12 @@
{
"creation": "2013-04-16 11:31:13",
"docstatus": 0,
- "modified": "2013-04-16 11:31:13",
+ "modified": "2013-04-30 17:54:47",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
+ "add_total_row": 1,
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
diff --git a/accounts/report/purchase_register/purchase_register.js b/accounts/report/purchase_register/purchase_register.js
index f943e84..21e0547 100644
--- a/accounts/report/purchase_register/purchase_register.js
+++ b/accounts/report/purchase_register/purchase_register.js
@@ -1,5 +1,4 @@
wn.query_reports["Purchase Register"] = {
- "add_total_row": true,
"filters": [
{
"fieldname":"from_date",
diff --git a/accounts/report/purchase_register/purchase_register.txt b/accounts/report/purchase_register/purchase_register.txt
index 799971e..847f5f3 100644
--- a/accounts/report/purchase_register/purchase_register.txt
+++ b/accounts/report/purchase_register/purchase_register.txt
@@ -2,11 +2,12 @@
{
"creation": "2013-04-29 16:13:11",
"docstatus": 0,
- "modified": "2013-04-29 16:13:11",
+ "modified": "2013-04-30 17:51:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
+ "add_total_row": 1,
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
diff --git a/accounts/report/sales_register/sales_register.js b/accounts/report/sales_register/sales_register.js
index cf4543a..8224619 100644
--- a/accounts/report/sales_register/sales_register.js
+++ b/accounts/report/sales_register/sales_register.js
@@ -1,5 +1,4 @@
wn.query_reports["Sales Register"] = {
- "add_total_row": true,
"filters": [
{
"fieldname":"from_date",
diff --git a/accounts/report/sales_register/sales_register.txt b/accounts/report/sales_register/sales_register.txt
index 5aef814..dbf41af 100644
--- a/accounts/report/sales_register/sales_register.txt
+++ b/accounts/report/sales_register/sales_register.txt
@@ -2,11 +2,12 @@
{
"creation": "2013-04-23 18:15:29",
"docstatus": 0,
- "modified": "2013-04-23 18:15:29",
+ "modified": "2013-04-30 17:53:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
+ "add_total_row": 1,
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",