Merge pull request #18072 from hrwX/att_gantt_fix_v12
fix(Attendance): Attendance gantt fix
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 503f4f4..e166fa2 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -485,7 +485,7 @@
"""Set against account for debit to account"""
against_acc = []
for d in self.get('items'):
- if d.income_account not in against_acc:
+ if d.income_account and d.income_account not in against_acc:
against_acc.append(d.income_account)
self.against_income_account = ','.join(against_acc)
diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py
index 0ab1f52..9a9ee7e 100644
--- a/erpnext/config/accounting.py
+++ b/erpnext/config/accounting.py
@@ -40,17 +40,6 @@
"description": _("Tree of financial accounts."),
"onboard": 1,
},
- {
- "type": "doctype",
- "name": "Journal Entry",
- "description": _("Accounting journal entries."),
- "onboard": 1,
- },
- {
- "type": "doctype",
- "name": "Opening Invoice Creation Tool",
- "description": _("Create Opening Sales and Purchase Invoices")
- },
]
},
{
@@ -75,11 +64,6 @@
},
{
"type": "doctype",
- "name": "Payment Entry",
- "description": _("Bank/Cash transactions against party or for internal transfer")
- },
- {
- "type": "doctype",
"name": "Payment Term",
"description": _("Payment Terms based on conditions")
},
@@ -179,6 +163,26 @@
"name": "Accounting Dimension",
"description": _("Setup custom dimensions for accounting")
},
+ {
+ "type": "doctype",
+ "name": "Opening Invoice Creation Tool",
+ "description": _("Create Opening Sales and Purchase Invoices")
+ },
+ ]
+ },
+ {
+ "label": _("Accounting Entries"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Payment Entry",
+ "description": _("Bank/Cash transactions against party or for internal transfer")
+ },
+ {
+ "type": "doctype",
+ "name": "Journal Entry",
+ "description": _("Accounting journal entries.")
+ },
]
},
{