admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-03-17 19:19:49 +00:00
parent af5f1c90f3
commit f098daad24
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -556,6 +556,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "TaxCode", FieldKey = "Items.PurchaseTaxCodeId" }); l.Add(new FormField { TKey = "TaxCode", FieldKey = "Items.PurchaseTaxCodeId" });
l.Add(new FormField { TKey = "PurchaseOrderItemVendorPartNumber", FieldKey = "Items.VendorPartNumber" }); l.Add(new FormField { TKey = "PurchaseOrderItemVendorPartNumber", FieldKey = "Items.VendorPartNumber" });
l.Add(new FormField { TKey = "PurchaseOrderItemSerialNumbers", FieldKey = "Items.Serials" }); 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 = "PurchaseOrderCustom1", FieldKey = "PurchaseOrderCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "PurchaseOrderCustom2", FieldKey = "PurchaseOrderCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom2", FieldKey = "PurchaseOrderCustom2", IsCustomField = true });

10
server/AyaNova/biz/PurchaseOrderBiz.cs
View File

@@ -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(); item.WarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == item.PartWarehouseId).Select(x => x.Name).FirstOrDefaultAsync();
if (item.WorkorderItemPartRequestId != null) if (item.WorkorderItemPartRequestId != null)
{ {
@@ -192,13 +194,13 @@ namespace AyaNova.Biz
if (tax != null) if (tax != null)
{ {
//Tax A is always just tax A percent times net... //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... //Tax B on the other hand could be simple or tax on tax...
if (!tax.TaxOnTax) if (!tax.TaxOnTax)
dTaxB = (tax.TaxBPct/100) * dNet;//simple dTaxB = (tax.TaxBPct / 100) * dNet;//simple
else 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 //set line total and taxes display values
item.TaxAViz = dTaxA; item.TaxAViz = dTaxA;

2
server/AyaNova/models/PurchaseOrderItem.cs
View File

@@ -39,6 +39,8 @@ namespace AyaNova.Models
[NotMapped] [NotMapped]
public string PartViz { get; set; } public string PartViz { get; set; }
[NotMapped] [NotMapped]
public string PartNameViz { get; set; }
[NotMapped]
public string WarehouseViz { get; set; } public string WarehouseViz { get; set; }
[NotMapped] [NotMapped]
public string PartRequestedByViz { get; set; }//DisplayRequestUser public string PartRequestedByViz { get; set; }//DisplayRequestUser

1
server/AyaNova/resource/de.json
View File

@@ -776,7 +776,6 @@
"PurchaseOrderReceiptItemWorkOrderNumber": "Arbeitsauftragsnummer", "PurchaseOrderReceiptItemWorkOrderNumber": "Arbeitsauftragsnummer",
"PurchaseOrderEdit": "Bestellung geändert", "PurchaseOrderEdit": "Bestellung geändert",
"ReceiveAll": "Erhalte alle", "ReceiveAll": "Erhalte alle",
"Receive": "Erhalten",
"RateAccountNumber": "Kontonummer", "RateAccountNumber": "Kontonummer",
"RateCharge": "Einzelhandelsgebühr", "RateCharge": "Einzelhandelsgebühr",
"RateCustomerGroupID": "Kundengruppe", "RateCustomerGroupID": "Kundengruppe",

1
server/AyaNova/resource/en.json
View File

@@ -776,7 +776,6 @@
"PurchaseOrderReceiptItemWorkOrderNumber": "WorkOrder #", "PurchaseOrderReceiptItemWorkOrderNumber": "WorkOrder #",
"PurchaseOrderEdit": "Purchase order edit", "PurchaseOrderEdit": "Purchase order edit",
"ReceiveAll": "Receive all", "ReceiveAll": "Receive all",
"Receive": "Receive",
"RateAccountNumber": "Account Number", "RateAccountNumber": "Account Number",
"RateCharge": "Retail Charge", "RateCharge": "Retail Charge",
"RateCustomerGroupID": "Customer Group", "RateCustomerGroupID": "Customer Group",

1
server/AyaNova/resource/es.json
View File

@@ -775,7 +775,6 @@
"PurchaseOrderReceiptItemWorkOrderNumber": "Núm. pedido", "PurchaseOrderReceiptItemWorkOrderNumber": "Núm. pedido",
"PurchaseOrderEdit": "Orden de compra editar", "PurchaseOrderEdit": "Orden de compra editar",
"ReceiveAll": "Recibe todo", "ReceiveAll": "Recibe todo",
"Receive": "Recibir",
"RateAccountNumber": "Número de cuenta", "RateAccountNumber": "Número de cuenta",
"RateCharge": "Cargo minorista", "RateCharge": "Cargo minorista",
"RateCustomerGroupID": "Grupo de clientes", "RateCustomerGroupID": "Grupo de clientes",

1
server/AyaNova/resource/fr.json
View File

@@ -776,7 +776,6 @@
"PurchaseOrderReceiptItemWorkOrderNumber": "Bon de travail n° ", "PurchaseOrderReceiptItemWorkOrderNumber": "Bon de travail n° ",
"PurchaseOrderEdit": "Bon de commande Modifier", "PurchaseOrderEdit": "Bon de commande Modifier",
"ReceiveAll": "Recevoir tout", "ReceiveAll": "Recevoir tout",
"Receive": "Recevoir",
"RateAccountNumber": "Numéro de compte", "RateAccountNumber": "Numéro de compte",
"RateCharge": "Prix de détail", "RateCharge": "Prix de détail",
"RateCustomerGroupID": "Groupe de clients", "RateCustomerGroupID": "Groupe de clients",