nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32225

Browse Source
This commit is contained in:
Nabin Hait
2022-09-16 12:17:14 +05:30
committed by GitHub
parent 17ea6cc5a5 88c446b0bf
commit 22372e69eb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
View File

@@ -22,8 +22,7 @@ def get_columns():
{ {
"label": _("Payment Document Type"), "label": _("Payment Document Type"),
"fieldname": "payment_document_type", "fieldname": "payment_document_type",
"fieldtype": "Link", "fieldtype": "Data",
"options": "Doctype",
"width": 130, "width": 130,
}, },
{ {
@@ -33,15 +32,15 @@ def get_columns():
"options": "payment_document_type", "options": "payment_document_type",
"width": 140, "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": _("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"), "label": _("Against Account"),
"fieldname": "against", "fieldname": "against",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Account", "options": "Account",
"width": 170, "width": 200,
}, },
{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120}, {"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120},
] ]

1
erpnext/assets/doctype/asset_repair/test_asset_repair.py
View File

@@ -130,6 +130,7 @@ class TestAssetRepair(unittest.TestCase):
set_depreciation_settings_in_company(company="_Test Company with perpetual inventory") set_depreciation_settings_in_company(company="_Test Company with perpetual inventory")
asset_category = frappe.get_doc("Asset Category", "Computers") asset_category = frappe.get_doc("Asset Category", "Computers")
asset_category.enable_cwip_accounting = 0
asset_category.append( asset_category.append(
"accounts", "accounts",
{ {