Compare commits
3 Commits
71dfb6f003
...
f3c558f48a
Author | SHA1 | Date | |
---|---|---|---|
f3c558f48a | |||
988757d30e | |||
50cea90d1b |
@ -13,7 +13,7 @@ sys.path.insert(0, os.path.abspath('../../src/'))
|
|||||||
project = 'Mia! Accounting'
|
project = 'Mia! Accounting'
|
||||||
copyright = '2023, imacat'
|
copyright = '2023, imacat'
|
||||||
author = 'imacat'
|
author = 'imacat'
|
||||||
release = '1.4.0'
|
release = '1.4.1'
|
||||||
|
|
||||||
# -- General configuration ---------------------------------------------------
|
# -- General configuration ---------------------------------------------------
|
||||||
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
|
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "mia-accounting"
|
name = "mia-accounting"
|
||||||
version = "1.4.0"
|
version = "1.4.1"
|
||||||
description = "A Flask accounting module."
|
description = "A Flask accounting module."
|
||||||
readme = "README.rst"
|
readme = "README.rst"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
|
@ -277,13 +277,16 @@ class JournalEntryLineItemEditor {
|
|||||||
this.originalLineItemText = originalLineItem.text;
|
this.originalLineItemText = originalLineItem.text;
|
||||||
this.#originalLineItemText.innerText = originalLineItem.text;
|
this.#originalLineItemText.innerText = originalLineItem.text;
|
||||||
this.#setEnableDescriptionAccount(false);
|
this.#setEnableDescriptionAccount(false);
|
||||||
if (originalLineItem.description === "") {
|
if (this.description === null) {
|
||||||
this.#descriptionControl.classList.remove("accounting-not-empty");
|
if (originalLineItem.description === "") {
|
||||||
} else {
|
this.#descriptionControl.classList.remove("accounting-not-empty");
|
||||||
this.#descriptionControl.classList.add("accounting-not-empty");
|
} else {
|
||||||
|
this.#descriptionControl.classList.add("accounting-not-empty");
|
||||||
|
}
|
||||||
|
this.description = originalLineItem.description === ""? null: originalLineItem.description;
|
||||||
|
this.#descriptionText.innerText = originalLineItem.description;
|
||||||
}
|
}
|
||||||
this.description = originalLineItem.description === ""? null: originalLineItem.description;
|
this.#setEnableAccount(false);
|
||||||
this.#descriptionText.innerText = originalLineItem.description;
|
|
||||||
this.#accountControl.classList.add("accounting-not-empty");
|
this.#accountControl.classList.add("accounting-not-empty");
|
||||||
this.account = originalLineItem.account.copy();
|
this.account = originalLineItem.account.copy();
|
||||||
this.isAccountConfirmed = false;
|
this.isAccountConfirmed = false;
|
||||||
@ -305,7 +308,7 @@ class JournalEntryLineItemEditor {
|
|||||||
this.originalLineItemDate = null;
|
this.originalLineItemDate = null;
|
||||||
this.originalLineItemText = null;
|
this.originalLineItemText = null;
|
||||||
this.#originalLineItemText.innerText = "";
|
this.#originalLineItemText.innerText = "";
|
||||||
this.#setEnableDescriptionAccount(true);
|
this.#setEnableAccount(true);
|
||||||
this.#accountControl.classList.remove("accounting-not-empty");
|
this.#accountControl.classList.remove("accounting-not-empty");
|
||||||
this.account = null;
|
this.account = null;
|
||||||
this.isAccountConfirmed = false;
|
this.isAccountConfirmed = false;
|
||||||
@ -472,12 +475,13 @@ class JournalEntryLineItemEditor {
|
|||||||
this.originalLineItemDate = null;
|
this.originalLineItemDate = null;
|
||||||
this.originalLineItemText = null;
|
this.originalLineItemText = null;
|
||||||
this.#originalLineItemText.innerText = "";
|
this.#originalLineItemText.innerText = "";
|
||||||
this.#setEnableDescriptionAccount(true);
|
this.#descriptionControl.dataset.bsTarget = `#accounting-description-editor-${this.#debitCreditSubForm.debitCredit}-modal`;
|
||||||
this.#descriptionControl.classList.remove("accounting-not-empty");
|
this.#descriptionControl.classList.remove("accounting-not-empty");
|
||||||
this.#descriptionControl.classList.remove("is-invalid");
|
this.#descriptionControl.classList.remove("is-invalid");
|
||||||
this.description = null;
|
this.description = null;
|
||||||
this.#descriptionText.innerText = ""
|
this.#descriptionText.innerText = ""
|
||||||
this.#descriptionError.innerText = ""
|
this.#descriptionError.innerText = ""
|
||||||
|
this.#setEnableAccount(true);
|
||||||
this.#accountControl.classList.remove("accounting-not-empty");
|
this.#accountControl.classList.remove("accounting-not-empty");
|
||||||
this.#accountControl.classList.remove("is-invalid");
|
this.#accountControl.classList.remove("is-invalid");
|
||||||
this.account = null;
|
this.account = null;
|
||||||
@ -511,7 +515,7 @@ class JournalEntryLineItemEditor {
|
|||||||
this.#originalLineItemContainer.classList.remove("d-none");
|
this.#originalLineItemContainer.classList.remove("d-none");
|
||||||
this.#originalLineItemControl.classList.add("accounting-not-empty");
|
this.#originalLineItemControl.classList.add("accounting-not-empty");
|
||||||
}
|
}
|
||||||
this.#setEnableDescriptionAccount(!lineItem.isMatched && this.originalLineItemId === null);
|
this.#descriptionControl.dataset.bsTarget = `#accounting-description-editor-${this.#debitCreditSubForm.debitCredit}-modal`;
|
||||||
this.description = lineItem.description;
|
this.description = lineItem.description;
|
||||||
if (this.description === null) {
|
if (this.description === null) {
|
||||||
this.#descriptionControl.classList.remove("accounting-not-empty");
|
this.#descriptionControl.classList.remove("accounting-not-empty");
|
||||||
@ -519,6 +523,7 @@ class JournalEntryLineItemEditor {
|
|||||||
this.#descriptionControl.classList.add("accounting-not-empty");
|
this.#descriptionControl.classList.add("accounting-not-empty");
|
||||||
}
|
}
|
||||||
this.#descriptionText.innerText = this.description === null? "": this.description;
|
this.#descriptionText.innerText = this.description === null? "": this.description;
|
||||||
|
this.#setEnableAccount(!lineItem.isMatched && this.originalLineItemId === null);
|
||||||
this.account = lineItem.account;
|
this.account = lineItem.account;
|
||||||
this.isAccountConfirmed = true;
|
this.isAccountConfirmed = true;
|
||||||
if (this.account === null) {
|
if (this.account === null) {
|
||||||
@ -547,25 +552,17 @@ class JournalEntryLineItemEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the enable status of the description and account.
|
* Sets the enable status of the account.
|
||||||
*
|
*
|
||||||
* @param isEnabled {boolean} true to enable, or false otherwise
|
* @param isEnabled {boolean} true to enable, or false otherwise
|
||||||
*/
|
*/
|
||||||
#setEnableDescriptionAccount(isEnabled) {
|
#setEnableAccount(isEnabled) {
|
||||||
if (isEnabled) {
|
if (isEnabled) {
|
||||||
this.#descriptionControl.dataset.bsToggle = "modal";
|
|
||||||
this.#descriptionControl.dataset.bsTarget = `#accounting-description-editor-${this.#debitCreditSubForm.debitCredit}-modal`;
|
|
||||||
this.#descriptionControl.classList.remove("accounting-disabled");
|
|
||||||
this.#descriptionControl.classList.add("accounting-clickable");
|
|
||||||
this.#accountControl.dataset.bsToggle = "modal";
|
this.#accountControl.dataset.bsToggle = "modal";
|
||||||
this.#accountControl.dataset.bsTarget = `#accounting-account-selector-${this.#debitCreditSubForm.debitCredit}-modal`;
|
this.#accountControl.dataset.bsTarget = `#accounting-account-selector-${this.#debitCreditSubForm.debitCredit}-modal`;
|
||||||
this.#accountControl.classList.remove("accounting-disabled");
|
this.#accountControl.classList.remove("accounting-disabled");
|
||||||
this.#accountControl.classList.add("accounting-clickable");
|
this.#accountControl.classList.add("accounting-clickable");
|
||||||
} else {
|
} else {
|
||||||
this.#descriptionControl.dataset.bsToggle = "";
|
|
||||||
this.#descriptionControl.dataset.bsTarget = "";
|
|
||||||
this.#descriptionControl.classList.add("accounting-disabled");
|
|
||||||
this.#descriptionControl.classList.remove("accounting-clickable");
|
|
||||||
this.#accountControl.dataset.bsToggle = "";
|
this.#accountControl.dataset.bsToggle = "";
|
||||||
this.#accountControl.dataset.bsTarget = "";
|
this.#accountControl.dataset.bsTarget = "";
|
||||||
this.#accountControl.classList.add("accounting-disabled");
|
this.#accountControl.classList.add("accounting-disabled");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user