Merge branch 'main' into new_indicator_international_journey

UnionInternationalCheminsdeFer · Mar 13, 2024 · 73dd49d · 73dd49d
2 parents 933c406 + 8e719d7
commit 73dd49d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/UIC Accounting File/accounting schema/accountingDataSchema.json b/UIC Accounting File/accounting schema/accountingDataSchema.json
@@ -418,4 +418,4 @@
 		}
 	},
 	"version": "1.0.0"
-}
+}
diff --git a/UIC Accounting File/src/accountingModelV1/AccountedAmount.java b/UIC Accounting File/src/accountingModelV1/AccountedAmount.java
@@ -1,4 +1,3 @@
-
 package accountingModelV1;
 
 import java.util.HashMap;

diff --git a/UIC Accounting File/src/accountingModelV1/Transaction.java b/UIC Accounting File/src/accountingModelV1/Transaction.java
@@ -1,4 +1,3 @@
-
 package accountingModelV1;
 
 import java.util.ArrayList;
@@ -30,7 +29,6 @@ public class Transaction {
 
     /**
      * UTC date time of the timestamp when the transaction was made
-     * (Required)
      * 
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssZZZ", timezone = "UTC")
@@ -98,7 +96,6 @@ public class Transaction {
 
     /**
      * UTC date time of the timestamp when the transaction was made
-     * (Required)
      * 
      */
     @JsonProperty("timestamp")
@@ -108,7 +105,6 @@ public Date getTimestamp() {
 
     /**
      * UTC date time of the timestamp when the transaction was made
-     * (Required)
      * 
      */
     @JsonProperty("timestamp")

diff --git a/UIC accounting viewer.edit/plugin.properties b/UIC accounting viewer.edit/plugin.properties
@@ -1062,7 +1062,7 @@ _UI_AccountedAmount_commission_feature = Commission
 _UI_AccountedAmount_accountsType_feature = Accounts Type
 _UI_AccountedAmount_currency_feature = Currency
 _UI_AccountedAmount_amount_feature = Amount
-_UI_AccountedAmount_rate_feature = Rate
+_UI_AccountedAmount_rate_feature = Commission Rate
 _UI_PaymentType_CURRENT_ACCOUNT_literal = Accounting via Current
 _UI_PaymentType_CURRENT_ACCOUNT_CLEARING_literal = Accounting via Current of Clearing
 _UI_PaymentType_BANK_ACCOUNT_literal = Bank Account

diff --git a/UIC accounting viewer.editor/UicAccountingViewer.product b/UIC accounting viewer.editor/UicAccountingViewer.product
@@ -2,7 +2,6 @@
 <?pde version="3.5"?>
 
 <product name="UIC Accounting Viewer" uid="AccountingViewerProduct" id="UIC_accounting_viewer.editor.UicAccountingViewer" application="UIC_accounting_viewer.editor.AccountingEditorAdvisorApplication" version="1.5" type="bundles" includeLaunchers="true" autoIncludeRequirements="true">
-
    <aboutInfo>
       <image path="/UIC accounting viewer.editor/icons/UIC GIF square_96.gif"/>
       <text>
@@ -18,8 +17,8 @@ The tool provides a viewer and editor for accounting data according to UIC IRS 3
    <launcherArgs>
       <programArgs>-consoleLog
       </programArgs>
-      <vmArgs>-Xms512m
--Xmx6500m
+      <vmArgs>-Xms512m
+-Xmx6500m
 -Dfile.encoding=UTF8
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-Original file line number
+Diff line change
@@ Expand Up / @@ -418,4 +418,4 @@ @@
     		}
     	},
     	"version": "1.0.0"
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		package accountingModelV1;

		import java.util.HashMap;
Expand Down