Eric Davis
|
67469c9d94
|
Refactor: extract methods to utility method
|
2010-10-05 14:34:54 -07:00 |
|
Eric Davis
|
d6aee43b4b
|
[#4570] Replace two queries with a single query
|
2010-09-29 13:58:11 -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
|
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
|
2a60d283a4
|
Refactor: extract method
|
2010-09-23 13:38:04 -07:00 |
|
Eric Davis
|
56a38fbd93
|
Refactor: extract methods to a module and class helper, dollarized_attribute
|
2010-09-23 11:25:16 -07:00 |
|
Eric Davis
|
7bc31d6be0
|
Refactor: extract method
|
2010-09-23 11:00:05 -07:00 |
|
Eric Davis
|
059b971e54
|
Refactor: pull up method
|
2010-09-23 10:22:46 -07:00 |
|
Eric Davis
|
b8d7c15b39
|
Refactor: pull up method
|
2010-09-23 10:18:44 -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
|
d78e7b1dc3
|
[#4477] Scope fixed budget items by period too (for Retainers)
|
2010-09-17 14:51:48 -07:00 |
|
Eric Davis
|
67dd75a980
|
[#4477] Skip blank FixedBudget items in the deliverable details
|
2010-09-17 14:23:29 -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
|
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
|
d315252565
|
Refactor: use #scope_date_status.
|
2010-09-09 15:44:36 -07:00 |
|
Eric Davis
|
6b38dfca91
|
Refactor: use utility method.
|
2010-09-09 15:43:38 -07:00 |
|
Eric Davis
|
75046cfdd1
|
Refactor: extract utility method.
|
2010-09-09 15:42:12 -07:00 |
|
Eric Davis
|
12fffee314
|
Refactor: extract scope_date_status method to find how to scope the periods.
|
2010-09-09 15:39:25 -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
|
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
|
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
|
994e9b0332
|
[#4420] Handle edge case when a retainer has no start or end date set.
|
2010-09-01 18:49:55 -07:00 |
|
Eric Davis
|
918561d667
|
[#4420] Handle edge cases if a Retainer has no start or end date to extend.
|
2010-09-01 18:19:43 -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
|
8f92dcc870
|
[#4420] Changed Retainers to support extending multiple Budget items.
|
2010-09-01 17:56:16 -07:00 |
|
Eric Davis
|
f46d222f4a
|
[#4420] Refactor: extract method.
|
2010-09-01 15:29:37 -07:00 |
|
Eric Davis
|
2969afeaf4
|
[#4420] Refactor: extract method.
|
2010-09-01 15:24:33 -07:00 |
|
Eric Davis
|
bd3cd89dd0
|
[#4420] Refactor: extract method.
|
2010-09-01 15:20:28 -07:00 |
|
Eric Davis
|
4b12d9d9c8
|
[#4420] Retainers extended before the start date will duplicate the month's first budget items.
|
2010-09-01 15:15:16 -07:00 |
|
Eric Davis
|
16f8152599
|
[#4420] Retainers extended past the end date will duplicate the month's last budget items.
|
2010-09-01 15:09:36 -07:00 |
|