Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into misc_asset_fixes

Browse Source
This commit is contained in:
Anand Baburajan 2023-01-17 11:21:37 +05:30 committed by GitHub
commit c4d3a8a600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/helper/.flake8_strict vendored
View File

@ -66,7 +66,8 @@ ignore =
F841, F841,
E713, E713,
E712, E712,
B023 B023,
B028
max-line-length = 200 max-line-length = 200

2
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@ -334,7 +334,7 @@ class PaymentReconciliation(Document):
) )
# Account Currency has balance # 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" reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
journal_account = frappe._dict( journal_account = frappe._dict(

1
erpnext/selling/doctype/sales_order/sales_order_dashboard.py
View File

@ -14,7 +14,6 @@ def get_data():
}, },
"internal_links": { "internal_links": {
"Quotation": ["items", "prevdoc_docname"], "Quotation": ["items", "prevdoc_docname"],
"Material Request": ["items", "material_request"],
}, },
"transactions": [ "transactions": [
{ {