Browse Source

Added CostCentre Links to Activities and Invoice Lines

Frank van den Bos 2 years ago
parent
commit
dbe5015eec

+ 4 - 0
prs.classes/Entities/Activity/Activity.cs

@@ -33,6 +33,9 @@ namespace Comal.Classes
         [EditorSequence(8)]
         [CodeEditor(Editable = Editable.Enabled)]
         public string PayrollID { get; set; }
+        
+        [EditorSequence(9)]
+        public CostCentreLink CostCentre { get; set; }
 
         [NullEditor]
         [Obsolete("Replaced with IsLeave / IsDefault")]
@@ -47,6 +50,7 @@ namespace Comal.Classes
         {
             base.Init();
             TaxCode = new TaxCodeLink(() => this);
+            CostCentre = new CostCentreLink();
         }
     }
 }

+ 28 - 15
prs.classes/Entities/Invoice/InvoiceLine.cs

@@ -5,35 +5,46 @@ namespace Comal.Classes
     [UserTracking(typeof(Invoice))]
     public class InvoiceLine : Entity, IPersistent, IRemotable, ISequenceable, IOneToMany<Invoice>, ITaxable, ILicense<AccountsReceivableLicense>
     {
+        [NullEditor]
         [EntityRelationship(DeleteAction.Cascade)]
         public InvoiceLink InvoiceLink { get; set; }
 
-        public JobFinancialLink Financial { get; set; }
-
         [MemoEditor]
+        [EditorSequence(1)]
         public string Description { get; set; }
+        
+        [EditorSequence(2)]
+        [DoubleEditor(Summary = Summary.Sum)]
+        public double ExTax { get; set; }
 
-        [CurrencyEditor(Editable = Editable.Hidden)]
-        public double Amount { get; set; }
-
+        [EditorSequence(3)]
         public TaxCodeLink TaxCode { get; set; }
-
-        [NullEditor]
-        public long Sequence { get; set; }
-
+        
+        [EditorSequence(4)]
         [DoubleEditor(Summary = Summary.Sum)]
-        public double ExTax { get; set; }
+        public double IncTax { get; set; }
 
+        [EditorSequence(5)]
+        public JobFinancialLink Financial { get; set; }
+        
+        [EditorSequence(6)]
+        public CostCentreLink CostCentre { get; set; }
+
+        [EditorSequence(7)]
+        [CurrencyEditor(Editable = Editable.Hidden)]
+        public double Amount { get; set; }
+        
+        [EditorSequence(8)]
         [DoubleEditor(Editable = Editable.Hidden)]
         public double TaxRate { get; set; }
-
+        
+        [EditorSequence(9)]
         [DoubleEditor(Editable = Editable.Hidden, Summary = Summary.Sum)]
         public double Tax { get; set; }
 
-        [DoubleEditor(Summary = Summary.Sum)]
-        public double IncTax { get; set; }
-
-
+        [NullEditor]
+        public long Sequence { get; set; }
+        
         protected override void Init()
         {
             base.Init();
@@ -42,6 +53,8 @@ namespace Comal.Classes
             TaxCode = new TaxCodeLink(() => this);
 
             Financial = new JobFinancialLink();
+
+            CostCentre = new CostCentreLink();
         }
 
         static InvoiceLine()