Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SAW - Direct Cost Made Configurable #861

Merged
merged 8 commits into from
Jan 10, 2017
Merged

SAW - Direct Cost Made Configurable #861

merged 8 commits into from
Jan 10, 2017

Commits on Dec 13, 2016

  1. Added row to step 4, used protocol display_study_grand_total_direct_c… 

    …osts method for price [#134879983]
    @SamWord
    SamWord committed Dec 13, 2016
    Configuration menu
    Copy the full SHA
    8120d73 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2017

  1. removed Max Total Indirect Cost line and made Max Total Direct Cost l… 

    …ine dependent on USE_INDIRECT_COST in service calendar [#134879983]
    @SamWord
    SamWord committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    59d6904 View commit details
    Browse the repository at this point in the history

  2. Fixed total direct costs and total costs for otf [#134879983]

    @SamWord
    SamWord committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    74635ba View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into saw-direct-cost

    @SamWord
    SamWord committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    32f5fa0 View commit details
    Browse the repository at this point in the history

  4. removed methods and text to display indirect costs totals [#134879983]

    @SamWord
    SamWord committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    e41773c View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. added view specs for totals displays, made otf totals a separate part… 

    …ial [#134879983]
    @SamWord
    SamWord committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    4dd8b67 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Merge branch 'master' into saw-direct-cost

    @SamWord
    SamWord committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    076b072 View commit details
    Browse the repository at this point in the history

  2. Added indirect cost herlpers back [#137106137]

    @SamWord
    SamWord committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    7b23b63 View commit details
    Browse the repository at this point in the history