From 442f54a988e209d6d0ecfefd3cb5e3d1d8dea48a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 15 Sep 2022 11:27:35 +0530 Subject: [PATCH 1/2] fix: No permission to read doctype (cherry picked from commit c0da948a4ef9f5fb1dd5764ee1908bd6f0475c7e) --- .../bank_clearance_summary/bank_clearance_summary.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py index 9d2deea523b..449ebdcd924 100644 --- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py @@ -22,8 +22,7 @@ def get_columns(): { "label": _("Payment Document Type"), "fieldname": "payment_document_type", - "fieldtype": "Link", - "options": "Doctype", + "fieldtype": "Data", "width": 130, }, { @@ -33,15 +32,15 @@ def get_columns(): "options": "payment_document_type", "width": 140, }, - {"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 100}, + {"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 120}, {"label": _("Cheque/Reference No"), "fieldname": "cheque_no", "width": 120}, - {"label": _("Clearance Date"), "fieldname": "clearance_date", "fieldtype": "Date", "width": 100}, + {"label": _("Clearance Date"), "fieldname": "clearance_date", "fieldtype": "Date", "width": 120}, { "label": _("Against Account"), "fieldname": "against", "fieldtype": "Link", "options": "Account", - "width": 170, + "width": 200, }, {"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120}, ] From 5cab0aa1d7c620cd6a9f0c7ac5eab83bebd34461 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 16 Sep 2022 11:44:25 +0530 Subject: [PATCH 2/2] fix: disable cwip in asset repair tests --- erpnext/assets/doctype/asset_repair/test_asset_repair.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py index 6e06f52ac65..6599c078231 100644 --- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py @@ -130,6 +130,7 @@ class TestAssetRepair(unittest.TestCase): set_depreciation_settings_in_company(company="_Test Company with perpetual inventory") asset_category = frappe.get_doc("Asset Category", "Computers") + asset_category.enable_cwip_accounting = 0 asset_category.append( "accounts", {