Eric Davis
|
7bc31d6be0
|
Refactor: extract method
|
2010-09-23 11:00:05 -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
|
893ad7943d
|
[#4556] Use a CSS class for financial inputs on Deliverable form
|
2010-09-23 10:31:16 -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
|
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
|
c6d43d9149
|
Fix the FixedBudget displays with a validated period
|
2010-09-22 12:05:58 -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
|
f8270498f3
|
[#4477] Add a simple title/tooltip for the FixedBudget description
|
2010-09-17 15:37:30 -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
|
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
|
ce523df7eb
|
[#4519] Add all contracts as child menu items
|
2010-09-17 11:33:31 -07:00 |
|
Eric Davis
|
306e4cfc80
|
[#4518] Align the total field with the other finance forms.
|
2010-09-17 10:56:52 -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
|
74d707a1a4
|
[#9370] Apply the wiki styles to the text fields on the Contract details page.
|
2010-09-14 15:22:59 -07:00 |
|
Eric Davis
|
ee282a42de
|
[#4508] Update the Retainer single month label to work with larger content.
|
2010-09-14 15:03:19 -07:00 |
|
Eric Davis
|
30f90b7c8d
|
[#4508] Update the Retainer single month label content.
|
2010-09-14 15:01:44 -07:00 |
|
Eric Davis
|
e1a7297312
|
[#4508] Reposition the Retainer single month label.
|
2010-09-14 14:44:55 -07:00 |
|
Eric Davis
|
4ba5ac7f8f
|
[#4507] Round billable rate display to nearest dollar value.
|
2010-09-14 14:28:44 -07:00 |
|
Eric Davis
|
a7128fc15b
|
[#4507] Use show_budget_field for billable rate so it's in 3 columns. (using nil hack)
|
2010-09-14 14:24:55 -07:00 |
|
Eric Davis
|
c9e699e9fa
|
[#4507] Remove an extra td wrapper in the contract fields.
|
2010-09-14 14:17:25 -07:00 |
|
Eric Davis
|
893d83a03d
|
[#4506] Format the executed contract as Yes or No.
|
2010-09-14 13:57:26 -07:00 |
|
Eric Davis
|
9b49959bcf
|
[#4505] Fix the start/end calendar when editing an STI deliverable.
|
2010-09-14 13:51:01 -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
|
362610dc77
|
[#4420] Updated the flash messages for Deliverables.
|
2010-09-09 15:12:01 -07:00 |
|
Eric Davis
|
1b08487a0d
|
[#4420] Add a message for new Retainers that Finances are for a single month.
|
2010-09-09 15:04:26 -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 |
|