Skip to content
This repository was archived by the owner on Dec 1, 2025. It is now read-only.

Commit 34c8edb

Browse files
TradeControlTradeControl
committed
3.34.7 tax totals
1 parent bd52781 commit 34c8edb

22 files changed

+488
-70
lines changed

‎changelog.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ Integrates setup templates into the [Node Configuration](https://tradecontrol.gi
3838

3939
- [x] [Cash.vwBalanceSheetAccounts](src/tcNodeDb/Cash/Views/vwBalanceSheetAccounts.sql) - fix negative m/e balances zeroised
4040
- [x] [Org.vwStatement](src/tcNodeDb/Org/Views/vwStatement.sql) - remove unposted payments
41+
4142
### 3.34.6
4243

4344
Full script for the [Asp.Net Core interface](https://github.com/tradecontrol/tradecontrol.web). It has no impact on the 365 implementation since it uses the same algorithms.
4445

46+
### 3.34.7
4547

46-
48+
- [x] [App.proc_TemplateCompanyHMRC2021](src/tcNodeDb/App/Stored%20Procedures/proc_TemplateCompanyHMRC2021.sql) - initialisation template that maps all the codes used by the HRMC Accounts and Tax Return portal
49+
- [x] [Cash.vwTaxLossesCarriedForward](src/tcNodeDb/Cash/Views/vwTaxLossesCarriedForward.sql) - calculates available losses that can be carried forward on a tax return
50+
- [x] [Cash.vwProfitAndLossData](src/tcNodeDb/Cash/Views/vwProfitAndLossData.sql) - add CashTypeCode for accessing Corporation Tax totals
51+

‎src/installation/setup/setup.exe‎

0 Bytes
Binary file not shown.

‎src/installation/setup/tcNodeConfigSetup.msi‎

3.5 KB
Binary file not shown.

‎src/installation/tcNodeConfig.zip‎

3.42 KB
Binary file not shown.

‎src/tcNode/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ Trade Control by Trade Control Ltd is licensed under GNU General Public License
2525

2626
[assembly: Guid("e0b55ebe-7f5e-4703-b983-a43bb9e3b8d7")]
2727

28-
[assembly: AssemblyVersion("3.34.6.0")]
29-
[assembly: AssemblyFileVersion("3.34.6.0")]
28+
[assembly: AssemblyVersion("3.34.7.0")]
29+
[assembly: AssemblyFileVersion("3.34.7.0")]

‎src/tcNode/Properties/Resources.Designer.cs‎

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/tcNode/Properties/Resources.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,7 @@
232232
<data name="tc_upgrade_3_34_6" type="System.Resources.ResXFileRef, System.Windows.Forms">
233233
<value>..\scripts\tc_upgrade_3_34_6.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
234234
</data>
235+
<data name="tc_upgrade_3_34_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
236+
<value>..\scripts\tc_upgrade_3_34_7.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
237+
</data>
235238
</root>

‎src/tcNode/Properties/Settings.Designer.cs‎

Lines changed: 2 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/tcNode/Properties/Settings.settings‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,14 @@
1414
<Setting Name="AuthenticationMode" Type="System.Int32" Scope="User">
1515
<Value Profile="(Default)">0</Value>
1616
</Setting>
17-
<Setting Name="tcNodeConnectionString1" Type="(Connection string)" Scope="Application">
17+
<Setting Name="tcNodeConnectionString" Type="(Connection string)" Scope="Application">
1818
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
1919
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
2020
&lt;ConnectionString&gt;Data Source=IAM;Initial Catalog=tcNode;Integrated Security=True&lt;/ConnectionString&gt;
2121
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
2222
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
2323
<Value Profile="(Default)">Data Source=IAM;Initial Catalog=tcNode;Integrated Security=True</Value>
2424
</Setting>
25-
<Setting Name="tcNodeConnectionString" Type="(Connection string)" Scope="Application">
26-
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
27-
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
28-
&lt;ConnectionString&gt;Data Source=IAM;Initial Catalog=tcTHEBUS;Integrated Security=True&lt;/ConnectionString&gt;
29-
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
30-
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
31-
<Value Profile="(Default)">Data Source=IAM;Initial Catalog=tcTHEBUS;Integrated Security=True</Value>
32-
</Setting>
3325
<Setting Name="SqlScripts" Type="System.Collections.Specialized.StringCollection" Scope="User">
3426
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
3527
&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
@@ -68,6 +60,7 @@
6860
&lt;string&gt;tc_upgrade_3_34_4&lt;/string&gt;
6961
&lt;string&gt;tc_upgrade_3_34_5&lt;/string&gt;
7062
&lt;string&gt;tc_upgrade_3_34_6&lt;/string&gt;
63+
&lt;string&gt;tc_upgrade_3_34_7&lt;/string&gt;
7164
&lt;/ArrayOfString&gt;</Value>
7265
</Setting>
7366
</Settings>

‎src/tcNode/TCNodeConfig.cs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -654,42 +654,42 @@ public void ConfigureNode(string accountCode,
654654
command.Parameters.Add(p5);
655655

656656
SqlParameter p6 = command.CreateParameter();
657-
p5.DbType = DbType.String;
658-
p5.ParameterName = "@UserEmailAddress";
659-
p5.Value = userEmailAddress;
660-
command.Parameters.Add(p5);
661-
662-
663-
SqlParameter p7 = command.CreateParameter();
664657
p6.DbType = DbType.String;
665-
p6.ParameterName = "@PhoneNumber";
666-
p6.Value = phoneNumber;
658+
p6.ParameterName = "@UserEmailAddress";
659+
p6.Value = userEmailAddress;
667660
command.Parameters.Add(p6);
668661

669-
SqlParameter p8 = command.CreateParameter();
662+
663+
SqlParameter p7 = command.CreateParameter();
670664
p7.DbType = DbType.String;
671-
p7.ParameterName = "@CompanyNumber";
672-
p7.Value = companyNumber;
665+
p7.ParameterName = "@PhoneNumber";
666+
p7.Value = phoneNumber;
673667
command.Parameters.Add(p7);
674668

675-
SqlParameter p9 = command.CreateParameter();
669+
SqlParameter p8 = command.CreateParameter();
676670
p8.DbType = DbType.String;
677-
p8.ParameterName = "@VatNumber";
678-
p8.Value = vatNumber;
671+
p8.ParameterName = "@CompanyNumber";
672+
p8.Value = companyNumber;
679673
command.Parameters.Add(p8);
680674

681-
SqlParameter p10 = command.CreateParameter();
675+
SqlParameter p9 = command.CreateParameter();
682676
p9.DbType = DbType.String;
683-
p9.ParameterName = "@CalendarCode";
684-
p9.Value = calendarCode;
677+
p9.ParameterName = "@VatNumber";
678+
p9.Value = vatNumber;
685679
command.Parameters.Add(p9);
686680

687-
SqlParameter p11 = command.CreateParameter();
681+
SqlParameter p10 = command.CreateParameter();
688682
p10.DbType = DbType.String;
689-
p10.ParameterName = "@UnitOfCharge";
690-
p10.Value = unitOfCharge;
683+
p10.ParameterName = "@CalendarCode";
684+
p10.Value = calendarCode;
691685
command.Parameters.Add(p10);
692686

687+
SqlParameter p11 = command.CreateParameter();
688+
p11.DbType = DbType.String;
689+
p11.ParameterName = "@UnitOfCharge";
690+
p11.Value = unitOfCharge;
691+
command.Parameters.Add(p11);
692+
693693
command.ExecuteNonQuery();
694694

695695
}
@@ -1160,7 +1160,7 @@ string ParseString(string message)
11601160
stream.WriteLine(Properties.Resources.ErrorLogHeader);
11611161

11621162
innerException = e.InnerException != null ? e.InnerException.Message : string.Empty;
1163-
line = $"{DateTime.Now.ToString()},{ParseString(e.Message)},{e.Source},{e.TargetSite.Name.ToString()},{ParseString(innerException)}";
1163+
line = $"{DateTime.Now},{ParseString(e.Message)},{e.Source},{e.TargetSite.Name},{ParseString(innerException)}";
11641164
stream.WriteLine(line);
11651165
}
11661166

@@ -1245,7 +1245,7 @@ public SqlScript(string script) : base()
12451245
}
12461246
}
12471247

1248-
if (s.Trim() != string.Empty)
1248+
if (string.IsNullOrEmpty(s.Trim()))
12491249
Lines.Add(s);
12501250
}
12511251
}

0 commit comments

Comments
 (0)