From fade91efe34f17b9130020b3b76ca42f180a8954 Mon Sep 17 00:00:00 2001 From: Uros Platise Date: Sat, 4 Dec 2021 19:33:36 +0000 Subject: [PATCH 1/2] Fixed account bug --- lib/taskjuggler/TjpSyntaxRules.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/taskjuggler/TjpSyntaxRules.rb b/lib/taskjuggler/TjpSyntaxRules.rb index e7c7510c..bb4d0282 100644 --- a/lib/taskjuggler/TjpSyntaxRules.rb +++ b/lib/taskjuggler/TjpSyntaxRules.rb @@ -76,7 +76,7 @@ def rule_accountCredits def rule_accountHeader pattern(%w( _account !optionalID $STRING ), lambda { if @property.nil? && !@accountprefix.empty? - @property = @project.accout(@accountprefix) + @property = @project.account(@accountprefix) end if @val[1] && @project.account(@val[1]) error('account_exists', "Account #{@val[1]} has already been defined.", From 23390062f97654f4154fc02ba651ebdaba6212c6 Mon Sep 17 00:00:00 2001 From: Uros Platise Date: Sat, 12 Feb 2022 13:18:42 +0000 Subject: [PATCH 2/2] Corrected output directory path for the TJP reports --- lib/taskjuggler/reports/Report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/taskjuggler/reports/Report.rb b/lib/taskjuggler/reports/Report.rb index 5e696984..532829da 100644 --- a/lib/taskjuggler/reports/Report.rb +++ b/lib/taskjuggler/reports/Report.rb @@ -297,7 +297,7 @@ def generateTJP if @name == '.' $stdout.write(@content.to_tjp) else - fileName = @name + fileName = absoluteFileName(@name) fileName += a('definitions').include?('project') ? '.tjp' : '.tji' File.open(fileName, 'w') { |f| f.write(@content.to_tjp) } end