Merge branch 'develop' into misc_asset_fixes
diff --git a/.github/helper/.flake8_strict b/.github/helper/.flake8_strict
index 198ec7b..3e8f7dd 100644
--- a/.github/helper/.flake8_strict
+++ b/.github/helper/.flake8_strict
@@ -66,7 +66,8 @@
F841,
E713,
E712,
- B023
+ B023,
+ B028
max-line-length = 200
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 13712ce..12c0b7a 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -334,7 +334,7 @@
)
# Account Currency has balance
- dr_or_cr = "debit" if self.party_type == "Customer" else "debit"
+ dr_or_cr = "debit" if self.party_type == "Customer" else "credit"
reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
journal_account = frappe._dict(
diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
index 5c4b578..cbc40bb 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
+++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
@@ -14,7 +14,6 @@
},
"internal_links": {
"Quotation": ["items", "prevdoc_docname"],
- "Material Request": ["items", "material_request"],
},
"transactions": [
{