Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Rename supplementary_amount to base_amount

Klaus Zandersedf4ddf1cdd7
diff --git a/modules/budgets/app/contracts/budgets/base_contract.rb b/modules/budgets/app/contracts/budgets/base_contract.rb
index fc7468ae6f3..cfebe9302c7 100644
--- a/modules/budgets/app/contracts/budgets/base_contract.rb
+++ b/modules/budgets/app/contracts/budgets/base_contract.rb
@@ -39,7 +39,7 @@ module Budgets
attribute :fixed_date
attribute :project
attribute :state
- attribute :supplementary_amount
+ attribute :base_amount
attribute :new_material_budget_item_attributes,
readable: false
diff --git a/modules/budgets/app/models/budget.rb b/modules/budgets/app/models/budget.rb
index 74f89bde307..cbeb41d5561 100644
--- a/modules/budgets/app/models/budget.rb
+++ b/modules/budgets/app/models/budget.rb
@@ -100,7 +100,7 @@ class Budget < ApplicationRecord
def copy_attributes(source)
source.attributes.slice("project_id", "subject", "description", "fixed_date", "state",
- "supplementary_amount").merge("author" => User.current)
+ "base_amount").merge("author" => User.current)
end
def copy_budget_items(source, sink, items:)
@@ -119,7 +119,7 @@ class Budget < ApplicationRecord
end
def budget
- supplementary_amount + material_budget + labor_budget + budget_added_by_children
+ base_amount + material_budget + labor_budget + budget_added_by_children
end
def budget_added_by_children
diff --git a/modules/budgets/app/views/budgets/_form.html.erb b/modules/budgets/app/views/budgets/_form.html.erb
index 780a0a3804a..679a0d3789e 100644
--- a/modules/budgets/app/views/budgets/_form.html.erb
+++ b/modules/budgets/app/views/budgets/_form.html.erb
@@ -43,11 +43,11 @@ See COPYRIGHT and LICENSE files for more details.
<%= f.date_picker :fixed_date %>
</div>
<div class="form--field">
- <%= f.text_field :supplementary_amount,
+ <%= f.text_field :base_amount,
size: 12,
inputmode: :decimal,
container_class: "-wide",
- value: unitless_currency_number(@budget.supplementary_amount) %>
+ value: unitless_currency_number(@budget.base_amount) %>
</div>
<div class="form--field">
diff --git a/modules/budgets/app/views/budgets/show.html.erb b/modules/budgets/app/views/budgets/show.html.erb
index 1ab8350047b..d39d7624053 100644
--- a/modules/budgets/app/views/budgets/show.html.erb
+++ b/modules/budgets/app/views/budgets/show.html.erb
@@ -75,8 +75,8 @@ See COPYRIGHT and LICENSE files for more details.
<%= render(AttributeGroups::AttributeGroupComponent.new) do |component|
component.with_header(title: I18n.t(:label_budget_totals))
component.with_attribute(
- key: Budget.human_attribute_name(:supplementary_amount),
- value: number_to_currency(@budget.supplementary_amount)
+ key: Budget.human_attribute_name(:base_amount),
+ value: number_to_currency(@budget.base_amount)
)
component.with_attribute(
key: Budget.human_attribute_name(:material_budget),
diff --git a/modules/budgets/config/locales/de.yml b/modules/budgets/config/locales/de.yml
index 9d5983df7f4..a961744aa40 100644
--- a/modules/budgets/config/locales/de.yml
+++ b/modules/budgets/config/locales/de.yml
@@ -3,7 +3,7 @@ de:
attributes:
budget:
parent_budget: "Übergeordnetes Budget"
- supplementary_amount: "Basisbetrag"
+ base_amount: "Basisbetrag"
budget_added_by_children: "Von Unterbudgets übernommen"
allocated_to_children: "Zugewiesen an Unterbudgets"
state: "Status"
diff --git a/modules/budgets/config/locales/en.yml b/modules/budgets/config/locales/en.yml
index a7235bc9631..bf85a38291e 100644
--- a/modules/budgets/config/locales/en.yml
+++ b/modules/budgets/config/locales/en.yml
@@ -47,7 +47,7 @@ en:
type: "Cost type"
labor_budget: "Planned labor costs"
material_budget: "Planned unit costs"
- supplementary_amount: "Supplementary amount"
+ base_amount: "Supplementary amount"
parent_budget: "Parent budget"
state: "State"
states:
diff --git a/modules/budgets/db/migrate/20250714142919_add_supplementary_amount_to_budget.rb b/modules/budgets/db/migrate/20250714142919_add_supplementary_amount_to_budget.rb
index 1ed08c657eb..9af7e0b8710 100644
--- a/modules/budgets/db/migrate/20250714142919_add_supplementary_amount_to_budget.rb
+++ b/modules/budgets/db/migrate/20250714142919_add_supplementary_amount_to_budget.rb
@@ -30,7 +30,7 @@
class AddSupplementaryAmountToBudget < ActiveRecord::Migration[8.0]
def change
- add_column :budgets, :supplementary_amount, :decimal, precision: 20, scale: 2, null: false, default: "0.0"
- add_column :budget_journals, :supplementary_amount, :decimal, precision: 20, scale: 2, null: false, default: "0.0"
+ add_column :budgets, :base_amount, :decimal, precision: 20, scale: 2, null: false, default: "0.0"
+ add_column :budget_journals, :base_amount, :decimal, precision: 20, scale: 2, null: false, default: "0.0"
end
end
diff --git a/modules/budgets/spec/factories/budget_factory.rb b/modules/budgets/spec/factories/budget_factory.rb
index 347a9e0b8df..f1725cb1f34 100644
--- a/modules/budgets/spec/factories/budget_factory.rb
+++ b/modules/budgets/spec/factories/budget_factory.rb
@@ -40,8 +40,8 @@ FactoryBot.define do
traits_for_enum(:state)
- trait :with_supplementary_amount do
- supplementary_amount { BigDecimal(250000000) }
+ trait :with_base_amount do
+ base_amount { BigDecimal(250000000) }
end
end
end
diff --git a/modules/budgets/spec/models/budget_relation_spec.rb b/modules/budgets/spec/models/budget_relation_spec.rb
index 175ebfc9bbd..48a50ab0045 100644
--- a/modules/budgets/spec/models/budget_relation_spec.rb
+++ b/modules/budgets/spec/models/budget_relation_spec.rb
@@ -40,17 +40,17 @@ RSpec.describe BudgetRelation do
describe "bottom->up" do
let(:portfolio) { create(:project, project_type: :portfolio, name: "Portfolio") }
let(:portfolio_budget) do
- create(:budget, project: portfolio, supplementary_amount: 0, subject: "Portfolio Budget")
+ create(:budget, project: portfolio, base_amount: 0, subject: "Portfolio Budget")
end
let(:program1) { create(:project, project_type: :program, parent: portfolio, name: "Program 1") }
- let(:program1_budget) { create(:budget, project: program1, supplementary_amount: 0, subject: "Program 1 Budget") }
+ let(:program1_budget) { create(:budget, project: program1, base_amount: 0, subject: "Program 1 Budget") }
let(:project1) { create(:project, project_type: :project, parent: program1, name: "Project 1") }
- let(:project1_budget) { create(:budget, project: project1, supplementary_amount: 5_000, subject: "Project 1 Budget") }
+ let(:project1_budget) { create(:budget, project: project1, base_amount: 5_000, subject: "Project 1 Budget") }
let(:project2) { create(:project, project_type: :project, parent: program1, name: "Project 2") }
- let(:project2_budget) { create(:budget, project: project2, supplementary_amount: 2_500, subject: "Project 2 Budget") }
+ let(:project2_budget) { create(:budget, project: project2, base_amount: 2_500, subject: "Project 2 Budget") }
context "without any relations" do
it "calculates the correct values" do
@@ -197,19 +197,19 @@ RSpec.describe BudgetRelation do
describe "top->down" do
let(:portfolio) { create(:project, project_type: :portfolio, name: "Portfolio") }
- let(:portfolio_budget) { create(:budget, project: portfolio, supplementary_amount: 10_000, subject: "Portfolio Budget") }
+ let(:portfolio_budget) { create(:budget, project: portfolio, base_amount: 10_000, subject: "Portfolio Budget") }
let(:program1) { create(:project, project_type: :program, parent: portfolio, name: "Program 1") }
- let(:program1_budget) { create(:budget, project: program1, supplementary_amount: 7_000, subject: "Program 1 Budget") }
+ let(:program1_budget) { create(:budget, project: program1, base_amount: 7_000, subject: "Program 1 Budget") }
let(:project1) { create(:project, project_type: :project, parent: program1, name: "Project 1") }
- let(:project1_budget) { create(:budget, project: project1, supplementary_amount: 5_000, subject: "Project 1 Budget") }
+ let(:project1_budget) { create(:budget, project: project1, base_amount: 5_000, subject: "Project 1 Budget") }
let(:program2) { create(:project, project_type: :program, parent: portfolio, name: "Program 2") }
- let(:program2_budget) { create(:budget, project: program2, supplementary_amount: 3_000, subject: "Program 2 Budget") }
+ let(:program2_budget) { create(:budget, project: program2, base_amount: 3_000, subject: "Program 2 Budget") }
let(:project2) { create(:project, project_type: :project, parent: program2, name: "Project 2") }
- let(:project2_budget) { create(:budget, project: project2, supplementary_amount: 2_000, subject: "Project 2 Budget") }
+ let(:project2_budget) { create(:budget, project: project2, base_amount: 2_000, subject: "Project 2 Budget") }
context "without any relations" do
it "calculates the correct values" do
@@ -344,17 +344,17 @@ RSpec.describe BudgetRelation do
# - The projects have half of their budgets already spent.
let!(:portfolio) { create(:project, project_type: :portfolio, name: "Portfolio") }
- let!(:portfolio_budget) { create(:budget, project: portfolio, supplementary_amount: 10_000, subject: "Portfolio Budget") }
+ let!(:portfolio_budget) { create(:budget, project: portfolio, base_amount: 10_000, subject: "Portfolio Budget") }
let!(:program1) { create(:project, project_type: :program, parent: portfolio, name: "Program 1") }
- let!(:program1_budget) { create(:budget, project: program1, supplementary_amount: 0, subject: "Program 1 Budget") }
+ let!(:program1_budget) { create(:budget, project: program1, base_amount: 0, subject: "Program 1 Budget") }
let!(:portfolio_program_relation) do
create(:budget_relation, parent_budget: portfolio_budget, child_budget: program1_budget, relation_type: :subtract)
end
let!(:project1) { create(:project, project_type: :project, parent: program1, name: "Project 1") }
- let!(:project1_budget) { create(:budget, project: project1, supplementary_amount: 5_000, subject: "Project 1 Budget") }
+ let!(:project1_budget) { create(:budget, project: project1, base_amount: 5_000, subject: "Project 1 Budget") }
let!(:project1_program_relation) do
create(:budget_relation, parent_budget: program1_budget, child_budget: project1_budget, relation_type: :add)
@@ -366,7 +366,7 @@ RSpec.describe BudgetRelation do
end
let!(:project2) { create(:project, project_type: :project, parent: program1, name: "Project 2") }
- let!(:project2_budget) { create(:budget, project: project2, supplementary_amount: 2_500, subject: "Project 2 Budget") }
+ let!(:project2_budget) { create(:budget, project: project2, base_amount: 2_500, subject: "Project 2 Budget") }
let!(:project2_program_relation) do
create(:budget_relation, parent_budget: program1_budget, child_budget: project2_budget, relation_type: :add)
diff --git a/modules/budgets/spec/models/permitted_params_spec.rb b/modules/budgets/spec/models/permitted_params_spec.rb
index ef0b06dc607..e0ffaa90f06 100644
--- a/modules/budgets/spec/models/permitted_params_spec.rb
+++ b/modules/budgets/spec/models/permitted_params_spec.rb
@@ -78,8 +78,8 @@ RSpec.describe PermittedParams do
it_behaves_like "allows params"
end
- context "supplementary_amount" do
- let(:hash) { { "supplementary_amount" => "250000.00" } }
+ context "base_amount" do
+ let(:hash) { { "base_amount" => "250000.00" } }
it_behaves_like "allows params"
end
diff --git a/modules/costs/lib/costs/patches/permitted_params_patch.rb b/modules/costs/lib/costs/patches/permitted_params_patch.rb
index b71f6fc63ec..f5e68579ce1 100644
--- a/modules/costs/lib/costs/patches/permitted_params_patch.rb
+++ b/modules/costs/lib/costs/patches/permitted_params_patch.rb
@@ -44,7 +44,7 @@ module Costs::Patches::PermittedParamsPatch
def budget
params.require(:budget).permit(:subject,
:description,
- :fixed_date, :supplementary_amount, :state,
+ :fixed_date, :base_amount, :state,
{ new_material_budget_item_attributes: %i[units cost_type_id comments amount] },
{ new_labor_budget_item_attributes: %i[hours user_id comments amount] },
{ existing_material_budget_item_attributes: %i[units cost_type_id comments amount] },