nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into issue_9180

Browse Source
This commit is contained in:
tunde
2017-06-09 13:58:22 +01:00
parent 0a5db528b1 97fd21a01d
commit 7bf4b121f3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
View File

@@ -17,9 +17,11 @@ class AccountsReceivableSummary(ReceivablePayableReport):
if party_naming_by == "Naming Series": if party_naming_by == "Naming Series":
columns += [ args.get("party_type") + " Name::140"] columns += [ args.get("party_type") + " Name::140"]
credit_debit_label = _("Credit Note Amt") if args.get('party_type') == 'Customer' else _("Debit Note Amt")
columns += [ columns += [
_("Total Invoiced Amt") + ":Currency/currency:140", _("Total Invoiced Amt") + ":Currency/currency:140",
_("Total Paid Amt") + ":Currency/currency:140", _("Total Paid Amt") + ":Currency/currency:140",
credit_debit_label + ":Currency/currency:140",
_("Total Outstanding Amt") + ":Currency/currency:160", _("Total Outstanding Amt") + ":Currency/currency:160",
"0-" + str(self.filters.range1) + ":Currency/currency:100", "0-" + str(self.filters.range1) + ":Currency/currency:100",
str(self.filters.range1) + "-" + str(self.filters.range2) + ":Currency/currency:100", str(self.filters.range1) + "-" + str(self.filters.range2) + ":Currency/currency:100",
@@ -56,7 +58,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
row += [self.get_party_name(args.get("party_type"), party)] row += [self.get_party_name(args.get("party_type"), party)]
row += [ row += [
party_dict.invoiced_amt, party_dict.paid_amt, party_dict.outstanding_amt, party_dict.invoiced_amt, party_dict.paid_amt, party_dict.credit_amt, party_dict.outstanding_amt,
party_dict.range1, party_dict.range2, party_dict.range3, party_dict.range4, party_dict.range1, party_dict.range2, party_dict.range3, party_dict.range4,
] ]
@@ -77,6 +79,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
frappe._dict({ frappe._dict({
"invoiced_amt": 0, "invoiced_amt": 0,
"paid_amt": 0, "paid_amt": 0,
"credit_amt": 0,
"outstanding_amt": 0, "outstanding_amt": 0,
"range1": 0, "range1": 0,
"range2": 0, "range2": 0,
@@ -104,7 +107,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
if args.get("party_type") == "Supplier": if args.get("party_type") == "Supplier":
cols += ["bill_no", "bill_date"] cols += ["bill_no", "bill_date"]
cols += ["invoiced_amt", "paid_amt", cols += ["invoiced_amt", "paid_amt", "credit_amt",
"outstanding_amt", "age", "range1", "range2", "range3", "range4", "currency"] "outstanding_amt", "age", "range1", "range2", "range3", "range4", "currency"]
if args.get("party_type") == "Supplier": if args.get("party_type") == "Supplier":

2
erpnext/templates/includes/projects/project_timesheets.html
View File

@@ -5,7 +5,7 @@
<div class='col-xs-9'> <div class='col-xs-9'>
<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}" > {{ timesheet.info.name }} </span> <span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}" > {{ timesheet.info.name }} </span>
<div class="small text-muted item-timestamp"> <div class="small text-muted item-timestamp">
{{ __("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ __("to") }} {{ frappe.format_date(timesheet.to_time) }} {{ _("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ _("to") }} {{ frappe.format_date(timesheet.to_time) }}
</div> </div>
</div> </div>
<div class='col-xs-1 gravatar-top'> <div class='col-xs-1 gravatar-top'>