diff --git a/erpnext/__init__.py b/erpnext/__init__.py index c66621856f..a16538f1be 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.15' +__version__ = '10.1.16' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index 10f326242b..78015b40c8 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -91,8 +91,8 @@ {% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %} - {%= __("Date") %} - {%= __("Ref") %} + {%= __("Date") %} + {%= __("Reference") %} {% if(!filters.show_pdc_in_print) { %} {%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} {% } %} @@ -125,9 +125,9 @@ {% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %} {% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %} - {%= dateutil.str_to_user(data[i][__("Posting Date")]) %} - {%= data[i][__("Voucher Type")] %} -
{%= data[i][__("Voucher No")] %} + {%= dateutil.str_to_user(data[i]["posting_date"]) %} + {%= data[i]["voucher_type"] %} +
{%= data[i]["voucher_no"] %} {% if(!filters.show_pdc_in_print) { %} {% if(!(filters.customer || filters.supplier)) { %} diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index cf3b1bd88c..065ab632b4 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -22,13 +22,35 @@ class ReceivablePayableReport(object): return columns, data, None, chart def get_columns(self, party_naming_by, args): - columns = [_("Posting Date") + ":Date:80", _(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"] + columns = [] + columns.append({ + "label": _("Posting Date"), + "fieldtype": "Date", + "fieldname": "posting_date", + "width": 90 + }) + + columns += [_(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"] if party_naming_by == "Naming Series": columns += [args.get("party_type") + " Name::110"] - columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":120", - _("Due Date") + ":Date:80"] + columns.append({ + "label": _("Voucher Type"), + "fieldtype": "Data", + "fieldname": "voucher_type", + "width": 110 + }) + + columns.append({ + "label": _("Voucher No"), + "fieldtype": "Dynamic Link", + "fieldname": "voucher_no", + "width": 110, + "options": "voucher_type", + }) + + columns += [_("Due Date") + ":Date:80"] if args.get("party_type") == "Supplier": columns += [_("Bill No") + "::80", _("Bill Date") + ":Date:80"] diff --git a/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py b/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py index c49752213c..d1715b6b2a 100644 --- a/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py +++ b/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py @@ -6,6 +6,7 @@ import frappe from erpnext.stock.utils import get_bin def execute(): + frappe.reload_doc("buying", "doctype", "purchase_order_item_supplied") for d in frappe.db.sql(""" select distinct rm_item_code, reserve_warehouse from `tabPurchase Order Item Supplied` @@ -26,4 +27,4 @@ def execute(): bin_doc = get_bin(d[0], d[1]) bin_doc.update_reserved_qty_for_production() except: - pass \ No newline at end of file + pass