From f97752c3681bc7c336609674e8e2ce2936cda687 Mon Sep 17 00:00:00 2001 From: Sigma Dimensions <79010126+myoualid@users.noreply.github.com> Date: Sun, 21 May 2023 13:25:15 +0100 Subject: [PATCH] fix contracting/expanding schedule of rates --- src/blenderbim/blenderbim/core/cost.py | 2 +- src/blenderbim/blenderbim/tool/cost.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blenderbim/blenderbim/core/cost.py b/src/blenderbim/blenderbim/core/cost.py index b4dddf8f07..e96541e52b 100644 --- a/src/blenderbim/blenderbim/core/cost.py +++ b/src/blenderbim/blenderbim/core/cost.py @@ -130,7 +130,7 @@ def assign_cost_value(ifc, cost_item, cost_rate): ifc.run("cost.assign_cost_value", cost_item=cost_item, cost_rate=cost_rate) def load_schedule_of_rates(cost, schedule_of_rates): - cost.load_schedule_of_rates(schedule_of_rates) + cost.load_schedule_of_rates_tree(schedule_of_rates) def unassign_cost_item_quantity(ifc, cost, cost_item, products): ifc.run("cost.unassign_cost_item_quantity", cost_item=cost_item, products=products) diff --git a/src/blenderbim/blenderbim/tool/cost.py b/src/blenderbim/blenderbim/tool/cost.py index 181815eb18..5079729cec 100644 --- a/src/blenderbim/blenderbim/tool/cost.py +++ b/src/blenderbim/blenderbim/tool/cost.py @@ -452,7 +452,7 @@ class Cost(blenderbim.core.tool.Cost): contracted_cost_item_rates = json.loads(props.contracted_cost_item_rates) contracted_cost_item_rates.remove(cost_item) props.contracted_cost_item_rates = json.dumps(contracted_cost_item_rates) - cls.load_schedule_of_rates(schedule_of_rates=tool.Ifc.get().by_id(int(props.schedule_of_rates))) + cls.load_schedule_of_rates_tree(schedule_of_rates=tool.Ifc.get().by_id(int(props.schedule_of_rates))) @classmethod def contract_cost_item_rate(cls, cost_item): @@ -460,7 +460,7 @@ class Cost(blenderbim.core.tool.Cost): contracted_cost_item_rates = json.loads(props.contracted_cost_item_rates) contracted_cost_item_rates.append(cost_item) props.contracted_cost_item_rates = json.dumps(contracted_cost_item_rates) - cls.load_schedule_of_rates(schedule_of_rates=tool.Ifc.get().by_id(int(props.schedule_of_rates))) + cls.load_schedule_of_rates_tree(schedule_of_rates=tool.Ifc.get().by_id(int(props.schedule_of_rates))) @classmethod def create_new_cost_item_li(cls, props_collection, cost_item, level_index, type="cost_rate"):