From 7eee3d75ccc35be17058fdaa85fd3247505c7fa2 Mon Sep 17 00:00:00 2001 From: mathmerized Date: Wed, 13 Mar 2019 11:02:06 -0400 Subject: [PATCH 1/3] TTPLAT-785 update label --- app/views/assets/_depreciation_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/assets/_depreciation_form.html.haml b/app/views/assets/_depreciation_form.html.haml index 4331b5b4..b7e5cdea 100644 --- a/app/views/assets/_depreciation_form.html.haml +++ b/app/views/assets/_depreciation_form.html.haml @@ -28,7 +28,7 @@ %i.fa.fa-calendar .col-xs-4 - = f.input :depreciation_purchase_cost, :wrapper=> :vertical_prepend, :label => "Depreciation Purchase Cost" do + = f.input :depreciation_purchase_cost, :wrapper=> :vertical_prepend, :label => "Depreciation Cost (Purchase)" do %span.input-group-addon %i.fa.fa-usd = f.input_field :depreciation_purchase_cost, :class => "form-control", :disabled => @asset.depreciation_purchase_cost != @asset.book_value From 46ccd07c7e8957c8af3d4554a613341b638d73f8 Mon Sep 17 00:00:00 2001 From: mathmerized Date: Tue, 4 Jun 2019 10:29:23 -0400 Subject: [PATCH 2/3] Bump version --- lib/transam_accounting/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/transam_accounting/version.rb b/lib/transam_accounting/version.rb index e3b9a10b..caeaf905 100644 --- a/lib/transam_accounting/version.rb +++ b/lib/transam_accounting/version.rb @@ -1,3 +1,3 @@ module TransamAccounting - VERSION = "2.5.2" + VERSION = "2.6.0" end From 7318a235cd6b8782e4e602f00e7812902241d95d Mon Sep 17 00:00:00 2001 From: Alex Andrade Date: Wed, 5 Jun 2019 15:27:50 -0400 Subject: [PATCH 3/3] [TTPLAT-990] Re-enable funding loader for SCAG and only show dividers in asset groups and funding programs navigation menus if the lists are populated. --- app/views/shared/_financial_nav.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/shared/_financial_nav.html.haml b/app/views/shared/_financial_nav.html.haml index c41286ab..db6bdf79 100644 --- a/app/views/shared/_financial_nav.html.haml +++ b/app/views/shared/_financial_nav.html.haml @@ -67,7 +67,8 @@ %i.fa.fa-fw.fa-book = program - if can? :create, FundingSource - %li.divider + - if FundingSource.all.count > 0 + %li.divider %li = link_to new_funding_source_path do %i.fa.fa-plus.fa-fw