Jelajahi Sumber

Job Summary Requsition Item Total now excludes cancelled items
Product Styles are now mergeable
Fixed crashing error in Customer Receipts
Added BillDocumentStore to autogenerate thumbnails

frogsoftware 1 tahun lalu
induk
melakukan
9f870121bc

+ 2 - 1
prs.classes/Entities/Job/Materials/JobMaterials.cs

@@ -43,7 +43,8 @@ namespace Comal.Classes
             };
         
         public override Filter<JobRequisitionItem> Filter =>
-            new Filter<JobRequisitionItem>(x => x.Requisition.Approved).IsNotEqualTo(DateTime.MinValue);
+            new Filter<JobRequisitionItem>(x => x.Requisition.Approved).IsNotEqualTo(DateTime.MinValue)
+                .And(x=>x.Status).IsNotEqualTo(JobRequisitionItemStatus.Cancelled);
 
     }
     

+ 3 - 1
prs.classes/Entities/Product/Attribute/ProductStyle.cs

@@ -3,7 +3,7 @@
 namespace Comal.Classes
 {
     [UserTracking(typeof(Product))]
-    public class ProductStyle : Entity, IRemotable, IPersistent, IProductStyle, ILicense<ProductManagementLicense>
+    public class ProductStyle : Entity, IRemotable, IPersistent, IProductStyle, ILicense<ProductManagementLicense>, IMergeable
     {
         [EditorSequence(1)]
         [UniqueCodeEditor(Visible = Visible.Default, Editable = Editable.Enabled)]
@@ -16,5 +16,7 @@ namespace Comal.Classes
         public ProductLink ManufacturingTreatmentProduct { get; set; }
         
         public ProductLink StockTreatmentProduct { get; set; }
+
+        public override string ToString() => $"{Code}: {Description}";
     }
 }

+ 2 - 2
prs.desktop/Panels/Customers/CustomerReceipts.cs

@@ -42,8 +42,6 @@ public class CustomerReceipts : DynamicDataGrid<Receipt>, IPanel<Receipt>
     {
         //AddButton("Show All", PRSDesktop.Resources.view.AsBitmapImage(), ToggleView);
         OnBeforeSave += BeforeSave;
-
-        _settings = new UserConfiguration<ReceiptGridSettings>().Load();
     }
 
     protected override void DoReconfigure(FluentList<DynamicGridOption> options)
@@ -55,6 +53,8 @@ public class CustomerReceipts : DynamicDataGrid<Receipt>, IPanel<Receipt>
     protected override void Init()
     {
         base.Init();
+        
+        _settings = new UserConfiguration<ReceiptGridSettings>().Load();
 
         FilterComponent.SetSettings(_settings.Filters, refresh: false);
         FilterComponent.OnFiltersSelected += FilterComponent_OnFilterSelected;