Commit Graph

3088 Commits

Author SHA1 Message Date
Johnny 5a21271c45
Merge pull request #765 from o-psi/Localization-Cleanup
Condensed localization to a separate file
2023-10-14 13:54:54 -04:00
Johnny 966a8b0770
Merge pull request #763 from o-psi/add-php-info-to-debug
Expand debug screen with PHPInfo
2023-10-14 13:54:16 -04:00
Johnny 766df19223
Merge pull request #762 from o-psi/Invoice-items-order
Sort invoice items
2023-10-14 13:54:01 -04:00
Johnny 21a5006a43
Merge pull request #761 from o-psi/edit-currnet-expenses-amount-regex
Allow for commas in recurring expense modals
2023-10-14 13:50:56 -04:00
o-psi ed269e1245 changed to item_order 2023-10-13 22:49:28 -05:00
o-psi ee8e758a49 Condensed ~1.6 LOC by 50x, and reduced duplication 2023-10-13 22:42:11 -05:00
Andrew Malsbury 29279d0a7e
Merge branch 'itflow-org:master' into edit-currnet-expenses-amount-regex 2023-10-13 22:12:03 -05:00
o-psi 08a11cb53e added php info and handling to bottom of debug 2023-10-13 21:56:50 -05:00
o-psi 0270a680a6 update invoices 2023-10-13 20:54:41 -05:00
o-psi 7a6c3ec470 Removed the order_id echo statement for production 2023-10-13 20:48:44 -05:00
o-psi b4396fe244 post actions for changing sort 2023-10-13 20:13:40 -05:00
o-psi ffa0226067 add item sort dropdowns 2023-10-13 20:13:28 -05:00
o-psi 097690bfbd add sort to guest view 2023-10-13 20:12:58 -05:00
o-psi 141dad23fe Update database, did not do increment 2023-10-13 20:12:43 -05:00
o-psi 3124ca2777 adjust regedit to allow for commas as thousands 2023-10-13 17:40:06 -05:00
o-psi 00effcf79d remove commas before trying to make a float 2023-10-13 17:39:41 -05:00
Johnny 45acc5866d
Merge pull request #760 from o-psi/dashboard-links
Dashboard links
2023-10-13 15:30:47 -04:00
Johnny 604a788112
Merge pull request #759 from o-psi/Assets-Report
Assets report
2023-10-13 15:30:36 -04:00
Johnny ff424330b4
Merge pull request #758 from o-psi/add-archive-for-account-types
Add archive option for account types
2023-10-13 15:30:06 -04:00
o-psi b747bd4e9d Make all boxes links 2023-10-13 10:53:20 -05:00
o-psi 157263cf8a Add link to Assets on technical dashboard 2023-10-13 09:58:56 -05:00
o-psi 78032dcf6d Added a report to view all assets by client. 2023-10-13 09:56:38 -05:00
o-psi 37a5100742 Add archive option for account types 2023-10-13 13:57:17 +00:00
Johnny 2f8ee11a77
Merge pull request #757 from o-psi/Update-Documentation-Capitalization
Update Capitalization for Documentation
2023-10-12 18:30:49 -04:00
o-psi 3d31cf0d9d Move support above documentation 2023-10-12 22:03:40 +00:00
o-psi ab6e8dde00 Update Services location 2023-10-12 22:02:28 +00:00
o-psi 9372ca4bc3 Update Capitalization for DOCUMENTATION 2023-10-12 20:43:26 +00:00
johnnyq 8c56426186 Fixed a layout issue if no previos ticket exists for a selected contact under ticket details 2023-10-12 16:09:31 -04:00
Johnny 5a1b93ae17
Merge pull request #754 from o-psi/fixed2-typo-in-product-logging
Fixed a typo in product logging
2023-10-12 12:57:57 -04:00
Andrew Malsbury 9b7ef4761c
Merge branch 'itflow-org:master' into fixed2-typo-in-product-logging 2023-10-12 11:55:07 -05:00
Johnny df14ac8a83
Merge pull request #753 from o-psi/remove-foreign-key
Remove-foreign-key
2023-10-12 12:54:33 -04:00
o-psi 38c5547307 changed modifyed to modified 2023-10-12 16:54:18 +00:00
o-psi 8bce945a11 Moved accounts back to top, removed accounts type. 2023-10-12 16:49:56 +00:00
Andrew Malsbury 33cd0e89ca
Merge branch 'itflow-org:master' into master 2023-10-12 11:40:40 -05:00
Andrew Malsbury df9f5fb001
Update db.sql 2023-10-12 11:23:38 -05:00
Andrew Malsbury c7ca89b2e3
Update db.sql 2023-10-12 11:09:26 -05:00
Johnny 63ecb38bb7
Merge pull request #752 from o-psi/fix-account-type-fk
[Urgent] Fix Foreign Key for account types
2023-10-12 12:01:57 -04:00
Andrew Malsbury aa9163ae98
Merge pull request #1 from o-psi/fix-account-type-fk
fix fk for account types
2023-10-12 10:54:59 -05:00
Andrew Malsbury befbf457e8
fix fk for account types 2023-10-12 10:22:45 -05:00
wrongecho 448aaa8c1c
Merge pull request #751 from o-psi/fix-account-type-default
[Critical] Fix bug introduced in account type update
2023-10-12 15:49:03 +01:00
Andrew Malsbury 6506f64a6e
Update db.sql
Fix bug introduced in account type table
2023-10-12 09:27:38 -05:00
Johnny 101488f9f1
Merge pull request #750 from o-psi/Rename-Assets-SideNav-Category
Rename Assets and move documentation and files in
2023-10-11 22:21:09 -04:00
Andrew Malsbury aaf04f18c5 Rename Assets and move documentation and files in 2023-10-12 02:00:12 +00:00
johnnyq e6b15a0ff3 Do not Export Archived Data when Exporting client data to a PDF 2023-10-11 17:03:20 -04:00
johnnyq 964ff6740c Fix last commit opps on balance sheet report. use not equal to 0 instead of equal 0 as it will just sum up all the transfers 2023-10-11 15:12:14 -04:00
johnnyq 25751bdd85 Fix Balance sheet report so it doesn't calculate transfers, transfers use the expense and revenue tables as well. To fix this a transfer always has a vendor_id 0 in the expense table and category_id is always 0 for the revenues table, so dont sum those 2023-10-11 15:08:20 -04:00
johnnyq 66c16d6cff Increment Database again to insert the account types for PR #734 Add Balance Sheet report 2023-10-11 14:46:44 -04:00
johnnyq fb60412686 Increment the Database version as this was missed in PR #734 Add Balance Sheet report 2023-10-11 14:37:27 -04:00
Johnny c248af81fb
Merge pull request #749 from o-psi/remove-gui-custom-fields
Removed gui for custom fields
2023-10-11 14:34:38 -04:00
Johnny f1e74d926d
Merge pull request #748 from o-psi/quote_guest_view
Update guest quote view to make more sense
2023-10-11 14:34:18 -04:00