Commit Graph

177 Commits

Author SHA1 Message Date
Eric Davis ac2a9ddbf0 Remove HolyGrail, not worth it yet 2010-10-05 14:41:03 -07:00
Eric Davis 0f9308267c [#4602] Show overage values in red 2010-10-05 14:07:57 -07:00
Eric Davis d3f9255eef [#4601] Change Manage Budget to a givable permission 2010-10-05 11:30:19 -07:00
Eric Davis 5a277c723f [#4600] Replaced todo and later release notes with icons 2010-10-05 10:39:44 -07:00
Eric Davis 39c04b9896 [#4570] Add an alert message about orphaned time on a project 2010-09-29 13:50:17 -07:00
Eric Davis 15d626b6d8 [#4552] Link the issue counts to filtered Issue lists 2010-09-29 12:06:53 -07:00
Eric Davis 20f89adf39 [#4552] Add issue counts to the Deliverable details 2010-09-29 11:48:21 -07:00
Eric Davis 632cff8f7f [#4552] Add the Total hours to the Deliverable details 2010-09-29 11:29:04 -07:00
Eric Davis f37306aace [#4552] Add the Overhead hours spent to the Deliverable details 2010-09-29 10:54:33 -07:00
Eric Davis 38f2bcb17f [#4552] Add the Labor hours spent to the Deliverable details 2010-09-29 10:44:54 -07:00
Eric Davis 7a5599b4f9 [#4568] Change FixedDeliverable so it's markup is automatically paid 2010-09-29 10:18:25 -07:00
Eric Davis cd382fd784 [#4558] Allow overriding the Contract account executive and Deliverable manager when converting 2010-09-23 13:30:44 -07:00
Eric Davis 83e3023d85 [#4557] Hide markup displays when it's 0 2010-09-23 11:11:50 -07:00
Eric Davis d778201eff [#4556] Formatted the Fixed Budget values in the deliverable form 2010-09-23 10:51:56 -07:00
Eric Davis ed9f73e8a0 [#4555] Include the spent FixedBudget in Hourly and Retainers total_spent 2010-09-23 10:14:12 -07:00
Eric Davis 0a80a54be3 [#4554] Fix the markup calculation to work with plain numerics 2010-09-23 09:40:47 -07:00
Eric Davis 8582ad0ecd [#4551] Use the old deliverable subject as part of the FixedBudget item 2010-09-22 13:03:14 -07:00
Eric Davis c9861835e7 [#4551] Change the Budget conversion to create new FixedBudget items for old FixedDeliverables 2010-09-22 12:45:04 -07:00
Eric Davis 0ef87e7b9c [#4551] Change the Budget conversion to convert materials as FixedBudget items 2010-09-22 12:27:52 -07:00
Eric Davis 7c6c2797c4 Merge branch '4477-fixed-expenses' 2010-09-22 11:54:41 -07:00
Eric Davis 967ef6bc7a [#4777] Add fixed budgets to the profit_left calculations 2010-09-22 11:53:55 -07:00
Eric Davis 4a7484e1ea [#4477] Added the amounts spent for FixedBudgets 2010-09-22 11:27:42 -07:00
Eric Davis d4de581b3c [#4477] Added a paid field to track when a FixedBudget is spent 2010-09-22 10:49:36 -07:00
Eric Davis 2c04ef4f45 [#4477] Add FixedBudget items into the total and profit Deliverable calculations 2010-09-17 15:22:53 -07:00
Eric Davis 55c9f93c6c [#4477] Change Retainers to scope #fixed_budget_total and #fixed_markup_budget_total by date 2010-09-17 14:15:08 -07:00
Eric Davis 081df7874d [#4477] Added the total FixedBudget markup to the deliverable details 2010-09-17 13:43:35 -07:00
Eric Davis ed7536897e [#4477] Show each fixed budget item in the deliverable details 2010-09-17 13:38:44 -07:00
Eric Davis 86be29cecc [#4477] Show the total fixed budget in the deliverable row 2010-09-17 13:27:35 -07:00
Eric Davis 294c88f11d [#4477] Hook up FixedBudgets to Contract#fixed_budget and #fixed_markup_budget 2010-09-17 13:16:59 -07:00
Eric Davis 19ed07b617 [#4517] Default the details row to All periods when it's out of the date range 2010-09-17 10:44:18 -07:00
Eric Davis edc8db7fe2 [#4477] Hook FixedBudgets into Retainer's periods. 2010-09-09 17:27:32 -07:00
Eric Davis feee5e8b43 [#4477] Added FixedBudgets to the Deliverable finance form. 2010-09-09 17:06:35 -07:00
Eric Davis 07da5d98d8 [#4477] Added the FixedBudget markup calculations. 2010-09-09 16:12:48 -07:00
Eric Davis 7f7e5b3042 [#4477] Added model and migration for FixedBudget. 2010-09-09 15:57:58 -07:00
Eric Davis 5ef7d0271d [#4420] Display per period Retainer values on the Contract details page. 2010-09-09 14:56:20 -07:00
Eric Davis 0a1bb9169d [#4420] Hook up Retainer's total_spent and profit_left for periods. 2010-09-09 14:22:25 -07:00
Eric Davis 91d8c1818e [#4420] Hook up Retainer's overhead_spent and labor_budget_spent for periods 2010-09-09 13:50:50 -07:00
Eric Davis 394236c741 WIP: need to finish up the backend still, some frontend is here for integration testing. 2010-09-08 17:54:59 -07:00
Eric Davis 82dec74eb7 [#4420] Changed the approach for Retainer calculations by using an optional parameter. 2010-09-08 17:49:51 -07:00
Eric Davis c8b86db4c4 [#4420] Added a second Retainer calculation method for specific dates. 2010-09-08 14:54:36 -07:00
Eric Davis 0cc2523084 [#4420] Adding Retainer calculation methods for specific dates. 2010-09-08 14:50:25 -07:00
Eric Davis 7ed21f7fe2 [#4420] When a Retainer's period is changed, it will now reload it's details. 2010-09-08 14:03:06 -07:00
Eric Davis ad6766fd2f [#4420] Add the options for Retainers to select which month to display. (UI only). 2010-09-08 11:57:46 -07:00
Eric Davis d3052d7d54 [#4420] Implemented RetainerDeliverable#current_period 2010-09-08 11:46:59 -07:00
Eric Davis df53f27114 [#4420] Remove Deliverable#frequency, assumed to be monthly. 2010-09-01 20:24:29 -07:00
Eric Davis dfab7b5714 [#4420] Use empty budgets for Retainers that are missing them so they appear on the form. 2010-09-01 19:28:18 -07:00
Eric Davis ede645e359 [#4420] Added test for changing Retainer's start/end date without it's period. 2010-09-01 18:14:48 -07:00
Eric Davis 9858b87fff [#4420] When a Retainer's period is shrunk, budgets outside the period are destroyed. 2010-09-01 18:12:40 -07:00
Eric Davis 0a33cdefbb Remove dead test code. 2010-09-01 17:57:49 -07:00
Eric Davis 8f92dcc870 [#4420] Changed Retainers to support extending multiple Budget items. 2010-09-01 17:56:16 -07:00