From b65a47886b424950a45bc696d7d51b245e3bf4bd Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 11 Jul 2022 21:21:12 +0000 Subject: [PATCH] --- AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs | 330 ++++++++---------- AyaNovaQBI/InvoiceTemplateBuilder.cs | 2 +- AyaNovaQBI/WorkOrderItemUnit.cs | 1 + AyaNovaQBI/util.cs | 29 +- 4 files changed, 170 insertions(+), 192 deletions(-) diff --git a/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs b/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs index 81d4766..1cc2101 100644 --- a/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs +++ b/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs @@ -49,15 +49,6 @@ this.edLoanItem = new System.Windows.Forms.TextBox(); this.tbManager = new System.Windows.Forms.MenuStrip(); this.insertheaderFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertitemSectionFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertunitFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertServiceFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertTravelFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertOutsideServiceFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertMiscExpenseFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertLoanItemFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.setToDefaultDetailedFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.setToDefaultBriefFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customerContactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customerReferenceNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.internalReferenceNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -67,16 +58,18 @@ this.workOrderServiceDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderStatusNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderSummaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertitemSectionFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderItemSummaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderItemServiceNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderItemTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderItemRequestDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.workOrderItemStatusToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertunitFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.unitNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.unitSerialNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.unitMeterReadingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.manufacturerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.unitModelNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.unitModelNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertServiceFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startDateAndTimeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.stopDateAndTimeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.quantityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -84,6 +77,7 @@ this.technicianToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.detailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.noChargeQuantityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertTravelFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startDateAndTimeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.stopDateAndTimeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.quantityToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -92,20 +86,24 @@ this.detailsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.distanceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.noChargeQuantityToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.insertOutsideServiceFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.repairPriceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.shippingChargesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dateSentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dateReturnedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertMiscExpenseFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.chargesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.summaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.technicianToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.insertLoanItemFieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.itemLoanedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.chargesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.loanedDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.returnedDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.unitMeterReadingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.setToDefaultDetailedFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.setToDefaultBriefFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tbManager.SuspendLayout(); this.SuspendLayout(); // @@ -364,126 +362,10 @@ this.insertheaderFieldToolStripMenuItem.Text = "Insert &header field"; this.insertheaderFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); // - // insertitemSectionFieldToolStripMenuItem - // - this.insertitemSectionFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.workOrderItemSummaryToolStripMenuItem, - this.workOrderItemServiceNotesToolStripMenuItem, - this.workOrderItemTypeToolStripMenuItem, - this.workOrderItemRequestDateToolStripMenuItem, - this.workOrderItemStatusToolStripMenuItem}); - this.insertitemSectionFieldToolStripMenuItem.Name = "insertitemSectionFieldToolStripMenuItem"; - this.insertitemSectionFieldToolStripMenuItem.Size = new System.Drawing.Size(142, 20); - this.insertitemSectionFieldToolStripMenuItem.Tag = "footer"; - this.insertitemSectionFieldToolStripMenuItem.Text = "Insert &item section field"; - this.insertitemSectionFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // insertunitFieldToolStripMenuItem - // - this.insertunitFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.unitNameToolStripMenuItem, - this.unitSerialNumberToolStripMenuItem, - this.unitMeterReadingToolStripMenuItem, - this.manufacturerToolStripMenuItem, - this.unitModelNameToolStripMenuItem, - this.unitModelNumberToolStripMenuItem}); - this.insertunitFieldToolStripMenuItem.Name = "insertunitFieldToolStripMenuItem"; - this.insertunitFieldToolStripMenuItem.Size = new System.Drawing.Size(98, 20); - this.insertunitFieldToolStripMenuItem.Tag = "unit"; - this.insertunitFieldToolStripMenuItem.Text = "Insert &unit field"; - this.insertunitFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // insertServiceFieldToolStripMenuItem - // - this.insertServiceFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.startDateAndTimeToolStripMenuItem, - this.stopDateAndTimeToolStripMenuItem, - this.quantityToolStripMenuItem, - this.rateNameToolStripMenuItem, - this.technicianToolStripMenuItem, - this.detailsToolStripMenuItem, - this.noChargeQuantityToolStripMenuItem}); - this.insertServiceFieldToolStripMenuItem.Name = "insertServiceFieldToolStripMenuItem"; - this.insertServiceFieldToolStripMenuItem.Size = new System.Drawing.Size(113, 20); - this.insertServiceFieldToolStripMenuItem.Tag = "service"; - this.insertServiceFieldToolStripMenuItem.Text = "Insert service field"; - this.insertServiceFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // insertTravelFieldToolStripMenuItem - // - this.insertTravelFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.startDateAndTimeToolStripMenuItem1, - this.stopDateAndTimeToolStripMenuItem1, - this.quantityToolStripMenuItem1, - this.travelRateNameToolStripMenuItem, - this.technicianToolStripMenuItem1, - this.detailsToolStripMenuItem1, - this.distanceToolStripMenuItem, - this.noChargeQuantityToolStripMenuItem1}); - this.insertTravelFieldToolStripMenuItem.Name = "insertTravelFieldToolStripMenuItem"; - this.insertTravelFieldToolStripMenuItem.Size = new System.Drawing.Size(106, 20); - this.insertTravelFieldToolStripMenuItem.Tag = "travel"; - this.insertTravelFieldToolStripMenuItem.Text = "Insert travel field"; - this.insertTravelFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // insertOutsideServiceFieldToolStripMenuItem - // - this.insertOutsideServiceFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.repairPriceToolStripMenuItem, - this.shippingChargesToolStripMenuItem, - this.dateSentToolStripMenuItem, - this.dateReturnedToolStripMenuItem, - this.notesToolStripMenuItem}); - this.insertOutsideServiceFieldToolStripMenuItem.Name = "insertOutsideServiceFieldToolStripMenuItem"; - this.insertOutsideServiceFieldToolStripMenuItem.Size = new System.Drawing.Size(155, 20); - this.insertOutsideServiceFieldToolStripMenuItem.Tag = "outsideservice"; - this.insertOutsideServiceFieldToolStripMenuItem.Text = "Insert outside service field"; - this.insertOutsideServiceFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // insertMiscExpenseFieldToolStripMenuItem - // - this.insertMiscExpenseFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.chargesToolStripMenuItem, - this.summaryToolStripMenuItem, - this.technicianToolStripMenuItem2}); - this.insertMiscExpenseFieldToolStripMenuItem.Name = "insertMiscExpenseFieldToolStripMenuItem"; - this.insertMiscExpenseFieldToolStripMenuItem.Size = new System.Drawing.Size(151, 20); - this.insertMiscExpenseFieldToolStripMenuItem.Tag = "expense"; - this.insertMiscExpenseFieldToolStripMenuItem.Text = "Insert misc. expense field"; - this.insertMiscExpenseFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // insertLoanItemFieldToolStripMenuItem - // - this.insertLoanItemFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.itemLoanedToolStripMenuItem, - this.chargesToolStripMenuItem1, - this.loanedDateToolStripMenuItem, - this.returnedDateToolStripMenuItem, - this.notesToolStripMenuItem1}); - this.insertLoanItemFieldToolStripMenuItem.Name = "insertLoanItemFieldToolStripMenuItem"; - this.insertLoanItemFieldToolStripMenuItem.Size = new System.Drawing.Size(127, 20); - this.insertLoanItemFieldToolStripMenuItem.Tag = "loaner"; - this.insertLoanItemFieldToolStripMenuItem.Text = "Insert loan item field"; - this.insertLoanItemFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); - // - // setToDefaultDetailedFormatToolStripMenuItem - // - this.setToDefaultDetailedFormatToolStripMenuItem.Name = "setToDefaultDetailedFormatToolStripMenuItem"; - this.setToDefaultDetailedFormatToolStripMenuItem.Size = new System.Drawing.Size(173, 20); - this.setToDefaultDetailedFormatToolStripMenuItem.Tag = "SetDetailed"; - this.setToDefaultDetailedFormatToolStripMenuItem.Text = "Set to default detailed format"; - // - // setToDefaultBriefFormatToolStripMenuItem - // - this.setToDefaultBriefFormatToolStripMenuItem.Name = "setToDefaultBriefFormatToolStripMenuItem"; - this.setToDefaultBriefFormatToolStripMenuItem.Size = new System.Drawing.Size(155, 20); - this.setToDefaultBriefFormatToolStripMenuItem.Tag = "SetBrief"; - this.setToDefaultBriefFormatToolStripMenuItem.Text = "Set to default brief format"; - // // customerContactToolStripMenuItem // this.customerContactToolStripMenuItem.Name = "customerContactToolStripMenuItem"; - this.customerContactToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.customerContactToolStripMenuItem.Size = new System.Drawing.Size(223, 22); this.customerContactToolStripMenuItem.Tag = "~CONTACT~"; this.customerContactToolStripMenuItem.Text = "Customer contact"; // @@ -543,6 +425,20 @@ this.workOrderSummaryToolStripMenuItem.Tag = "~DESC~"; this.workOrderSummaryToolStripMenuItem.Text = "Work order summary"; // + // insertitemSectionFieldToolStripMenuItem + // + this.insertitemSectionFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.workOrderItemSummaryToolStripMenuItem, + this.workOrderItemServiceNotesToolStripMenuItem, + this.workOrderItemTypeToolStripMenuItem, + this.workOrderItemRequestDateToolStripMenuItem, + this.workOrderItemStatusToolStripMenuItem}); + this.insertitemSectionFieldToolStripMenuItem.Name = "insertitemSectionFieldToolStripMenuItem"; + this.insertitemSectionFieldToolStripMenuItem.Size = new System.Drawing.Size(142, 20); + this.insertitemSectionFieldToolStripMenuItem.Tag = "footer"; + this.insertitemSectionFieldToolStripMenuItem.Text = "Insert &item section field"; + this.insertitemSectionFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); + // // workOrderItemSummaryToolStripMenuItem // this.workOrderItemSummaryToolStripMenuItem.Name = "workOrderItemSummaryToolStripMenuItem"; @@ -578,19 +474,32 @@ this.workOrderItemStatusToolStripMenuItem.Tag = "~ITEM_STATUS~"; this.workOrderItemStatusToolStripMenuItem.Text = "Work order item status"; // + // insertunitFieldToolStripMenuItem + // + this.insertunitFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.unitNameToolStripMenuItem, + this.unitMeterReadingToolStripMenuItem, + this.manufacturerToolStripMenuItem, + this.unitModelNameToolStripMenuItem}); + this.insertunitFieldToolStripMenuItem.Name = "insertunitFieldToolStripMenuItem"; + this.insertunitFieldToolStripMenuItem.Size = new System.Drawing.Size(98, 20); + this.insertunitFieldToolStripMenuItem.Tag = "unit"; + this.insertunitFieldToolStripMenuItem.Text = "Insert &unit field"; + this.insertunitFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); + // // unitNameToolStripMenuItem // this.unitNameToolStripMenuItem.Name = "unitNameToolStripMenuItem"; this.unitNameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.unitNameToolStripMenuItem.Tag = "~AYAFORMAT~"; + this.unitNameToolStripMenuItem.Tag = "~UNIT_NAME~"; this.unitNameToolStripMenuItem.Text = "Unit name"; // - // unitSerialNumberToolStripMenuItem + // unitMeterReadingToolStripMenuItem // - this.unitSerialNumberToolStripMenuItem.Name = "unitSerialNumberToolStripMenuItem"; - this.unitSerialNumberToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.unitSerialNumberToolStripMenuItem.Tag = "~UNIT_SN~"; - this.unitSerialNumberToolStripMenuItem.Text = "Unit serial number"; + this.unitMeterReadingToolStripMenuItem.Name = "unitMeterReadingToolStripMenuItem"; + this.unitMeterReadingToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.unitMeterReadingToolStripMenuItem.Tag = "~UNIT_METER~"; + this.unitMeterReadingToolStripMenuItem.Text = "Unit meter reading"; // // manufacturerToolStripMenuItem // @@ -606,215 +515,288 @@ this.unitModelNameToolStripMenuItem.Tag = "~UNIT_MODEL_NAME~"; this.unitModelNameToolStripMenuItem.Text = "Unit model name"; // - // unitModelNumberToolStripMenuItem + // insertServiceFieldToolStripMenuItem // - this.unitModelNumberToolStripMenuItem.Name = "unitModelNumberToolStripMenuItem"; - this.unitModelNumberToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.unitModelNumberToolStripMenuItem.Tag = "~UNIT_MODEL_NUMBER~"; - this.unitModelNumberToolStripMenuItem.Text = "Unit model number"; + this.insertServiceFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.startDateAndTimeToolStripMenuItem, + this.stopDateAndTimeToolStripMenuItem, + this.quantityToolStripMenuItem, + this.rateNameToolStripMenuItem, + this.technicianToolStripMenuItem, + this.detailsToolStripMenuItem, + this.noChargeQuantityToolStripMenuItem}); + this.insertServiceFieldToolStripMenuItem.Name = "insertServiceFieldToolStripMenuItem"; + this.insertServiceFieldToolStripMenuItem.Size = new System.Drawing.Size(113, 20); + this.insertServiceFieldToolStripMenuItem.Tag = "service"; + this.insertServiceFieldToolStripMenuItem.Text = "Insert service field"; + this.insertServiceFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); // // startDateAndTimeToolStripMenuItem // this.startDateAndTimeToolStripMenuItem.Name = "startDateAndTimeToolStripMenuItem"; - this.startDateAndTimeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.startDateAndTimeToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.startDateAndTimeToolStripMenuItem.Tag = "~SERVICE_START~"; this.startDateAndTimeToolStripMenuItem.Text = "Start date and time"; // // stopDateAndTimeToolStripMenuItem // this.stopDateAndTimeToolStripMenuItem.Name = "stopDateAndTimeToolStripMenuItem"; - this.stopDateAndTimeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.stopDateAndTimeToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.stopDateAndTimeToolStripMenuItem.Tag = "~SERVICE_STOP~"; this.stopDateAndTimeToolStripMenuItem.Text = "Stop date and time"; // // quantityToolStripMenuItem // this.quantityToolStripMenuItem.Name = "quantityToolStripMenuItem"; - this.quantityToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.quantityToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.quantityToolStripMenuItem.Tag = "~SERVICE_QUANTITY~"; this.quantityToolStripMenuItem.Text = "Quantity"; // // rateNameToolStripMenuItem // this.rateNameToolStripMenuItem.Name = "rateNameToolStripMenuItem"; - this.rateNameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.rateNameToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.rateNameToolStripMenuItem.Tag = "~RATE_NAME~"; this.rateNameToolStripMenuItem.Text = "Rate name"; // // technicianToolStripMenuItem // this.technicianToolStripMenuItem.Name = "technicianToolStripMenuItem"; - this.technicianToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.technicianToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.technicianToolStripMenuItem.Tag = "~SERVICE_TECH~"; this.technicianToolStripMenuItem.Text = "Technician"; // // detailsToolStripMenuItem // this.detailsToolStripMenuItem.Name = "detailsToolStripMenuItem"; - this.detailsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.detailsToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.detailsToolStripMenuItem.Tag = "~DETAILS~"; this.detailsToolStripMenuItem.Text = "Details"; // // noChargeQuantityToolStripMenuItem // this.noChargeQuantityToolStripMenuItem.Name = "noChargeQuantityToolStripMenuItem"; - this.noChargeQuantityToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.noChargeQuantityToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.noChargeQuantityToolStripMenuItem.Tag = "~NO_CHARGE_QUANTITY~"; this.noChargeQuantityToolStripMenuItem.Text = "No charge quantity"; // + // insertTravelFieldToolStripMenuItem + // + this.insertTravelFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.startDateAndTimeToolStripMenuItem1, + this.stopDateAndTimeToolStripMenuItem1, + this.quantityToolStripMenuItem1, + this.travelRateNameToolStripMenuItem, + this.technicianToolStripMenuItem1, + this.detailsToolStripMenuItem1, + this.distanceToolStripMenuItem, + this.noChargeQuantityToolStripMenuItem1}); + this.insertTravelFieldToolStripMenuItem.Name = "insertTravelFieldToolStripMenuItem"; + this.insertTravelFieldToolStripMenuItem.Size = new System.Drawing.Size(106, 20); + this.insertTravelFieldToolStripMenuItem.Tag = "travel"; + this.insertTravelFieldToolStripMenuItem.Text = "Insert travel field"; + this.insertTravelFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); + // // startDateAndTimeToolStripMenuItem1 // this.startDateAndTimeToolStripMenuItem1.Name = "startDateAndTimeToolStripMenuItem1"; - this.startDateAndTimeToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.startDateAndTimeToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.startDateAndTimeToolStripMenuItem1.Tag = "~TRAVEL_START~"; this.startDateAndTimeToolStripMenuItem1.Text = "Start date and time"; // // stopDateAndTimeToolStripMenuItem1 // this.stopDateAndTimeToolStripMenuItem1.Name = "stopDateAndTimeToolStripMenuItem1"; - this.stopDateAndTimeToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.stopDateAndTimeToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.stopDateAndTimeToolStripMenuItem1.Tag = "~TRAVEL_STOP~"; this.stopDateAndTimeToolStripMenuItem1.Text = "Stop date and time"; // // quantityToolStripMenuItem1 // this.quantityToolStripMenuItem1.Name = "quantityToolStripMenuItem1"; - this.quantityToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.quantityToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.quantityToolStripMenuItem1.Tag = "~TRAVEL_QUANTITY~"; this.quantityToolStripMenuItem1.Text = "Quantity"; // // travelRateNameToolStripMenuItem // this.travelRateNameToolStripMenuItem.Name = "travelRateNameToolStripMenuItem"; - this.travelRateNameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.travelRateNameToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.travelRateNameToolStripMenuItem.Tag = "~TRAVEL_RATE_NAME~"; this.travelRateNameToolStripMenuItem.Text = "Travel rate name"; // // technicianToolStripMenuItem1 // this.technicianToolStripMenuItem1.Name = "technicianToolStripMenuItem1"; - this.technicianToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.technicianToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.technicianToolStripMenuItem1.Tag = "~TRAVEL_TECH~"; this.technicianToolStripMenuItem1.Text = "Technician"; // // detailsToolStripMenuItem1 // this.detailsToolStripMenuItem1.Name = "detailsToolStripMenuItem1"; - this.detailsToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.detailsToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.detailsToolStripMenuItem1.Tag = "~TRAVEL_DETAILS~"; this.detailsToolStripMenuItem1.Text = "Details"; // // distanceToolStripMenuItem // this.distanceToolStripMenuItem.Name = "distanceToolStripMenuItem"; - this.distanceToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.distanceToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.distanceToolStripMenuItem.Tag = "~TRAVEL_DISTANCE~"; this.distanceToolStripMenuItem.Text = "Distance"; // // noChargeQuantityToolStripMenuItem1 // this.noChargeQuantityToolStripMenuItem1.Name = "noChargeQuantityToolStripMenuItem1"; - this.noChargeQuantityToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.noChargeQuantityToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.noChargeQuantityToolStripMenuItem1.Tag = "~TRAVEL_NO_CHARGE_QUANTITY~"; this.noChargeQuantityToolStripMenuItem1.Text = "No charge quantity"; // + // insertOutsideServiceFieldToolStripMenuItem + // + this.insertOutsideServiceFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.repairPriceToolStripMenuItem, + this.shippingChargesToolStripMenuItem, + this.dateSentToolStripMenuItem, + this.dateReturnedToolStripMenuItem, + this.notesToolStripMenuItem}); + this.insertOutsideServiceFieldToolStripMenuItem.Name = "insertOutsideServiceFieldToolStripMenuItem"; + this.insertOutsideServiceFieldToolStripMenuItem.Size = new System.Drawing.Size(155, 20); + this.insertOutsideServiceFieldToolStripMenuItem.Tag = "outsideservice"; + this.insertOutsideServiceFieldToolStripMenuItem.Text = "Insert outside service field"; + this.insertOutsideServiceFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); + // // repairPriceToolStripMenuItem // this.repairPriceToolStripMenuItem.Name = "repairPriceToolStripMenuItem"; - this.repairPriceToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.repairPriceToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.repairPriceToolStripMenuItem.Tag = "~REPAIR_PRICE~"; this.repairPriceToolStripMenuItem.Text = "Repair price"; // // shippingChargesToolStripMenuItem // this.shippingChargesToolStripMenuItem.Name = "shippingChargesToolStripMenuItem"; - this.shippingChargesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.shippingChargesToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.shippingChargesToolStripMenuItem.Tag = "~SHIP_CHARGE~"; this.shippingChargesToolStripMenuItem.Text = "Shipping charges"; // // dateSentToolStripMenuItem // this.dateSentToolStripMenuItem.Name = "dateSentToolStripMenuItem"; - this.dateSentToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.dateSentToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.dateSentToolStripMenuItem.Tag = "~SENT~"; this.dateSentToolStripMenuItem.Text = "Date sent"; // // dateReturnedToolStripMenuItem // this.dateReturnedToolStripMenuItem.Name = "dateReturnedToolStripMenuItem"; - this.dateReturnedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.dateReturnedToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.dateReturnedToolStripMenuItem.Tag = "~RETURNED~"; this.dateReturnedToolStripMenuItem.Text = "Date returned"; // // notesToolStripMenuItem // this.notesToolStripMenuItem.Name = "notesToolStripMenuItem"; - this.notesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.notesToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.notesToolStripMenuItem.Tag = "~NOTES~"; this.notesToolStripMenuItem.Text = "Notes"; // + // insertMiscExpenseFieldToolStripMenuItem + // + this.insertMiscExpenseFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.chargesToolStripMenuItem, + this.summaryToolStripMenuItem, + this.technicianToolStripMenuItem2}); + this.insertMiscExpenseFieldToolStripMenuItem.Name = "insertMiscExpenseFieldToolStripMenuItem"; + this.insertMiscExpenseFieldToolStripMenuItem.Size = new System.Drawing.Size(151, 20); + this.insertMiscExpenseFieldToolStripMenuItem.Tag = "expense"; + this.insertMiscExpenseFieldToolStripMenuItem.Text = "Insert misc. expense field"; + this.insertMiscExpenseFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); + // // chargesToolStripMenuItem // this.chargesToolStripMenuItem.Name = "chargesToolStripMenuItem"; - this.chargesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.chargesToolStripMenuItem.Size = new System.Drawing.Size(130, 22); this.chargesToolStripMenuItem.Tag = "~CHARGES~"; this.chargesToolStripMenuItem.Text = "Charges"; // // summaryToolStripMenuItem // this.summaryToolStripMenuItem.Name = "summaryToolStripMenuItem"; - this.summaryToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.summaryToolStripMenuItem.Size = new System.Drawing.Size(130, 22); this.summaryToolStripMenuItem.Tag = "~SUMMARY~"; this.summaryToolStripMenuItem.Text = "Summary"; // // technicianToolStripMenuItem2 // this.technicianToolStripMenuItem2.Name = "technicianToolStripMenuItem2"; - this.technicianToolStripMenuItem2.Size = new System.Drawing.Size(180, 22); + this.technicianToolStripMenuItem2.Size = new System.Drawing.Size(130, 22); this.technicianToolStripMenuItem2.Tag = "~TECH~"; this.technicianToolStripMenuItem2.Text = "Technician"; // + // insertLoanItemFieldToolStripMenuItem + // + this.insertLoanItemFieldToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.itemLoanedToolStripMenuItem, + this.chargesToolStripMenuItem1, + this.loanedDateToolStripMenuItem, + this.returnedDateToolStripMenuItem, + this.notesToolStripMenuItem1}); + this.insertLoanItemFieldToolStripMenuItem.Name = "insertLoanItemFieldToolStripMenuItem"; + this.insertLoanItemFieldToolStripMenuItem.Size = new System.Drawing.Size(127, 20); + this.insertLoanItemFieldToolStripMenuItem.Tag = "loaner"; + this.insertLoanItemFieldToolStripMenuItem.Text = "Insert loan item field"; + this.insertLoanItemFieldToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tbManager_ItemClicked); + // // itemLoanedToolStripMenuItem // this.itemLoanedToolStripMenuItem.Name = "itemLoanedToolStripMenuItem"; - this.itemLoanedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.itemLoanedToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.itemLoanedToolStripMenuItem.Tag = "~ITEM~"; this.itemLoanedToolStripMenuItem.Text = "Item loaned"; // // chargesToolStripMenuItem1 // this.chargesToolStripMenuItem1.Name = "chargesToolStripMenuItem1"; - this.chargesToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.chargesToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); this.chargesToolStripMenuItem1.Tag = "~CHARGE~"; this.chargesToolStripMenuItem1.Text = "Charges"; // // loanedDateToolStripMenuItem // this.loanedDateToolStripMenuItem.Name = "loanedDateToolStripMenuItem"; - this.loanedDateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loanedDateToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.loanedDateToolStripMenuItem.Tag = "~LOANED~"; this.loanedDateToolStripMenuItem.Text = "Loaned date"; // // returnedDateToolStripMenuItem // this.returnedDateToolStripMenuItem.Name = "returnedDateToolStripMenuItem"; - this.returnedDateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.returnedDateToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.returnedDateToolStripMenuItem.Tag = "~LOAN_RETURNED~"; this.returnedDateToolStripMenuItem.Text = "Returned date"; // // notesToolStripMenuItem1 // this.notesToolStripMenuItem1.Name = "notesToolStripMenuItem1"; - this.notesToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.notesToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); this.notesToolStripMenuItem1.Tag = "~LOAN_NOTES~"; this.notesToolStripMenuItem1.Text = "Notes"; // - // unitMeterReadingToolStripMenuItem + // setToDefaultDetailedFormatToolStripMenuItem // - this.unitMeterReadingToolStripMenuItem.Name = "unitMeterReadingToolStripMenuItem"; - this.unitMeterReadingToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.unitMeterReadingToolStripMenuItem.Tag = "~UNIT_METER~"; - this.unitMeterReadingToolStripMenuItem.Text = "Unit meter reading"; + this.setToDefaultDetailedFormatToolStripMenuItem.Name = "setToDefaultDetailedFormatToolStripMenuItem"; + this.setToDefaultDetailedFormatToolStripMenuItem.Size = new System.Drawing.Size(173, 20); + this.setToDefaultDetailedFormatToolStripMenuItem.Tag = "SetDetailed"; + this.setToDefaultDetailedFormatToolStripMenuItem.Text = "Set to default detailed format"; + // + // setToDefaultBriefFormatToolStripMenuItem + // + this.setToDefaultBriefFormatToolStripMenuItem.Name = "setToDefaultBriefFormatToolStripMenuItem"; + this.setToDefaultBriefFormatToolStripMenuItem.Size = new System.Drawing.Size(155, 20); + this.setToDefaultBriefFormatToolStripMenuItem.Tag = "SetBrief"; + this.setToDefaultBriefFormatToolStripMenuItem.Text = "Set to default brief format"; // // InvoiceTemplateBuilder // @@ -901,10 +883,8 @@ private System.Windows.Forms.ToolStripMenuItem workOrderItemRequestDateToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem workOrderItemStatusToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem unitNameToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem unitSerialNumberToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem manufacturerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem unitModelNameToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem unitModelNumberToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem startDateAndTimeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem stopDateAndTimeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem quantityToolStripMenuItem; diff --git a/AyaNovaQBI/InvoiceTemplateBuilder.cs b/AyaNovaQBI/InvoiceTemplateBuilder.cs index ed2d755..15e52d9 100644 --- a/AyaNovaQBI/InvoiceTemplateBuilder.cs +++ b/AyaNovaQBI/InvoiceTemplateBuilder.cs @@ -81,7 +81,7 @@ namespace AyaNovaQBI case "SetDetailed": edHeader.Text = "Charges for work order: ~WO#~"; edFooter.Text = "Service requested: ~ITEM_SUMMARY~"; - edUnit.Text = "Unit Serviced: ~AYAFORMAT~"; + edUnit.Text = "Unit Serviced: ~UNIT_NAME~"; edService.Text = "Service performed by: ~SERVICE_TECH~ Start Date & Time: ~SERVICE_START~ End Date & Time: ~SERVICE_STOP~\r\n" + "Service Details: ~DETAILS~"; edTravel.Text = "Travel Start Date & Time: ~TRAVEL_START~"; diff --git a/AyaNovaQBI/WorkOrderItemUnit.cs b/AyaNovaQBI/WorkOrderItemUnit.cs index a20a7ad..47c88bf 100644 --- a/AyaNovaQBI/WorkOrderItemUnit.cs +++ b/AyaNovaQBI/WorkOrderItemUnit.cs @@ -19,6 +19,7 @@ namespace AyaNovaQBI public string UnitModelVendorViz { get; set; } public string UnitDescriptionViz { get; set; } public bool UnitMeteredViz { get; set; } + public string UnitLastMeterViz { get; set; }//for qbi //PHYSICAL ADDRESS public string AddressViz { get; set; } diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index da848d4..ccba4f0 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -6345,23 +6345,19 @@ namespace AyaNovaQBI #region Unit fields if (!string.IsNullOrWhiteSpace(QDat.InvoiceUnitTemplate)) { - foreach (var u in it.units) + foreach (var u in it.Units) { string s = QDat.InvoiceUnitTemplate; - UnitPickList up = UnitPickList.GetListOfOneSpecificUnit(it.UnitID); - - - if (s.IndexOf("~AYAFORMAT~") != -1) + if (s.IndexOf("~UNIT_DESC~") != -1) { - s = s.Replace("~AYAFORMAT~", up[0].UnitName()); + s = s.Replace("~UNIT_DESC~", u.UnitDescriptionViz); } - - if (s.IndexOf("~UNIT_SN~") != -1) + if (s.IndexOf("~UNIT_NAME~") != -1) { - s = s.Replace("~UNIT_SN~", up[0].Serial); + s = s.Replace("~UNIT_NAME~", u.UnitViz); } if (s.IndexOf("~UNIT_METER~") != -1) @@ -6369,23 +6365,24 @@ namespace AyaNovaQBI if (!up[0].Metered) s = s.Replace("~UNIT_METER~", ""); else - s = s.Replace("~UNIT_METER~", Unit.LastMeterReading(up[0].ID).ToString()); + s = s.Replace("~UNIT_METER~", u.UnitLastMeterViz); } if (s.IndexOf("~UNIT_MAKE~") != -1) { - s = s.Replace("~UNIT_MAKE~", up[0].VendorName); + s = s.Replace("~UNIT_MAKE~", u.UnitModelVendorViz); } if (s.IndexOf("~UNIT_MODEL_NAME~") != -1) { - s = s.Replace("~UNIT_MODEL_NAME~", up[0].ModelName); + s = s.Replace("~UNIT_MODEL_NAME~", u.UnitModelNameViz); } - if (s.IndexOf("~UNIT_MODEL_NUMBER~") != -1) - { - s = s.Replace("~UNIT_MODEL_NUMBER~", up[0].ModelNumber); - } + //in v8 model number and name are combined in single name field and imported from v7 {model_number}+{model_name} so name covers both + //if (s.IndexOf("~UNIT_MODEL_NUMBER~") != -1) + //{ + // s = s.Replace("~UNIT_MODEL_NUMBER~", u.viz); + //} InvoiceAddText(i, s); }