Odstranjenn projekt

dodan vnos pozicije fakture
This commit is contained in:
David Štaleker
2023-05-13 16:42:01 +02:00
parent 03b92525d7
commit a45fe73754
76 changed files with 407 additions and 37538 deletions

View File

@@ -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;
}