Odstranjenn projekt
dodan vnos pozicije fakture
This commit is contained in:
@@ -97,18 +97,19 @@ namespace EveryThing.Pages.CodeTableItems
|
||||
}
|
||||
else
|
||||
{
|
||||
var projectPartItem = _context.ProjectPartItems
|
||||
.OrderByDescending(x => x.DateModified)
|
||||
.ThenByDescending(x => x.IdProjectPartItem)
|
||||
.FirstOrDefault(x => x.IdItemFk == item.IdItem);
|
||||
//TODO ?
|
||||
//var projectPartItem = _context.ProjectPartItems
|
||||
// .OrderByDescending(x => x.DateModified)
|
||||
// .ThenByDescending(x => x.IdProjectPartItem)
|
||||
// .FirstOrDefault(x => x.IdItemFk == item.IdItem);
|
||||
|
||||
if (projectPartItem != null)
|
||||
{
|
||||
materialPrice = projectPartItem.MaterialPrice;
|
||||
workPrice = projectPartItem.WorkPrice;
|
||||
sellingPrice = projectPartItem.SellingPrice;
|
||||
differenceInPricePercentage = projectPartItem.DifferenceInPricePercentage;
|
||||
}
|
||||
//if (projectPartItem != null)
|
||||
//{
|
||||
// materialPrice = projectPartItem.MaterialPrice;
|
||||
// workPrice = projectPartItem.WorkPrice;
|
||||
// sellingPrice = projectPartItem.SellingPrice;
|
||||
// differenceInPricePercentage = projectPartItem.DifferenceInPricePercentage;
|
||||
//}
|
||||
}
|
||||
|
||||
|
||||
@@ -136,8 +137,6 @@ namespace EveryThing.Pages.CodeTableItems
|
||||
|
||||
CodeTableItem item = _context.CodeTableItems
|
||||
.Where(x => x.IdCompanyFk == user.IdCompanyFk)
|
||||
.Include(x => x.ItemProjectPartItem)
|
||||
.Include(x => x.ItemProjectPartItemMaterial)
|
||||
.Include(x => x.InvoiceItem)
|
||||
.FirstOrDefault(x => x.IdItem == idCodeTableItem);
|
||||
|
||||
@@ -148,10 +147,7 @@ namespace EveryThing.Pages.CodeTableItems
|
||||
}
|
||||
else
|
||||
{
|
||||
itemInUse = item.ItemProjectPartItem.Count > 0 || item.ItemProjectPartItemMaterial.Count > 0 || item.InvoiceItem.Count > 0;
|
||||
//Cene se json zacikla neki IDK.
|
||||
item.ItemProjectPartItem = null;
|
||||
item.ItemProjectPartItemMaterial = null;
|
||||
itemInUse = item.InvoiceItem.Count > 0;
|
||||
item.InvoiceItem = null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user