Merged debit-account-modal.html and credit-account-modal.html into account-selector-modal.html, because they are almost the same.

src/accounting/templates/accounting/transaction/expense/include/form.html

@@ -49,5 +49,8 @@ First written: 2023/2/25
   {% with summary_helper = form.summary_helper.debit %}
     {% include "accounting/transaction/include/summary-helper-modal.html" %}
   {% endwith %}
-  {% include "accounting/transaction/include/debit-account-modal.html" %}
+  {% with entry_type = "debit",
+          account_options = form.debit_account_options %}
+    {% include "accounting/transaction/include/account-selector-modal.html" %}
+  {% endwith %}
 {% endblock %}

src/accounting/templates/accounting/transaction/include/account-selector-modal.html

@@ -0,0 +1,54 @@
+{#
+The Mia! Accounting Flask Project
+account-selector-modal.html: The modal for the account selector
+
+ Copyright (c) 2023 imacat.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+Author: imacat@mail.imacat.idv.tw (imacat)
+First written: 2023/2/25
+#}
+<div id="accounting-{{ entry_type }}-account-selector-modal" class="modal fade accounting-selector-modal" data-prefix="accounting-{{ entry_type }}-account" tabindex="-1" aria-labelledby="accounting-{{ entry_type }}-account-selector-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title fs-5" id="accounting-{{ entry_type }}-account-selector-modal-label">{{ A_("Select Account") }}</h1>
+        <button type="button" class="btn-close" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal" aria-label="{{ A_("Close") }}"></button>
+      </div>
+      <div class="modal-body">
+        <div class="input-group mb-2">
+          <input id="accounting-{{ entry_type }}-account-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
+          <label class="input-group-text" for="accounting-{{ entry_type }}-account-selector-query">
+            <i class="fa-solid fa-magnifying-glass"></i>
+            {{ A_("Search") }}
+          </label>
+        </div>
+
+        <ul id="accounting-{{ entry_type }}-account-option-list" class="list-group accounting-selector-list">
+          {% for account in account_options %}
+          <li id="accounting-{{ entry_type }}-account-option-{{ account.code }}" class="list-group-item accounting-clickable accounting-{{ entry_type }}-account-option {% if account.is_in_use %} accounting-account-in-use {% endif %}" data-code="{{ account.code }}" data-content="{{ account }}" data-query-values="{{ account.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">
+            {{ account }}
+          </li>
+          {% endfor %}
+          <li id="accounting-{{ entry_type }}-account-more" class="list-group-item accounting-clickable">{{ A_("More…") }}</li>
+        </ul>
+        <p id="accounting-{{ entry_type }}-account-option-no-result" class="d-none">{{ A_("There is no data.") }}</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">{{ A_("Cancel") }}</button>
+        <button id="accounting-{{ entry_type }}-account-btn-clear" type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">{{ A_("Clear") }}</button>
+      </div>
+    </div>
+  </div>
+</div>

src/accounting/templates/accounting/transaction/include/credit-account-modal.html

@@ -1,54 +0,0 @@
-{#
-The Mia! Accounting Flask Project
-credit-modals.html: The modals for the credit journal entry sub-form
-
- Copyright (c) 2023 imacat.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-Author: imacat@mail.imacat.idv.tw (imacat)
-First written: 2023/2/25
-#}
-<div id="accounting-credit-account-selector-modal" class="modal fade accounting-selector-modal" data-prefix="accounting-credit-account" tabindex="-1" aria-labelledby="accounting-credit-account-selector-modal-label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h1 class="modal-title fs-5" id="accounting-credit-account-selector-modal-label">{{ A_("Select Credit Account") }}</h1>
-        <button type="button" class="btn-close" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal" aria-label="{{ A_("Close") }}"></button>
-      </div>
-      <div class="modal-body">
-        <div class="input-group mb-2">
-          <input id="accounting-credit-account-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
-          <label class="input-group-text" for="accounting-credit-account-selector-query">
-            <i class="fa-solid fa-magnifying-glass"></i>
-            {{ A_("Search") }}
-          </label>
-        </div>
-
-        <ul id="accounting-credit-account-option-list" class="list-group accounting-selector-list">
-          {% for account in form.credit_account_options %}
-          <li id="accounting-credit-account-option-{{ account.code }}" class="list-group-item accounting-clickable accounting-credit-account-option {% if account.is_in_use %} accounting-account-in-use {% endif %}" data-code="{{ account.code }}" data-content="{{ account }}" data-query-values="{{ account.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">
-            {{ account }}
-          </li>
-          {% endfor %}
-          <li id="accounting-credit-account-more" class="list-group-item accounting-clickable">{{ A_("More…") }}</li>
-        </ul>
-        <p id="accounting-credit-account-option-no-result" class="d-none">{{ A_("There is no data.") }}</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">{{ A_("Cancel") }}</button>
-        <button id="accounting-credit-account-btn-clear" type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">{{ A_("Clear") }}</button>
-      </div>
-    </div>
-  </div>
-</div>

src/accounting/templates/accounting/transaction/include/debit-account-modal.html

@@ -1,54 +0,0 @@
-{#
-The Mia! Accounting Flask Project
-credit-modals.html: The modals for the debit journal entry sub-form
-
- Copyright (c) 2023 imacat.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-Author: imacat@mail.imacat.idv.tw (imacat)
-First written: 2023/2/25
-#}
-<div id="accounting-debit-account-selector-modal" class="modal fade accounting-selector-modal" data-prefix="accounting-debit-account" tabindex="-1" aria-labelledby="accounting-debit-account-selector-modal-label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h1 class="modal-title fs-5" id="accounting-debit-account-selector-modal-label">{{ A_("Select Debit Account") }}</h1>
-        <button type="button" class="btn-close" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal" aria-label="{{ A_("Close") }}"></button>
-      </div>
-      <div class="modal-body">
-        <div class="input-group mb-2">
-          <input id="accounting-debit-account-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
-          <label class="input-group-text" for="accounting-debit-account-selector-query">
-            <i class="fa-solid fa-magnifying-glass"></i>
-            {{ A_("Search") }}
-          </label>
-        </div>
-
-        <ul id="accounting-debit-account-option-list" class="list-group accounting-selector-list">
-          {% for account in form.debit_account_options %}
-          <li id="accounting-debit-account-option-{{ account.code }}" class="list-group-item accounting-clickable accounting-debit-account-option {% if account.is_in_use %} accounting-account-in-use {% endif %}" data-code="{{ account.code }}" data-content="{{ account }}" data-query-values="{{ account.query_values|tojson|forceescape }}" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">
-            {{ account }}
-          </li>
-          {% endfor %}
-          <li id="accounting-debit-account-more" class="list-group-item accounting-clickable">{{ A_("More…") }}</li>
-        </ul>
-        <p id="accounting-debit-account-option-no-result" class="d-none">{{ A_("There is no data.") }}</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">{{ A_("Cancel") }}</button>
-        <button id="accounting-debit-account-btn-clear" type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#accounting-entry-form-modal">{{ A_("Clear") }}</button>
-      </div>
-    </div>
-  </div>
-</div>

src/accounting/templates/accounting/transaction/income/include/form.html

@@ -49,5 +49,8 @@ First written: 2023/2/25
   {% with summary_helper = form.summary_helper.credit %}
     {% include "accounting/transaction/include/summary-helper-modal.html" %}
   {% endwith %}
-  {% include "accounting/transaction/include/credit-account-modal.html" %}
+  {% with entry_type = "credit",
+          account_options = form.credit_account_options %}
+    {% include "accounting/transaction/include/account-selector-modal.html" %}
+  {% endwith %}
 {% endblock %}

src/accounting/templates/accounting/transaction/transfer/include/form.html

@@ -56,6 +56,12 @@ First written: 2023/2/25
   {% with summary_helper = form.summary_helper.credit %}
     {% include "accounting/transaction/include/summary-helper-modal.html" %}
   {% endwith %}
-  {% include "accounting/transaction/include/debit-account-modal.html" %}
+  {% with entry_type = "debit",
-  {% include "accounting/transaction/include/credit-account-modal.html" %}
+          account_options = form.debit_account_options %}
+    {% include "accounting/transaction/include/account-selector-modal.html" %}
+  {% endwith %}
+  {% with entry_type = "credit",
+          account_options = form.credit_account_options %}
+    {% include "accounting/transaction/include/account-selector-modal.html" %}
+  {% endwith %}
 {% endblock %}