Add print formats for Acc. Receivable/Payable and Summary reports
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.html b/erpnext/accounts/report/accounts_payable/accounts_payable.html
new file mode 100644
index 0000000..d3020b2
--- /dev/null
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.html
@@ -0,0 +1 @@
+{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html
new file mode 100644
index 0000000..d3020b2
--- /dev/null
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html
@@ -0,0 +1 @@
+{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
new file mode 100644
index 0000000..6904118
--- /dev/null
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -0,0 +1,77 @@
+<div style="margin-bottom: 7px;" class="text-center">
+ {%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
+</div>
+<h2 class="text-center">{%= __(report.report_name) %}</h2>
+<h4 class="text-center">{%= filters.account && (filters.account + ", ") || "" %} {%= filters.company %}</h4>
+<h5 class="text-center">
+ {%= filters.ageing_based_on %}
+ {%= __("Until") %}
+ {%= dateutil.str_to_user(filters.report_date) %}
+</h5>
+<hr>
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ {% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %}
+ <th style="width: 15%">{%= __("Date") %}</th>
+ <th style="width: 15%">{%= __("Ref") %}</th>
+ <th style="width: 40%">{%= __("Party") %}</th>
+ <th style="width: 15%">{%= __("Invoiced Amount") %}</th>
+ <th style="width: 15%">{%= __("Paid Amount") %}</th>
+ <th style="width: 15%">{%= __("Outstanding Amount") %}</th>
+ {% } else { %}
+ <th style="width: 40%">{%= __("Party") %}</th>
+ <th style="width: 15%">{%= __("Total Invoiced Amount") %}</th>
+ <th style="width: 15%">{%= __("Total Paid Amount") %}</th>
+ <th style="width: 15%">{%= __("Total Outstanding Amount") %}</th>
+ {% } %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for(var i=0, l=data.length; i<l; i++) { %}
+ <tr>
+ {% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %}
+ {% if(data[i][__("Posting Date")]) { %}
+ <td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
+ <td>{%= data[i][__("Voucher Type")] %}
+ <br>{%= data[i][__("Voucher No")] %}</td>
+ <td>{%= data[i][__("Customer")] || data[i][__("Supplier")] %}
+ {% if(__(report.report_name) == "Accounts Receivable") { %}
+ <br>{%= __("Territory") %}: {%= data[i][__("Territory")] %}
+ {% } else { %}
+ <br>{%= __("Supplier Type") %}: {%= data[i][__("Supplier Type")] %}
+ {% } %}
+ <br>{%= __("Remarks") %}: {%= data[i][__("Remarks")] %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("Invoiced Amount")]) %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("Paid Amount")]) %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("Outstanding Amount")]) %}</td>
+ {% } else { %}
+ <td></td>
+ <td></td>
+ <td><b>{%= data[i][__("Customer")] || data[i][__("Supplier")] || " " %}</b></td>
+ <td style="text-align: right">
+ {%= data[i][__("Account")] && format_currency(data[i][__("Invoiced Amount")]) %}</td>
+ <td style="text-align: right">
+ {%= data[i][__("Account")] && format_currency(data[i][__("Paid Amount")]) %}</td>
+ <td style="text-align: right">
+ {%= data[i][__("Account")] && format_currency(data[i][__("Outstanding Amount")]) %}</td>
+ {% } %}
+ {% } else { %}
+ {% if(data[i][__("Customer")] || data[i][__("Supplier")]|| " ") { %}
+ <td>{%= data[i][__("Customer")] || data[i][__("Supplier")] %}
+ {% if(__(report.report_name) == "Accounts Receivable Summary") { %}
+ <br>{%= __("Territory") %}: {%= data[i][__("Territory")] %}
+ {% } else { %}
+ <br>{%= __("Supplier Type") %}: {%= data[i][__("Supplier Type")] %}
+ {% } %}
+ <br>{%= __("Remarks") %}: {%= data[i][__("Remarks")] %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("Total Invoiced Amt")]) %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("Total Paid Amt")]) %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("Total Outstanding Amt")]) %}</td>
+ {% } %}
+ {% } %}
+ </tr>
+ {% } %}
+ </tbody>
+</table>
+<p class="text-right text-muted">Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p>
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 8d4dcfc..d2d1187 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -32,10 +32,10 @@
columns += [_("Invoiced Amount") + ":Currency:100", _("Paid Amount") + ":Currency:100",
_("Outstanding Amount") + ":Currency:100", _("Age") + ":Int:50",
- "0-" + self.filters.range1 + ":Currency:100",
- self.filters.range1 + "-" + self.filters.range2 + ":Currency:100",
- self.filters.range2 + "-" + self.filters.range3 + ":Currency:100",
- self.filters.range3 + _("-Above") + ":Currency:100"
+ "0-" + str(self.filters.range1) + ":Currency:100",
+ str(self.filters.range1) + "-" + str(self.filters.range2) + ":Currency:100",
+ str(self.filters.range2) + "-" + str(self.filters.range3) + ":Currency:100",
+ str(self.filters.range3) + _("-Above") + ":Currency:100"
]
if args.get("party_type") == "Customer":
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html
new file mode 100644
index 0000000..d3020b2
--- /dev/null
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html
@@ -0,0 +1 @@
+{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
index 79e9e6e..a7f6db1 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
@@ -6,7 +6,7 @@
"docstatus": 0,
"doctype": "Report",
"is_standard": "Yes",
- "modified": "2014-10-17 15:45:00.694265",
+ "modified": "2014-12-01 16:14:40.213259",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Receivable Summary",
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
index 82daa19..80555c9 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -21,10 +21,10 @@
_("Total Invoiced Amt") + ":Currency:140",
_("Total Paid Amt") + ":Currency:140",
_("Total Outstanding Amt") + ":Currency:160",
- "0-" + self.filters.range1 + ":Currency:100",
- self.filters.range1 + "-" + self.filters.range2 + ":Currency:100",
- self.filters.range2 + "-" + self.filters.range3 + ":Currency:100",
- self.filters.range3 + _("-Above") + ":Currency:100"]
+ "0-" + str(self.filters.range1) + ":Currency:100",
+ str(self.filters.range1) + "-" + str(self.filters.range2) + ":Currency:100",
+ str(self.filters.range2) + "-" + str(self.filters.range3) + ":Currency:100",
+ str(self.filters.range3) + _("-Above") + ":Currency:100"]
if args.get("party_type") == "Customer":
columns += [_("Territory") + ":Link/Territory:80"]