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
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
9f8f1238aa
[ #4420 ] Add a Javascript prompt when extending or shrinking a Deliverable's period.
2010-09-08 10:57:09 -07:00
Eric Davis
df53f27114
[ #4420 ] Remove Deliverable#frequency, assumed to be monthly.
2010-09-01 20:24:29 -07:00
Eric Davis
6a0c6348ed
[ #4420 ] Missing locale string.
2010-09-01 20:10:20 -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
abc4d30346
[ #4420 ] Display a message in the form when a Retainer has no effective months.
2010-09-01 18:50:24 -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
e5853100d5
[ #4420 ] Added some Javascript to prompt the user if they try to create a Retainer without a date range.
2010-09-01 18:44:30 -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
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
Eric Davis
cb27ae2cc8
[ #4420 ] Throw away single tests for start and end extensions.
2010-09-01 15:33:46 -07:00
Eric Davis
57d3830084
[ #4420 ] Added a test for extending both the start and end dates.
2010-09-01 15:33:08 -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
Eric Davis
c12a33e25d
Merge branch 'master' into 4420-retainers
2010-09-01 14:53:32 -07:00
Eric Davis
0c38fe2c37
[ #4466 ] Added deprecated methods to support more of the Budget plugin API.
2010-09-01 14:32:09 -07:00
Eric Davis
d48addbcb0
[ #4420 ] Added support for overriding each period's finances on Retainers.
2010-08-30 10:51:37 -07:00
Eric Davis
c13f31b1b5
[ #4420 ] Added a Deliverable finance form for each Retainer month.
2010-08-30 10:30:59 -07:00
Eric Davis
c3c472b3b1
[ #4420 ] Extract the Deliverable finances form to a partial.
2010-08-30 10:09:13 -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
fc28f8351f
[ #4420 ] Fixed the after_save callback for Retainers.
2010-08-30 09:18:37 -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
4b162f85bf
[ #4420 ] Refactor: extract duplicated data to query.
2010-08-16 14:53:08 -07:00
Eric Davis
1120b39ed6
[ #4420 ] Hook up Retainers so they can be saved.
2010-08-16 14:49:03 -07:00
Eric Davis
7d19c10714
[ #4420 ] Show/hide the frequency field based on the selected Deliverable type.
2010-08-16 14:48:35 -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
8321903598
[ #4420 ] Add frequency to deliverables for Retainers.
2010-08-16 14:08:04 -07:00
Eric Davis
f18d259c3c
[ #4420 ] Add a RetainerDeliverable model.
2010-08-16 13:59:42 -07:00
Eric Davis
9d52bcfbe2
Ignore tmp
2010-08-16 13:59:15 -07:00
Eric Davis
437909b621
[ #4272 ] Added a performance test for showing a contract to profile the code.
2010-08-16 12:26:28 -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
6924b32048
[ #4390 ] Add the Contract name as an issue column.
2010-08-12 10:38:48 -07:00
Eric Davis
b83696f49a
[ #4391 ] Add the Deliverable title as an issue column.
2010-08-12 10:36:01 -07:00
Eric Davis
8906639273
[ #4412 ] Added HTML page titles.
2010-08-12 10:25:14 -07:00
Eric Davis
dfcc31c83e
[ #4411 ] Format the Contracts list too.
2010-08-12 10:06:43 -07:00
Eric Davis
fa12fcd129
[ #4411 ] Round currency to 0 decimal places on the Contracts page.
2010-08-12 10:03:37 -07:00
Eric Davis
82d46bd12a
[ #4411 ] Round time and currencies on the Deliverable form to 2 decimal places.
2010-08-12 09:49:45 -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