|
@@ -362,7 +362,7 @@ public class ReservationManagementItemGrid : DynamicDataGrid<JobRequisitionItem>
|
|
|
jri.Style.CopyFrom(new ProductStyle());
|
|
|
}
|
|
|
|
|
|
- var qtyRequired = DimensionUtils.ConvertDimensions(jri.Dimensions, Math.Max(jri.Qty - jri.InStock, 0.0), (f,c) => Client.Query(f,c));
|
|
|
+ var qtyRequired = DimensionUtils.ConvertDimensions(jri.Dimensions, Math.Max(jri.Qty - jri.InStock - jri.OnOrder, 0.0), (f,c) => Client.Query(f,c));
|
|
|
|
|
|
var item = items.FirstOrDefault(x =>
|
|
|
x.Product.ID == jri.Product.ID
|
|
@@ -827,20 +827,25 @@ public class ReservationManagementItemGrid : DynamicDataGrid<JobRequisitionItem>
|
|
|
|
|
|
var window = new DynamicEditorForm()
|
|
|
{
|
|
|
- Title = "View Purchase Order Details"
|
|
|
+ Title = "View Purchase Order Details",
|
|
|
};
|
|
|
- window.Form.HighlightButtons = true;
|
|
|
window.Form.DisableOKIfUnchanged = true;
|
|
|
window.Form.SetLayoutType<VerticalDynamicEditorGridLayout>();
|
|
|
|
|
|
new SupplierPurchaseOrders().InitialiseEditorForm(window, new PurchaseOrder[] { _entity }, null, true);
|
|
|
-
|
|
|
- window.Form.AddButton(new Button()
|
|
|
+
|
|
|
+ var reportButton = new Button()
|
|
|
{
|
|
|
- Content = new System.Windows.Controls.Image() { Source = PRSDesktop.Resources.printer.AsBitmapImage(32,32) },
|
|
|
+ Content = new System.Windows.Controls.Image() { Source = PRSDesktop.Resources.printer.AsBitmapImage(32, 32) },
|
|
|
Command = new ActionCommand(() => ShowReports(id)),
|
|
|
Width = 40
|
|
|
- });
|
|
|
+ };
|
|
|
+
|
|
|
+ window.Form.AddButton(reportButton);
|
|
|
+ window.Form.OnChanged += (o, e) =>
|
|
|
+ {
|
|
|
+ reportButton.IsEnabled = false;
|
|
|
+ };
|
|
|
if (window.ShowDialog() == true)
|
|
|
{
|
|
|
Refresh(false, true);
|