297 Commits

Author SHA1 Message Date
Eric Davis
30e7142c50 [#6898] Check for project variable before using 2012-05-15 10:45:12 -07:00
Eric Davis
8ecef07c3c [#6714] Remove empty deliverable budget items on submissions 2011-12-12 16:00:57 -08:00
Eric Davis
492435d560 Merge branch 'master' into 6636-deliverable-report 2011-11-14 11:13:19 -08:00
Eric Davis
62c74885b5 [#6680] Round the hours in the summary 2011-11-14 11:10:55 -08:00
Eric Davis
6957c8a114 [#6574] Work around sorting errors on unsaved records
When the deliverable form isn't saved (validation errors) then
the unsaved budgets would cause sorting errors due to nil ids.
2011-11-14 10:20:24 -08:00
Eric Davis
7b6f3835cd [#6636] Change deliverable finance report to show two table per row 2011-10-14 08:34:32 -07:00
Eric Davis
a108ea2431 [#6636] Rename the cost field 2011-10-13 15:58:16 -07:00
Eric Davis
63cc58a459 [#6636] Add table for issue categories to the deliverable finance report 2011-10-13 15:54:53 -07:00
Eric Davis
bbf5d70170 [#6636] Support nil categories in Deliverable's issue_category methods 2011-10-13 15:29:51 -07:00
Eric Davis
ac050d7905 [#6636] Add methods to Deliverable get the costs and hours by issue category 2011-10-13 15:17:24 -07:00
Eric Davis
b8dc021d8e [#6636] CSS and class cleanup to better match the comp design 2011-10-13 14:36:25 -07:00
Eric Davis
5463b4500d [#6636] Style the finance report summary 2011-10-13 13:47:27 -07:00
Eric Davis
8efd13c7d1 [#6636] Use 2 place precision, per new standards. 2011-10-13 13:43:31 -07:00
Eric Davis
f7f53e4ac1 [#6636] Style change on the finance report to be horizontal 2011-10-13 13:33:47 -07:00
Eric Davis
f4fb025c13 [#6636] Add Users/Overhead table to the deliverable finance report 2011-10-13 11:30:25 -07:00
Eric Davis
084ab1dd96 [#6636] Add Users/Labor table to the deliverable finance report 2011-10-13 11:16:24 -07:00
Eric Davis
f972efffbf [#6636] Add Deliverable#spent_for_user to get the billable/non-billable cost by user 2011-10-13 11:07:31 -07:00
Eric Davis
19ec0f6c43 [#6636] Add Deliverable#hours_spent_for_user to get the billable/non-billable hours by user 2011-10-13 11:02:23 -07:00
Eric Davis
2d39a4063a [#6636] Add methods to Deliverable to find users with billable/non-billable time 2011-10-13 10:51:39 -07:00
Eric Davis
bfe35fb1c8 [#6636] Show overage amounts on the deliverable finance report 2011-10-13 10:21:58 -07:00
Eric Davis
fa4224ddfc [#6636] Major fixes to the CSS to share styles with other pages 2011-10-13 09:56:05 -07:00
Eric Davis
acc825a4fe [#6636] Add overhead table to the deliverable finance report 2011-10-13 09:28:31 -07:00
Eric Davis
3e1606c28d [#6636] Show labor totals in deliverable finance report 2011-10-13 08:55:20 -07:00
Eric Davis
1bbce5457f [#6636] Show deliverable calculations for Labor in the finance lightbox 2011-10-12 15:58:19 -07:00
Eric Davis
7380246594 [#6636] Add Deliverable calculation methods based on activity 2011-10-12 15:43:06 -07:00
Eric Davis
c8371854cb [#6636] Add an action to show deliverable finances 2011-10-12 14:18:59 -07:00
Eric Davis
ba0ed4a137 [#6636] Added a static jquery ui lightbox to Labor and Overhead links 2011-10-12 11:40:03 -07:00
Eric Davis
3479ded9a6 [#6574] Allow adding and removing Fixed Budgets 2011-10-11 15:19:12 -07:00
Eric Davis
7e818d75a7 [#6574] Refactor: extract fixed budget form to partial 2011-10-11 14:50:31 -07:00
Eric Davis
2ef8cd9b4e [#6574] Allow creating and deleting multiple overhead budgets 2011-10-11 14:45:49 -07:00
Eric Davis
ce6c89cfa7 [#6574] Extract method from addNewDeliverableLaborItem 2011-10-11 14:21:18 -07:00
Eric Davis
ca84747cb9 [#6574] Refactor: extract overhead budget form to partial 2011-10-11 14:12:52 -07:00
Eric Davis
2653e80a5f [#6574] Confirm removal in JS and handle removing the last labor item 2011-10-11 13:49:49 -07:00
Eric Davis
d633b32b30 [#6574] Allow removing labor budgets 2011-10-11 11:44:16 -07:00
Eric Davis
7d0abc641a [#6574[ Scope the Labor Budget Add button with a css class 2011-10-11 10:19:17 -07:00
Eric Davis
237b220795 [#6574] Add button for multiple Labor Budgets 2011-10-11 10:17:47 -07:00
Eric Davis
b98703cddf [#6574] Move LaborBudget sort to Ruby so new records aren't excluded 2011-09-15 13:44:13 -07:00
Eric Davis
6bff73db93 [#6574] Add a Labor Budget JS template for adding more budget items
The JS template is generated by Rails for adding a new record
and gets appended to the finance section using
addNewDeliverableFinance() (JS).
2011-09-15 13:26:33 -07:00
Eric Davis
33e07ee10b [#6574] Add a TimeEntryActivity to OverheadBudgets 2011-09-15 10:38:16 -07:00
Eric Davis
df61a1fe9e [#6574] Associate LaborBudgets with TimeEntryActivities 2011-09-14 18:39:49 -07:00
Eric Davis
38c22e2f92 Workaround a regression in ChiliProject 2.x with setting journal attributes
https://www.chiliproject.org/issues/622
2011-09-14 13:31:43 -07:00
Eric Davis
668b1e0991 [#6573] Add the total spent and total budget to the deliverable row 2011-09-14 13:13:46 -07:00
Eric Davis
f5ca74e420 [#6441] Don't include a blank status as an option 2011-08-12 11:02:13 -07:00
Eric Davis
5e50eb7558 [#6441] Block deleting deliverables on closed or locked contracts 2011-08-10 16:07:07 -07:00
Eric Davis
bf1339fc61 [#6441] Block creating deliverables on closed or locked contracts 2011-08-10 15:53:36 -07:00
Eric Davis
256325a39d [#6441] Refactor: extract method 2011-08-10 15:21:45 -07:00
Eric Davis
e0ecae8220 [#6441] Remove dead code 2011-08-10 15:18:37 -07:00
Eric Davis
b99f57f51c [#6441] Use a string so the flow is clearer 2011-08-10 15:16:54 -07:00
Eric Davis
edc9e84719 [#6441] Refactor: extract and move method 2011-08-10 15:15:26 -07:00
Eric Davis
2f77619fef [#6441] Refactor: remove unneeded contract arg 2011-08-10 15:13:01 -07:00