This commit is contained in:
@@ -556,6 +556,7 @@ namespace AyaNova.Biz
|
||||
l.Add(new FormField { TKey = "TaxCode", FieldKey = "Items.PurchaseTaxCodeId" });
|
||||
l.Add(new FormField { TKey = "PurchaseOrderItemVendorPartNumber", FieldKey = "Items.VendorPartNumber" });
|
||||
l.Add(new FormField { TKey = "PurchaseOrderItemSerialNumbers", FieldKey = "Items.Serials" });
|
||||
l.Add(new FormField { TKey = "PartName", FieldKey = "Items.PartName" });
|
||||
|
||||
l.Add(new FormField { TKey = "PurchaseOrderCustom1", FieldKey = "PurchaseOrderCustom1", IsCustomField = true });
|
||||
l.Add(new FormField { TKey = "PurchaseOrderCustom2", FieldKey = "PurchaseOrderCustom2", IsCustomField = true });
|
||||
|
||||
@@ -157,7 +157,9 @@ namespace AyaNova.Biz
|
||||
{
|
||||
|
||||
|
||||
item.PartViz = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => x.PartNumber).FirstOrDefaultAsync();
|
||||
var partInfo = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => new { partViz = x.PartNumber, partNameViz = x.Name }).FirstOrDefaultAsync();
|
||||
item.PartViz = partInfo.partViz;
|
||||
item.PartNameViz = partInfo.partNameViz;
|
||||
item.WarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == item.PartWarehouseId).Select(x => x.Name).FirstOrDefaultAsync();
|
||||
if (item.WorkorderItemPartRequestId != null)
|
||||
{
|
||||
@@ -192,13 +194,13 @@ namespace AyaNova.Biz
|
||||
if (tax != null)
|
||||
{
|
||||
//Tax A is always just tax A percent times net...
|
||||
dTaxA = (tax.TaxAPct/100) * dNet;
|
||||
dTaxA = (tax.TaxAPct / 100) * dNet;
|
||||
|
||||
//Tax B on the other hand could be simple or tax on tax...
|
||||
if (!tax.TaxOnTax)
|
||||
dTaxB = (tax.TaxBPct/100) * dNet;//simple
|
||||
dTaxB = (tax.TaxBPct / 100) * dNet;//simple
|
||||
else
|
||||
dTaxB = (dNet + dTaxA) * (tax.TaxBPct/100);//tax on tax
|
||||
dTaxB = (dNet + dTaxA) * (tax.TaxBPct / 100);//tax on tax
|
||||
}
|
||||
//set line total and taxes display values
|
||||
item.TaxAViz = dTaxA;
|
||||
|
||||
@@ -39,6 +39,8 @@ namespace AyaNova.Models
|
||||
[NotMapped]
|
||||
public string PartViz { get; set; }
|
||||
[NotMapped]
|
||||
public string PartNameViz { get; set; }
|
||||
[NotMapped]
|
||||
public string WarehouseViz { get; set; }
|
||||
[NotMapped]
|
||||
public string PartRequestedByViz { get; set; }//DisplayRequestUser
|
||||
|
||||
@@ -776,7 +776,6 @@
|
||||
"PurchaseOrderReceiptItemWorkOrderNumber": "Arbeitsauftragsnummer",
|
||||
"PurchaseOrderEdit": "Bestellung geändert",
|
||||
"ReceiveAll": "Erhalte alle",
|
||||
"Receive": "Erhalten",
|
||||
"RateAccountNumber": "Kontonummer",
|
||||
"RateCharge": "Einzelhandelsgebühr",
|
||||
"RateCustomerGroupID": "Kundengruppe",
|
||||
|
||||
@@ -776,7 +776,6 @@
|
||||
"PurchaseOrderReceiptItemWorkOrderNumber": "WorkOrder #",
|
||||
"PurchaseOrderEdit": "Purchase order edit",
|
||||
"ReceiveAll": "Receive all",
|
||||
"Receive": "Receive",
|
||||
"RateAccountNumber": "Account Number",
|
||||
"RateCharge": "Retail Charge",
|
||||
"RateCustomerGroupID": "Customer Group",
|
||||
|
||||
@@ -775,7 +775,6 @@
|
||||
"PurchaseOrderReceiptItemWorkOrderNumber": "Núm. pedido",
|
||||
"PurchaseOrderEdit": "Orden de compra editar",
|
||||
"ReceiveAll": "Recibe todo",
|
||||
"Receive": "Recibir",
|
||||
"RateAccountNumber": "Número de cuenta",
|
||||
"RateCharge": "Cargo minorista",
|
||||
"RateCustomerGroupID": "Grupo de clientes",
|
||||
|
||||
@@ -776,7 +776,6 @@
|
||||
"PurchaseOrderReceiptItemWorkOrderNumber": "Bon de travail n° ",
|
||||
"PurchaseOrderEdit": "Bon de commande Modifier",
|
||||
"ReceiveAll": "Recevoir tout",
|
||||
"Receive": "Recevoir",
|
||||
"RateAccountNumber": "Numéro de compte",
|
||||
"RateCharge": "Prix de détail",
|
||||
"RateCustomerGroupID": "Groupe de clients",
|
||||
|
||||
Reference in New Issue
Block a user