diff --git a/account_add_modal.php b/account_add_modal.php index ad06e7bc..93ab7166 100644 --- a/account_add_modal.php +++ b/account_add_modal.php @@ -21,13 +21,31 @@
- + +
+
+ +
+ +
+
+ +
+
- -
+
diff --git a/account_edit_modal.php b/account_edit_modal.php index eb230d98..522a3e30 100644 --- a/account_edit_modal.php +++ b/account_edit_modal.php @@ -10,7 +10,6 @@
-
@@ -20,12 +19,35 @@
- +
+ +
+
+ +
+ +
+
-
diff --git a/accounts.php b/accounts.php index c750c3e3..79edd340 100644 --- a/accounts.php +++ b/accounts.php @@ -43,6 +43,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> Name + Type Currency Balance Action @@ -57,6 +58,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $opening_balance = floatval($row['opening_balance']); $account_currency_code = nullable_htmlentities($row['account_currency_code']); $account_notes = nullable_htmlentities($row['account_notes']); + $account_type_id = intval($row['account_type']); + + //Find account type name + $account_type = mysqli_query($mysqli, "SELECT * FROM account_types WHERE account_type_id = $account_type_id"); $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id"); $row = mysqli_fetch_array($sql_payments); @@ -75,6 +80,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + @@ -88,7 +95,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Archive diff --git a/database_updates.php b/database_updates.php index cb3405e2..97b42530 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1374,12 +1374,27 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.6'"); } - //if (CURRENT_DATABASE_VERSION == '0.8.6') { + // Update DB to 0.8.7 + if (CURRENT_DATABASE_VERSION == '0.8.6') { // Insert queries here required to update to DB version 0.8.7 + mysqli_query($mysqli, "ALTER TABLE `accounts` ADD `account_type` int(6) DEFAULT NULL AFTER `account_notes`"); + mysqli_query($mysqli, "CREATE TABLE `account_types` (`account_type_id` int(11) NOT NULL AUTO_INCREMENT,`account_type_name` varchar(255) NOT NULL,`account_type_description` text DEFAULT NULL,`account_type_created_at` datetime NOT NULL DEFAULT current_timestamp(),`account_type_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),`account_type_archived_at` datetime DEFAULT NULL,PRIMARY KEY (`account_type_id`))"); // Then, update the database to the next sequential version - //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.7'"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.7'"); + } + + // Be sure to change database_version.php to reflect the version you are updating to here + // Please add this same comment block to the bottom of this file, and update the version number. + // Uncomment Below Lines, to add additional database updates + // + //if (CURRENT_DATABASE_VERSION == '0.8.7') { + // Insert queries here required to update to DB version 0.8.9 + // + // Then, update the database to the next sequential version + //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.8'"); //} + // } else { // Up-to-date diff --git a/db.sql b/db.sql index 0734cb0f..e6e1c063 100644 --- a/db.sql +++ b/db.sql @@ -28,13 +28,29 @@ CREATE TABLE `accounts` ( `opening_balance` decimal(15,2) NOT NULL DEFAULT 0.00, `account_currency_code` varchar(200) NOT NULL, `account_notes` text DEFAULT NULL, + `account_type` int(6) NOT NULL DEFAULT NULL, `account_created_at` datetime NOT NULL DEFAULT current_timestamp(), `account_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `account_archived_at` datetime DEFAULT NULL, - PRIMARY KEY (`account_id`) + PRIMARY KEY (`account_id`), + CONSTRAINT `fk_accounts_account_type_id` FOREIGN KEY (`account_type`) REFERENCES `account_types` (`account_type_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `account_types`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `account_types` ( + `account_type_id` int(11) NOT NULL AUTO_INCREMENT, + `account_type_name` varchar(200) NOT NULL, + `account_type_description` text DEFAULT NULL, + `account_type_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `account_type_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `account_type_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`account_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + -- -- Table structure for table `api_keys` -- diff --git a/post.php b/post.php index 021a925b..a9887ed6 100644 --- a/post.php +++ b/post.php @@ -10,6 +10,7 @@ require_once("check_login.php"); // Load specific module logic require_once("post/account.php"); +require_once("post/account_type.php"); require_once("post/api.php"); require_once("post/asset.php"); require_once("post/category.php"); diff --git a/post/account.php b/post/account.php index b598b952..1a5b3a6c 100644 --- a/post/account.php +++ b/post/account.php @@ -10,8 +10,9 @@ if (isset($_POST['add_account'])) { $opening_balance = floatval($_POST['opening_balance']); $currency_code = sanitizeInput($_POST['currency_code']); $notes = sanitizeInput($_POST['notes']); + $type = intval($_POST['type']); - mysqli_query($mysqli,"INSERT INTO accounts SET account_name = '$name', opening_balance = $opening_balance, account_currency_code = '$currency_code', account_notes = '$notes'"); + mysqli_query($mysqli,"INSERT INTO accounts SET account_name = '$name', opening_balance = $opening_balance, account_currency_code = '$currency_code', account_type ='$type', account_notes = '$notes'"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Account', log_action = 'Create', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); @@ -26,9 +27,10 @@ if (isset($_POST['edit_account'])) { $account_id = intval($_POST['account_id']); $name = sanitizeInput($_POST['name']); + $type = intval($_POST['type']); $notes = sanitizeInput($_POST['notes']); - mysqli_query($mysqli,"UPDATE accounts SET account_name = '$name', account_notes = '$notes' WHERE account_id = $account_id"); + mysqli_query($mysqli,"UPDATE accounts SET account_name = '$name',account_type = '$type', account_notes = '$notes' WHERE account_id = $account_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Account', log_action = 'Modify', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/post/account_type.php b/post/account_type.php new file mode 100644 index 00000000..b3538d40 --- /dev/null +++ b/post/account_type.php @@ -0,0 +1,74 @@ + + +
+
+

Balance Sheet

+
+ +
+
+
+
+ +
+

+ +

+

Balance Sheet

+
As of
+
+ + + + + + + + + + + + + + = 11 && $account_type <= 19) { + $balance = $row['opening_balance'] + $row['total_payments'] + $row['total_revenues'] - $row['total_expenses']; + print_row($row, $balance, $currency_format); + $total_assets += $balance; + $formatted_total_assets = numfmt_format_currency($currency_format, $total_assets, $row['account_currency_code']); + } + + } + ?> + + + + + + + + + + + = 21 && $account_type <= 29) { + $balance = $row['opening_balance'] + $row['total_payments'] + $row['total_revenues'] - $row['total_expenses']; + print_row($row, $balance, $currency_format); + $total_liabilities += $balance; + $formatted_total_liabilities = numfmt_format_currency($currency_format, $total_liabilities, $row['account_currency_code']); + } + } + ?> + + + + + + + + + + + = 30) { + $balance = $row['opening_balance'] + $row['total_payments'] + $row['total_revenues'] - $row['total_expenses']; + print_row($row, $balance, $currency_format); + $total_equity += $balance; + $formatted_total_equity = numfmt_format_currency($currency_format, $total_equity, $row['account_currency_code']); + } + } + ?> + + + + + + + + + + + + + + + + + + + +
Account TypeAccount NameAccount Balance
Assets
Total Assets
Liabilities
Total Liabilities
Equity
Total Equity
Total Liabilities and Equity
+ Unbalanced: +
+
+
+
+
+
+ +"; + echo ""; + echo "$account_name"; + echo "$formatted_balance"; + echo ""; +} + + +?> diff --git a/reports_side_nav.php b/reports_side_nav.php index 2629a193..5d33b301 100644 --- a/reports_side_nav.php +++ b/reports_side_nav.php @@ -70,6 +70,12 @@

Profit & Loss

+
  • + "> + +

    Balance Sheet

    +     +
    • diff --git a/settings_account_types.php b/settings_account_types.php new file mode 100644 index 00000000..55134c03 --- /dev/null +++ b/settings_account_types.php @@ -0,0 +1,104 @@ + + +
    +
    +

    Finance Account Types

    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + +
    Account Type IDAccount Type NameType GroupDescription
    +
    + +
    + + Edit + +
    + + Archive + +
    +
    +
    + +
    +
    + + \ No newline at end of file diff --git a/settings_account_types_add_modal.php b/settings_account_types_add_modal.php new file mode 100644 index 00000000..631e691c --- /dev/null +++ b/settings_account_types_add_modal.php @@ -0,0 +1,37 @@ + \ No newline at end of file diff --git a/settings_account_types_edit_modal.php b/settings_account_types_edit_modal.php new file mode 100644 index 00000000..d75d805f --- /dev/null +++ b/settings_account_types_edit_modal.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/settings_side_nav.php b/settings_side_nav.php index abcc9f8e..549d645b 100644 --- a/settings_side_nav.php +++ b/settings_side_nav.php @@ -112,6 +112,13 @@ +
  • + "> + +

    Account Types

    +     +
    • +
  • TEMPLATES
  • diff --git a/setup.php b/setup.php index aea1a53e..ade3c930 100644 --- a/setup.php +++ b/setup.php @@ -1018,10 +1018,23 @@ if (isset($_POST['add_company_settings'])) { unlink('uploads/tmp/cronkey.php'); } - //Create Some Data + //Create Default Accounts + mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', account_type = '11', account_currency_code = '$currency_code'"); - mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', account_currency_code = '$currency_code'"); + //Create Main Account Types + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Asset', account_type_id= '10', account_type_description = 'Assets are economic resources which are expected to benefit the business in the future.'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Liability', account_type_id= '20', account_type_description = 'Liabilities are obligations of the business entity. They are usually classified as current liabilities (due within one year or less) and long-term liabilities (due after one year).'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Equity', account_type_id= '30', account_type_description = 'Equity represents the owners stake in the business after liabilities have been deducted.'"); + //Create Secondary Account Types + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Current Asset', account_type_id= '11', account_type_description = 'Current assets are expected to be consumed within one year or less.'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Fixed Asset', account_type_id= '12', account_type_description = 'Fixed assets are expected to benefit the business for more than one year.'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Other Asset', account_type_id= '19', account_type_description = 'Other assets are assets that do not fit into any of the other asset categories.'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Current Liability', account_type_id= '21', account_type_description = 'Current liabilities are expected to be paid within one year or less.'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Long Term Liability', account_type_id= '22', account_type_description = 'Long term liabilities are expected to be paid after one year.'"); + mysqli_query($mysqli,"INSERT INTO account_types SET account_type_name = 'Other Liability', account_type_id= '29', account_type_description = 'Other liabilities are liabilities that do not fit into any of the other liability categories.'"); + + //Create Categories mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Office Supplies', category_type = 'Expense', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Travel', category_type = 'Expense', category_color = 'red'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Advertising', category_type = 'Expense', category_color = 'green'"); @@ -1034,9 +1047,11 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red'"); + //Create Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); + $_SESSION['alert_message'] = "Company $name created!"; header("Location: setup.php?telemetry");