mirror of
https://github.com/itflow-org/itflow
synced 2026-11-17 09:57:24 +00:00
Income modernized for MSP use: rebuilt Income list with cards for this month against the same days of last month, the year so far with a monthly average, recurring per month from running recurring invoices and still owed on invoices with the late part, pills for invoice payments, other income, paid online and no category, client/category/date filters with account and payment method under More filters, search by amount, reference and invoice number, footer total, sort whitelist and ?open=; new payment quick look with the invoice, paid in all and still owed, the other payments on it, online fee when recorded, Open Invoice, Email Receipt, Edit and Delete; new other income quick look with who entered it and what the client has paid in this year, with Edit, Copy and Delete; one New/Edit/Copy Other Income form with a client picker, an icon on every field, validation of every field and the currency taken from the account; other income now needs Financial write to add and change and Financial full to delete, payments keep their Sales and Financial rules; bulk Set Category (a payment's invoice takes it), Set Account, Set Payment Method, Set Client and Delete for other income, with payments left alone where they belong to their invoice; export with the list's filters plus Invoice and Paid Online columns; income counted the same everywhere through new functions/income.php, so uncategorised other income now counts on the dashboard, client overview, Income Summary, P&L, Income by Client and Client Profitability while transfers stay out; Income Summary and P&L No category rows and type links open the list, Transactions opens the quick looks, Accounts link to their transactions and income, search has an Income group; demo data adds quarterly rebates, interest and referral fees; income_model.php and the three old bulk modals removed; database 3.0.5 makes revenue_description text, adds revenue_created_by backfilled from the audit log and date keys on revenues and payments; CHANGELOG updated
This commit is contained in:
9
db.sql
9
db.sql
@@ -1789,7 +1789,8 @@ CREATE TABLE `payments` (
|
||||
`payment_account_id` int(11) NOT NULL,
|
||||
`payment_invoice_id` int(11) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`payment_id`),
|
||||
KEY `payment_invoice_id` (`payment_invoice_id`)
|
||||
KEY `payment_invoice_id` (`payment_invoice_id`),
|
||||
KEY `payment_date` (`payment_date`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -2345,15 +2346,17 @@ CREATE TABLE `revenues` (
|
||||
`revenue_currency_code` varchar(200) NOT NULL,
|
||||
`revenue_payment_method` varchar(200) DEFAULT NULL,
|
||||
`revenue_reference` varchar(200) DEFAULT NULL,
|
||||
`revenue_description` varchar(200) DEFAULT NULL,
|
||||
`revenue_description` text DEFAULT NULL,
|
||||
`revenue_created_at` datetime NOT NULL DEFAULT current_timestamp(),
|
||||
`revenue_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
|
||||
`revenue_archived_at` datetime DEFAULT NULL,
|
||||
`revenue_category_id` int(11) NOT NULL DEFAULT 0,
|
||||
`revenue_account_id` int(11) NOT NULL,
|
||||
`revenue_client_id` int(11) NOT NULL DEFAULT 0,
|
||||
`revenue_created_by` int(11) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`revenue_id`),
|
||||
KEY `revenue_client_id` (`revenue_client_id`,`revenue_archived_at`)
|
||||
KEY `revenue_client_id` (`revenue_client_id`,`revenue_archived_at`),
|
||||
KEY `revenue_date` (`revenue_date`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user