ソースを参照

Added ABN and tidied up editor sequences

frogsoftware 1 年間 前
コミット
c717c771a6

+ 8 - 4
prs.classes/Entities/Customer/Customer.cs

@@ -61,19 +61,22 @@ namespace Comal.Classes
 
         [EditorSequence(2)]
         public string Name { get; set; }
-
+        
         [EditorSequence(3)]
+        public String ABN { get; set; }
+
+        [EditorSequence(4)]
+        [Caption("Delivery")]
         public Address Delivery { get; set; }
         
-        [EditorSequence(5)]
         [TextBoxEditor(Visible = Visible.Optional, Editable = Editable.Disabled)]
         [Obsolete("Replaced with DefaultContact", false)]
         public string Contact { get; set; }
         
-        [EditorSequence(6)]
+        [EditorSequence(5)]
         public ContactLink DefaultContact { get; set; }
 
-        [EditorSequence(7)]
+        [EditorSequence(6)]
         [TextBoxEditor]
         public string Email { get; set; }
 
@@ -82,6 +85,7 @@ namespace Comal.Classes
         public AccountLink Account { get; set; }
 
         [EditorSequence("Accounts", 2)]
+        [Caption("Address")]
         public Address Postal { get; set; }
 
         [EditorSequence("Accounts", 3)]

+ 13 - 4
prs.classes/Entities/Supplier/Supplier.cs

@@ -56,16 +56,27 @@ namespace Comal.Classes
     public class Supplier : Entity, IPersistent, IRemotable, ILicense<CoreLicense>, IExportable, IImportable, IMergeable
     {
         [UniqueCodeEditor(Visible = Visible.Default, Editable = Editable.Enabled)]
+        [EditorSequence(1)]
         public string Code { get; set; }
 
         [TextBoxEditor]
+        [EditorSequence(2)]
         public string Name { get; set; }
+        
+        [EditorSequence(3)]
+        public String ABN { get; set; }
 
         [TextBoxEditor]
+        [EditorSequence(4)]
         public string Email { get; set; } = "";
+        
+        [EditorSequence(5)]
+        public StockLocationLink DefaultLocation { get; set; }
 
+        [EditorSequence("Delivery",1)]
         public Address Delivery { get; set; }
-
+        
+        [EditorSequence("Accounts",2)]
         public Address Postal { get; set; }
 
         [CurrencyEditor(Editable = Editable.Hidden, Summary = Summary.Sum)]
@@ -83,9 +94,7 @@ namespace Comal.Classes
         [CurrencyEditor(Editable = Editable.Hidden, Summary = Summary.Sum)]
         [Formula(typeof(SupplierBalance))]
         public double Balance { get; set; }
-
-        public StockLocationLink DefaultLocation { get; set; }
-
+        
         public override string ToString()
         {
             return string.Format("{0}: {1}", Code, Name);