Commit Graph

72 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 df53f27114 [#4420] Remove Deliverable#frequency, assumed to be monthly. 2010-09-01 20:24:29 -07:00
Eric Davis 0a33cdefbb Remove dead test code. 2010-09-01 17:57:49 -07:00
Eric Davis 40d4029cd1 [#4420] Make #months handle more edge cases. 2010-08-30 09:50:24 -07:00
Eric Davis 9a4b4f2b43 [#4420] Added OverheadBudget creation for Retainers. 2010-08-30 09:25:24 -07:00
Eric Davis 7d43ab7d74 [#4420] Working on creating labor budgets for each retainer month. 2010-08-23 16:15:57 -07:00
Eric Davis f899b4e623 [#4420] Started on the Retainer's periods, only pending tests for now. 2010-08-16 15:06:08 -07:00
Eric Davis 3e30629d44 [#4420] Add the frequency field for Retainers to the Model and View. 2010-08-16 14:47:47 -07:00
Eric Davis f18d259c3c [#4420] Add a RetainerDeliverable model. 2010-08-16 13:59:42 -07:00
Eric Davis 720da2c554 [#4389] Added the Contract filter to the Time Entry report. 2010-08-16 09:54:09 -07:00
Eric Davis 620eaa262f [#4389] Add the Deliverable filter to the Time Entry report. 2010-08-16 09:39:27 -07:00
Eric Davis a3e1aa277f [#4390] Added a Contract filter to the issues list. 2010-08-12 12:04:29 -07:00
Eric Davis 25436910fb [#4391] Add a Deliverable filter to the issues list. 2010-08-12 11:27:33 -07:00
Eric Davis a2b810a4d8 [#4410] Replace Payment Terms with an Enumeration
Instead of using a hard coded value for Payment Terms, they will use
Redmine's Enumeration table.  This provides an admin gui to managing
the value as well as ordering them.
2010-08-12 09:26:09 -07:00
Eric Davis 729acf200d [#4327] Add a select field to selecting the deliverable for an issue. 2010-08-02 16:07:59 -07:00
Eric Davis ad8dec8638 [#4327] Show the current deliverable on the issue details page. 2010-08-02 15:14:05 -07:00
Eric Davis 279ed4c206 [#4184] An Issue belongs to a Deliverable. 2010-07-19 10:30:37 -07:00
Eric Davis 41e221119c [#4183] Implemented Contract#profit_left. 2010-07-13 18:32:35 -07:00
Eric Davis 361b971100 [#4183] Implemented Contract#total_spent 2010-07-13 18:25:00 -07:00
Eric Davis 850d6adb54 [#4183] Updated contract tests from the Deliverable calculation changes. 2010-07-13 18:19:58 -07:00
Eric Davis 1f22b203b6 [#4183] Implemented HourlyDeliverable#profit_left. 2010-07-13 18:15:29 -07:00
Eric Davis cd3ba5e5e5 [#4183] Implemented HourlyDeliverable#total_spent. 2010-07-13 18:11:02 -07:00
Eric Davis 597062fdf8 [#4183] Implemented FixedDeliverable#profit_left (was called profit_spent). 2010-07-13 18:00:35 -07:00
Eric Davis de42a32121 [#4183] Implemented FixedDeliverable#total_spent 2010-07-13 17:49:50 -07:00
Eric Davis 5d09a035c5 [#4183] Updated HourlyDeliverable#profit_budget test to match the example. 2010-07-13 17:43:00 -07:00
Eric Davis 80cde2d222 [#4183] HourlyDeliverable#total (budget) should only include labor budget. 2010-07-13 17:38:49 -07:00
Eric Davis 9c07ee676e [#4183] Implemented Contract#labor_spent. 2010-07-13 13:31:28 -07:00
Eric Davis 7323537ea6 [#4183] Implemented Contract#overhead_spent. 2010-07-13 13:27:06 -07:00
Eric Davis b24ab65792 [#4183] Implemented Contract#estimated_hour_spent and Deliverable#hours_spent_total. 2010-07-13 11:34:22 -07:00
Eric Davis 4d475042f0 [#4183] Implemented Contract#profit_budget and Deliverable#profit_budget. 2010-07-13 10:28:45 -07:00
Eric Davis f89e0bf14a [#4183] Implemented Contract#total_budget. 2010-07-07 16:01:47 -07:00