From d3695f24e5abbae293f3e3f0fcf9e02c1d4f06f6 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 21 Jan 2022 18:49:58 +0000
Subject: [PATCH]

---
 .../Charges Summary Grouped By Customer.ayrt                    | 2 +-
 .../resource/rpt/stock-report-templates/Clients list.ayrt       | 2 +-
 .../resource/rpt/stock-report-templates/Contacts list.ayrt      | 2 +-
 .../resource/rpt/stock-report-templates/Customer Invoice.ayrt   | 2 +-
 .../resource/rpt/stock-report-templates/Customer Notes.ayrt     | 2 +-
 .../resource/rpt/stock-report-templates/Customer Quote.ayrt     | 2 +-
 .../rpt/stock-report-templates/Customer Work Order.ayrt         | 2 +-
 .../resource/rpt/stock-report-templates/Head Offices list.ayrt  | 2 +-
 .../Inventory Reconciliation Form Grouped By Warehouse.ayrt     | 2 +-
 .../Inventory transactions grouped by Part.ayrt                 | 2 +-
 .../Labor Billing & Hours Grouped By Technician.ayrt            | 2 +-
 .../resource/rpt/stock-report-templates/Loaner Items.ayrt       | 2 +-
 server/AyaNova/resource/rpt/stock-report-templates/Memos.ayrt   | 2 +-
 .../Net Taxes and Totals for Each WO.ayrt                       | 2 +-
 .../rpt/stock-report-templates/Net Totals for Each PM Item.ayrt | 2 +-
 .../stock-report-templates/Net Totals for Each Quote Item.ayrt  | 2 +-
 .../rpt/stock-report-templates/Net Totals for Each WO Item.ayrt | 2 +-
 .../rpt/stock-report-templates/Net Totals for Each WO.ayrt      | 2 +-
 .../Nets Taxes LineTotals for each PM Expense.ayrt              | 2 +-
 .../Nets Taxes LineTotals for each PM Labor.ayrt                | 2 +-
 .../Nets Taxes LineTotals for each PM Loans.ayrt                | 2 +-
 .../Nets Taxes LineTotals for each PM Part.ayrt                 | 2 +-
 .../Nets Taxes LineTotals for each PM Travel.ayrt               | 2 +-
 .../Nets Taxes LineTotals for each Quote Expense.ayrt           | 2 +-
 .../Nets Taxes LineTotals for each Quote Labor.ayrt             | 2 +-
 .../Nets Taxes LineTotals for each Quote Loans.ayrt             | 2 +-
 .../Nets Taxes LineTotals for each Quote Part.ayrt              | 2 +-
 .../Nets Taxes LineTotals for each Quote Travel.ayrt            | 2 +-
 .../Nets Taxes LineTotals for each WO Expense.ayrt              | 2 +-
 .../Nets Taxes LineTotals for each WO Labor.ayrt                | 2 +-
 .../Nets Taxes LineTotals for each WO Loans.ayrt                | 2 +-
 .../Nets Taxes LineTotals for each WO Part.ayrt                 | 2 +-
 .../Nets Taxes LineTotals for each WO Travel.ayrt               | 2 +-
 .../rpt/stock-report-templates/Outside Service via PMs.ayrt     | 2 +-
 .../rpt/stock-report-templates/Outside Service via Quotes.ayrt  | 2 +-
 .../stock-report-templates/Outside Service via Work Orders.ayrt | 2 +-
 .../resource/rpt/stock-report-templates/PM Item Summary.ayrt    | 2 +-
 .../resource/rpt/stock-report-templates/PM Item Tasks .ayrt     | 2 +-
 .../resource/rpt/stock-report-templates/PM Parts Summary .ayrt  | 2 +-
 .../resource/rpt/stock-report-templates/PM Scheduled Users.ayrt | 2 +-
 .../stock-report-templates/PM Units grouped by Customer.ayrt    | 2 +-
 .../stock-report-templates/PO Items Received vs Ordered.ayrt    | 2 +-
 .../Part Grouped Net Cost Difference.ayrt                       | 2 +-
 .../Part Requests Grouped By Wholesaler.ayrt                    | 2 +-
 .../rpt/stock-report-templates/Parts & Labor Profit _ Loss.ayrt | 2 +-
 .../Parts with available serial numbers.ayrt                    | 2 +-
 .../resource/rpt/stock-report-templates/Projects list.ayrt      | 2 +-
 .../rpt/stock-report-templates/Purchase Order Detailed.ayrt     | 2 +-
 .../rpt/stock-report-templates/Purchase Order Summaries.ayrt    | 2 +-
 .../resource/rpt/stock-report-templates/Quote Item Summary.ayrt | 2 +-
 .../resource/rpt/stock-report-templates/Quote Item Tasks.ayrt   | 2 +-
 .../stock-report-templates/Quote Parts Net Cost Summary.ayrt    | 2 +-
 .../rpt/stock-report-templates/Quote Scheduled Users.ayrt       | 2 +-
 .../stock-report-templates/Quote Units grouped by Customer.ayrt | 2 +-
 .../AyaNova/resource/rpt/stock-report-templates/Reminders.ayrt  | 2 +-
 .../Restock List Grouped By Wholesaler.ayrt                     | 2 +-
 .../Retail & Cost Value of Inventory.ayrt                       | 2 +-
 .../rpt/stock-report-templates/Reviews grouped by user.ayrt     | 2 +-
 .../resource/rpt/stock-report-templates/Service Dispatch.ayrt   | 2 +-
 .../resource/rpt/stock-report-templates/Tax Codes List.ayrt     | 2 +-
 .../resource/rpt/stock-report-templates/Unit Meter Reading.ayrt | 2 +-
 .../resource/rpt/stock-report-templates/Unit Models list.ayrt   | 2 +-
 .../rpt/stock-report-templates/Units Per Customer .ayrt         | 2 +-
 .../rpt/stock-report-templates/Vendor Contact Report.ayrt       | 2 +-
 .../rpt/stock-report-templates/Work Order Item Summary.ayrt     | 2 +-
 .../rpt/stock-report-templates/Work Order Item Tasks.ayrt       | 2 +-
 .../rpt/stock-report-templates/Work Order Scheduled Users.ayrt  | 2 +-
 .../rpt/stock-report-templates/Work order Part Requests.ayrt    | 2 +-
 .../Workorder Units grouped by Customer.ayrt                    | 2 +-
 .../z_PO custom Helper #if_eq if equal to.ayrt                  | 2 +-
 .../rpt/stock-report-templates/z_Wiki displayed PO.ayrt         | 2 +-
 .../resource/rpt/stock-report-templates/z_Wiki displayed.ayrt   | 2 +-
 .../z_ayGroupByTag group by a specific Tag only.ayrt            | 2 +-
 .../z_ayGroupByTag group by each Tag.ayrt                       | 2 +-
 .../z_ayGroupByTag group inventory by Tag.ayrt                  | 2 +-
 .../stock-report-templates/z_barcode using built in ayBC.ayrt   | 2 +-
 .../z_company name address logo URL ayServerMetaData.ayrt       | 2 +-
 .../resource/rpt/stock-report-templates/z_custom fields.ayrt    | 2 +-
 ... forced to bottom of each page of multi-page work order.ayrt | 2 +-
 .../z_if key value X show Y via custom Helpers.ayrt             | 2 +-
 .../rpt/stock-report-templates/z_myData ServerInfo .ayrt        | 2 +-
 .../rpt/stock-report-templates/z_myData search results.ayrt     | 2 +-
 .../z_replace carriage return with space.ayrt                   | 2 +-
 .../z_report template name notes ayReportMetaData.ayrt          | 2 +-
 .../z_table layout parent child grandchild.ayrt                 | 2 +-
 .../rpt/stock-report-templates/z_table layout parent child.ayrt | 2 +-
 .../z_user logged in TimeZone Currency  ayClientMetaData.ayrt   | 2 +-
 87 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Charges Summary Grouped By Customer.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Charges Summary Grouped By Customer.ayrt
index 8aa3cdbf..06157659 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Charges Summary Grouped By Customer.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Charges Summary Grouped By Customer.ayrt	
@@ -1 +1 @@
-{"Name":"Charges Summary Grouped By Customer","Active":true,"Notes":"Custom Prepare to obtain and display WO total nets, taxes and grand total","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Taxes &#38; Totals for each {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderStatus'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"19\" class=\"leftlean\">{{group}}</td>\n            </tr>\n           {{#each items}}\n            <tr>               \n               <td  colspan=\"2\" >&nbsp;</td>\n               <td  colspan=\"1\" >{{Serial}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\" >{{ayDate ServiceDate}}</td>{{else}}<td colspan=\"2\" class=\"minimum\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\"   style=\"background-color:{{LastStateColorViz}}\" >{{LastStateNameViz}}</td>\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllTravelsNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\" >{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllLoansNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllOutsidesNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOTotalNets }}<td colspan=\"2\" >{{ayCurrency ThisWOTotalNets}}</td> {{else}} <td colspan=\"2\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOTotalTaxAs }}<td colspan=\"1\" >{{ayCurrency ThisWOTotalTaxAs}}</td> {{else}} <td class=\"minimum\">none</td>{{/if}}\n               {{#if ThisWOTotalTaxBs }}<td colspan=\"1\" >{{ayCurrency ThisWOTotalTaxBs}}</td> {{else}} <td class=\"minimum\">none</td>{{/if}}\n               {{#if ThisWOTotalGrand }}<td colspan=\"2\" >{{ayCurrency ThisWOTotalGrand}}</td> {{else}} <td class=\"minimum\">none billable</td>{{/if}}               \n          </tr>\n          {{/each}}\n            <tr>\n               <td colspan=\"19\">&nbsp;</td>\n            </tr>\n            <tr><!-- displays after all of the workorders for this group -->\n               <th  colspan=\"7\" class=\"rightlean\">{{group}} Totals</th>\n               {{#if GroupWOLaborsNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOLaborsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOPartsNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOPartsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOTravelsNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOTravelsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOExpsNetChargeAmount }}<td colspan=\"1\" >{{ayCurrency GroupWOExpsNetChargeAmount}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOLoansNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOLoansNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOOutsidesNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOOutsidesNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOTotalNets }}<td colspan=\"2\" >{{ayCurrency GroupWOTotalNets}}</td> {{else}} <td colspan=\"2\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOTotalTaxAs }}<td colspan=\"1\" >{{ayCurrency GroupWOTotalTaxAs}}</td> {{else}} <td class=\"minimum\">none</td>{{/if}}\n               {{#if GroupWOTotalTaxBs }}<td colspan=\"1\" >{{ayCurrency GroupWOTotalTaxBs}}</td> {{else}} <td class=\"minimum\">none</td>{{/if}}\n               {{#if GroupWOTotalGrand }}<td colspan=\"2\" >{{ayCurrency GroupWOTotalGrand}}</td> {{else}} <td class=\"minimum\">none billable</td>{{/if}}               \n            </tr>\n            <tr>\n               <td colspan=\"19\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"5\" class=\"rightlean\">Totals for all</th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th>{{ayT 'NetValue'}}</th>\n               <th>{{ayT 'TaxCodeTaxA'}}</th>\n               <th>{{ayT 'TaxCodeTaxB'}}</th>\n               <th>{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"5\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td>{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxAs}} <td>{{ ayCurrency AllWOTotalTaxAs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxBs }} <td>{{ ayCurrency AllWOTotalTaxBs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalGrand}} <td>{{ ayCurrency AllWOTotalGrand }}</td>{{else}} <td>$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n<!-- uncomment to see the raw data returned from the custom Prepare <div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> -->\n\n</body>\n\n</html>","Style":".minimum {\n  font-size: 5pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 6pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderStatus\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders reported on in this report so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n//below declares a key to hold all Tax As from all workorders in this list so it exists\nreportData.AllWOTotalTaxAs = 0;\n//below declares a key to hold all Tax Bs from all workorders in this list so it exists\nreportData.AllWOTotalTaxBs = 0;\n//below declares a key to hold all GrandTotal from all workorders in this list so it exists\nreportData.AllWOTotalGrand = 0;\n\n\nfor (EachGroup of reportData.ayReportData) {\n\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all workorders reported on in this report so it exists\n\tEachGroup.GroupWOLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\n\tEachGroup.GroupWOPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\n\tEachGroup.GroupWOTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\n\tEachGroup.GroupWOExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\n\tEachGroup.GroupWOLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\n\tEachGroup.GroupWOOutsidesNetViz = 0;\n\n\t//below declares a key to hold all Nets from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalNets = 0;\n\n\t//below declares a key to hold all Tax As from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalTaxAs = 0;\n\t//below declares a key to hold all Tax Bs from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalTaxBs = 0;\n\t//below declares a key to hold all GrandTotal from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalGrand = 0;\n\nfor (EachWO of EachGroup.items) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\n\t\t\t\t\t\tEachGroup.GroupWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this Group's entire WO's Net Labors\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS Group's workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Labor.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Labor.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Group's workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Labor.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Labor.TaxBViz;\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachGroup.GroupWOPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Parts\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Part.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Part.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\t\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Part.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Part.TaxBViz;\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Travels\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Travel.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Travel.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Travel.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Travel.TaxBViz;\n\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire Groups WO's Net ChargeAmounts\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\n\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.ChargeAmount; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax As for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS Groups workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS Groups workorders in this report data\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Exp.TaxPaid; \n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.TaxPaid;\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Loans\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\t\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Loan.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Loan.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Loan.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Loan.TaxBViz;\t\t\t\t\t\n\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Outsides\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Outside.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Outside.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Outside.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Outside.TaxBViz;\n\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n}\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Charges Summary Grouped By Customer","Active":true,"Notes":"Custom Prepare to obtain and display WO total nets, taxes and grand total","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Taxes &#38; Totals for each {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderStatus'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"19\" class=\"leftlean\">{{group}}</td>\n            </tr>\n           {{#each items}}\n            <tr>               \n               <td  colspan=\"2\" >&nbsp;</td>\n               <td  colspan=\"1\" >{{Serial}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\" >{{ayDate ServiceDate}}</td>{{else}}<td colspan=\"2\" class=\"minimum\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\"   style=\"background-color:{{LastStateColorViz}}\" >{{LastStateNameViz}}</td>\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllLaborsNetViz}}</td>{{else}}<td colspan=\"1\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllPartsNetViz}}</td>{{else}}<td colspan=\"1\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllTravelsNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllTravelsNetViz}}</td>{{else}}<td colspan=\"1\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\" >{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td colspan=\"1\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllLoansNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllLoansNetViz}}</td>{{else}}<td colspan=\"1\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOAllOutsidesNetViz }}<td colspan=\"1\" >{{ayCurrency ThisWOAllOutsidesNetViz}}</td>{{else}}<td colspan=\"1\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOTotalNets }}<td colspan=\"2\" >{{ayCurrency ThisWOTotalNets}}</td> {{else}} <td colspan=\"2\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if ThisWOTotalTaxAs }}<td colspan=\"1\" >{{ayCurrency ThisWOTotalTaxAs}}</td> {{else}} <td colspan=\"1\" class=\"minimum\">none</td>{{/if}}\n               {{#if ThisWOTotalTaxBs }}<td colspan=\"1\" >{{ayCurrency ThisWOTotalTaxBs}}</td> {{else}} <td colspan=\"1\" class=\"minimum\">none</td>{{/if}}\n               {{#if ThisWOTotalGrand }}<td colspan=\"2\" >{{ayCurrency ThisWOTotalGrand}}</td> {{else}} <td colspan=\"2\" class=\"minimum\">none billable</td>{{/if}}               \n          </tr>\n          {{/each}}\n            <tr>\n               <td colspan=\"19\">&nbsp;</td>\n            </tr>\n            <tr><!-- displays after all of the workorders for this group -->\n               <th  colspan=\"7\" class=\"rightlean\">{{group}} Totals</th>\n               {{#if GroupWOLaborsNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOLaborsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOPartsNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOPartsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOTravelsNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOTravelsNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOExpsNetChargeAmount }}<td colspan=\"1\" >{{ayCurrency GroupWOExpsNetChargeAmount}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOLoansNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOLoansNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOOutsidesNetViz }}<td colspan=\"1\" >{{ayCurrency GroupWOOutsidesNetViz}}</td>{{else}}<td class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOTotalNets }}<td colspan=\"2\" >{{ayCurrency GroupWOTotalNets}}</td> {{else}} <td colspan=\"2\" class=\"minimum\">none billable</td>{{/if}}\n               {{#if GroupWOTotalTaxAs }}<td colspan=\"1\" >{{ayCurrency GroupWOTotalTaxAs}}</td> {{else}} <td class=\"minimum\">none</td>{{/if}}\n               {{#if GroupWOTotalTaxBs }}<td colspan=\"1\" >{{ayCurrency GroupWOTotalTaxBs}}</td> {{else}} <td class=\"minimum\">none</td>{{/if}}\n               {{#if GroupWOTotalGrand }}<td colspan=\"2\" >{{ayCurrency GroupWOTotalGrand}}</td> {{else}} <td class=\"minimum\">none billable</td>{{/if}}               \n            </tr>\n            <tr>\n               <td colspan=\"19\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"5\" class=\"rightlean\">Totals for all</th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th>{{ayT 'NetValue'}}</th>\n               <th>{{ayT 'TaxCodeTaxA'}}</th>\n               <th>{{ayT 'TaxCodeTaxB'}}</th>\n               <th>{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"5\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td>{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxAs}} <td>{{ ayCurrency AllWOTotalTaxAs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxBs }} <td>{{ ayCurrency AllWOTotalTaxBs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalGrand}} <td>{{ ayCurrency AllWOTotalGrand }}</td>{{else}} <td>$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n<!-- uncomment to see the raw data returned from the custom Prepare <div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> -->\n\n</body>\n\n</html>","Style":".minimum {\n  font-size: 5pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 6pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderStatus\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders reported on in this report so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n//below declares a key to hold all Tax As from all workorders in this list so it exists\nreportData.AllWOTotalTaxAs = 0;\n//below declares a key to hold all Tax Bs from all workorders in this list so it exists\nreportData.AllWOTotalTaxBs = 0;\n//below declares a key to hold all GrandTotal from all workorders in this list so it exists\nreportData.AllWOTotalGrand = 0;\n\n\nfor (const EachGroup of reportData.ayReportData) {\n\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all workorders reported on in this report so it exists\n\tEachGroup.GroupWOLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\n\tEachGroup.GroupWOPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\n\tEachGroup.GroupWOTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\n\tEachGroup.GroupWOExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\n\tEachGroup.GroupWOLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\n\tEachGroup.GroupWOOutsidesNetViz = 0;\n\n\t//below declares a key to hold all Nets from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalNets = 0;\n\n\t//below declares a key to hold all Tax As from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalTaxAs = 0;\n\t//below declares a key to hold all Tax Bs from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalTaxBs = 0;\n\t//below declares a key to hold all GrandTotal from all workorders in this list so it exists\n\tEachGroup.GroupWOTotalGrand = 0;\n\nfor (const EachWO of EachGroup.items) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\n\t\t\t\t\t\tEachGroup.GroupWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this Group's entire WO's Net Labors\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS Group's workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Labor.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Labor.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Group's workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Labor.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Labor.TaxBViz;\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachGroup.GroupWOPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Parts\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Part.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Part.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\t\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Part.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Part.TaxBViz;\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Travels\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Travel.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Travel.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Travel.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Travel.TaxBViz;\n\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire Groups WO's Net ChargeAmounts\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\n\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.ChargeAmount; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax As for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS Groups workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS Groups workorders in this report data\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Exp.TaxPaid; \n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Exp.TaxPaid;\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Loans\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\t\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Loan.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Loan.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Loan.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Loan.TaxBViz;\t\t\t\t\t\n\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachGroup.GroupWOOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire Groups WO's Net Outsides\n\t\t\t\t\t\tEachGroup.GroupWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxAs += Outside.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalTaxBs += Outside.TaxBViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS Groups workorders in this report data\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Outside.TaxAViz;\n\t\t\t\t\t\tEachGroup.GroupWOTotalGrand += Outside.TaxBViz;\n\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n}\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Clients list.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Clients list.ayrt
index c73a0e4e..98adccde 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Clients list.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Clients list.ayrt	
@@ -1 +1 @@
-{"Name":"Clients list","Active":true,"Notes":"","Roles":124415,"AType":8,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'CustomerList'}} List</p>\n    </div>\n\n    <table>\n\n      <thead>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <th colspan=\"1\" class=\"leftlean\">{{ayT 'Customer'}}:</th>\n          <td colspan=\"5\" class=\"lrgtext\">{{Name}}</td>\n          <td colspan=\"1\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerAccountNumber'}}:</th>\n          <td colspan=\"1\">{{AccountNumber}}</td>\n          <th colspan=\"2\">{{ayT 'LastServiceWorkOrder'}}:</th>\n          {{#if LastServiceDateViz}}<td colspan=\"2\">&#35;{{LastWorkOrderViz}} on {{ayDateTime LastServiceDateViz}}</td>{{else}}<td colspan=\"2\"></td>{{/if}}\n        </tr>\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerPhone1'}}:</th>\n          <td colspan=\"2\">{{Phone1}}</td>\n          <th colspan=\"1\">{{ayT 'CustomerEmail'}}:</th>\n          <td colspan=\"2\">{{EmailAddress}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"2\">{{ayT 'AddressTypePhysical'}}:</th>\n          <td colspan=\"5\">{{Address}} {{City}}, {{Region}}</td>\n        </tr>\n        {{#if BillHeadOffice}} <!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerBillHeadOffice'}}:</th>\n          <td colspan=\"5\">{{HeadOfficeViz}}</td>\n        </tr>\n        {{else}}{{/if}} <!-- this closes the above if statement -->\n        {{#if ContractViz}}<!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'Contract'}}:</th>\n          <td colspan=\"5\">{{ContractViz}} Expires: {{ContractExpires}}</td>\n        </tr>\n        {{else}}{{/if}}<!-- this closes the above if statement -->\n        {{#if AlertNotes}}<!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerAlertNotes'}}:</th>\n          <td colspan=\"5\">{{AlertNotes}} Expires: {{ContractExpires}}</td>\n        </tr>\n        {{else}}{{/if}}<!-- this closes the above if statement -->\n        {{#if TechNotes}}<!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerTechNotes'}}:</th>\n          <td colspan=\"5\">{{TechNotes}}</td>\n        </tr>\n        {{else}}{{/if}}<!-- this closes the above if statement -->\n\n        <tr>\n          <th colspan=\"6\">&nbsp;</th>\n        </tr>\n\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n  text-align: right;\r\n}\r\n\r\n.lrgtext {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Name\", \"CustomerList\", \"Customer\", \"CustomerAccountNumber\", \"CustomerBillHeadOffice\", \"AddressTypePhysical\", \"CustomerPhone1\", \"CustomerEmail\", \"ContractExpires\", \"Contract\", \"LastServiceWorkOrder\", \"CustomerAlertNotes\", \"CustomerTechNotes\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Clients list","Active":true,"Notes":"","Roles":124415,"AType":8,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'CustomerList'}} List</p>\n    </div>\n\n    <table>\n\n      <thead>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <th colspan=\"1\" class=\"leftlean\">{{ayT 'Customer'}}:</th>\n          <td colspan=\"5\" class=\"lrgtext\">{{Name}}</td>\n          <td colspan=\"1\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerAccountNumber'}}:</th>\n          <td colspan=\"1\">{{AccountNumber}}</td>\n          <th colspan=\"2\">{{ayT 'LastServiceWorkOrder'}}:</th>\n          {{#if LastServiceDateViz}}<td colspan=\"2\">&#35;{{LastWorkOrderViz}} on {{ayDateTime LastServiceDateViz}}</td>{{else}}<td colspan=\"2\"></td>{{/if}}\n        </tr>\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerPhone1'}}:</th>\n          <td colspan=\"2\">{{Phone1}}</td>\n          <th colspan=\"1\">{{ayT 'CustomerEmail'}}:</th>\n          <td colspan=\"2\">{{EmailAddress}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"2\">{{ayT 'AddressTypePhysical'}}:</th>\n          <td colspan=\"5\">{{Address}} {{City}}, {{Region}}</td>\n        </tr>\n        {{#if BillHeadOffice}} <!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerBillHeadOffice'}}:</th>\n          <td colspan=\"5\">{{HeadOfficeViz}}</td>\n        </tr>\n        {{else}}{{/if}} <!-- this closes the above if statement -->\n        {{#if ContractViz}}<!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'Contract'}}:</th>\n          <td colspan=\"5\">{{ContractViz}} Expires: {{ContractExpires}}</td>\n        </tr>\n        {{else}}{{/if}}<!-- this closes the above if statement -->\n        {{#if AlertNotes}}<!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerAlertNotes'}}:</th>\n          <td colspan=\"5\">{{AlertNotes}} Expires: {{ContractExpires}}</td>\n        </tr>\n        {{else}}{{/if}}<!-- this closes the above if statement -->\n        {{#if TechNotes}}<!-- only displays if this is true -->\n        <tr>\n          <th colspan=\"2\">{{ayT 'CustomerTechNotes'}}:</th>\n          <td colspan=\"5\">{{TechNotes}}</td>\n        </tr>\n        {{else}}{{/if}}<!-- this closes the above if statement -->\n\n        <tr>\n          <th colspan=\"6\">&nbsp;</th>\n        </tr>\n\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n  text-align: right;\r\n}\r\n\r\n.lrgtext {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Name\", \"CustomerList\", \"Customer\", \"CustomerAccountNumber\", \"CustomerBillHeadOffice\", \"AddressTypePhysical\", \"CustomerPhone1\", \"CustomerEmail\", \"ContractExpires\", \"Contract\", \"LastServiceWorkOrder\", \"CustomerAlertNotes\", \"CustomerTechNotes\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Contacts list.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Contacts list.ayrt
index 81cb3373..096453f7 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Contacts list.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Contacts list.ayrt	
@@ -1 +1 @@
-{"Name":"Contacts list","Active":true,"Notes":"HTML example of using multiple nested #if  else statements for display of value","Roles":50538,"AType":3,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'UserList'}} &amp; {{ayT 'Contacts'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"5\" class=\"leftlean\">{{ayT 'Name'}} &amp; {{ayT 'UserType'}} </th>\n          <th colspan=\"2\">{{ayT 'LastLogin'}}</th>\n          <th colspan=\"2\">{{ayT 'UserPhone1'}}</th>\n          <th colspan=\"2\">{{ayT 'UserEmailAddress'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"2\">{{Name}}</td>\n          <!-- below line is example of nested #if / else / #if / else statements - note the TWO /if's at the end to close the two #ifs -->\n          {{#if CustomerViz}}<td colspan=\"3\">Customer: {{CustomerViz}}</td>{{else}} {{#if HeadOfficeViz}}<td colspan=\"3\">Headoffice: {{HeadOfficeViz}}</td>{{else}}<td colspan=\"3\">Employee: {{UserTypeViz}}</td>{{/if}}{{/if}}\n          <td colspan=\"2\">{{ayDateTime LastLogin}}</td>\n          <td colspan=\"2\">{{UserOptions.Phone1}}</td>\n          <td colspan=\"2\">{{UserOptions.EmailAddress}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"UserList\", \"Contacts\", \"UserType\", \"Contact\", \"Name\", \"Customer\", \"HeadOffice\", \"User\", \"LastLogin\", \"UserPhone1\", \"UserEmailAddress\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Contacts list","Active":true,"Notes":"HTML example of using multiple nested #if  else statements for display of value","Roles":50538,"AType":3,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'UserList'}} &amp; {{ayT 'Contacts'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"5\" class=\"leftlean\">{{ayT 'Name'}} &amp; {{ayT 'UserType'}} </th>\n          <th colspan=\"2\">{{ayT 'LastLogin'}}</th>\n          <th colspan=\"2\">{{ayT 'UserPhone1'}}</th>\n          <th colspan=\"2\">{{ayT 'UserEmailAddress'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"11\">&nbsp;</td>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"2\">{{Name}}</td>\n          <!-- below line is example of nested #if / else / #if / else statements - note the TWO /if's at the end to close the two #ifs -->\n          {{#if CustomerViz}}<td colspan=\"3\">Customer: {{CustomerViz}}</td>{{else}} {{#if HeadOfficeViz}}<td colspan=\"3\">Headoffice: {{HeadOfficeViz}}</td>{{else}}<td colspan=\"3\">Employee: {{UserTypeViz}}</td>{{/if}}{{/if}}\n          <td colspan=\"2\">{{ayDateTime LastLogin}}</td>\n          <td colspan=\"2\">{{UserOptions.Phone1}}</td>\n          <td colspan=\"2\">{{UserOptions.EmailAddress}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"UserList\", \"Contacts\", \"UserType\", \"Contact\", \"Name\", \"Customer\", \"HeadOffice\", \"User\", \"LastLogin\", \"UserPhone1\", \"UserEmailAddress\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Customer Invoice.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Customer Invoice.ayrt
index 5c48b12f..3c715013 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Customer Invoice.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Customer Invoice.ayrt	
@@ -1 +1 @@
-{"Name":"Customer Invoice","Active":true,"Notes":"Displays small logo if present. Displays digital Signature fields if present. Heading and Signature lines display once per WO regardless number of pages for the work order. \nPrepare functions to derive nets and grand totals\n","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table class=\"singlePage\">\n      <!-- the css to start a new page when a new object - i.e.  work order -->\n\n\n      <tbody>\n        {{#if ../ayServerMetaData.HasSmallLogo}} <!-- this displays if have uploaded small logo -->\n        <tr style=\"background-color:white\">\n          <td colspan=\"12\">{{ ayLogo \"small\" }}</td>\n          <td colspan=\"4\" class=\"rightlean\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"16\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{myDate ServiceDate}}</td>\n        </tr>\n\n        {{else}}  <!-- else this displays if have do NOT have small logo -->\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\"class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <td colspan=\"4\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyPostAddress}} {{../ayServerMetaData.CompanyPostCity}}</th>\n          <td colspan=\"4\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{myDate ServiceDate}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}  <!-- this closes this if/else statement -->\n\n        \n        <tr style=\"background-color:white\">\n          <th colspan=\"5\">Service performed for</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean \">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"1\"></th>\n          <td colspan=\"11\"class=\"reporttitle\">{{CustomerViz}}</td>\n          <th colspan=\"8\" class=\"rightlean\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{CustomerReferenceNumber}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{PostAddress}}, {{PostCity}} {{PostCode}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}}</th>\n          <td colspan=\"20\">{{Notes}} </td>\n        </tr>\n        {{#each Units}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"12\">&nbsp;</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Expenses}}\n        {{#if ChargeToCustomer}}\n        <tr>\n          <!-- note the encompassing #each statement which only does this IF ChargeToCustomer is true-->\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\"> {{ayT 'WorkOrderItemExpenses'}}: {{Name}}</td>\n          <!-- note too the custom Prepare function that WILL NOT include Expense charges in the Net Totals and Grand Total IF ChargeToCustomer is false -->\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency ChargeAmount}}</td>\n          <!--this is the \"net\" charge -->\n          <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\"> </td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n          <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n        </tr>{{else}} <tr>\n          <td colspan=\"24\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}} at no charge to customer </td>\n        </tr>{{/if}}\n        {{/each}}\n        {{#each Loans}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLoanList'}}: {{LoanUnitViz}} / {{UnitOfMeasureViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency 0.00}}</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLabors'}} performed {{ayDateTime ServiceStartDate}} with {{ayT 'WorkOrderItemLaborServiceRateID'}} of {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Travels}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemTravels'}} performed {{ayDate TravelStartDate}} with {{ayT 'WorkOrderItemTravelServiceRateID'}} of {{TravelRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each OutsideServices}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{ayT 'WorkOrderItemOutsideService'}} performed on Unit: {{UnitViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <!-- <th colspan=\"2\">Nets</th>\n          <th colspan=\"2\">Labor</th>\n          <th colspan=\"2\">Travel</th>\n          <th colspan=\"2\">Parts</th>\n          <th colspan=\"2\">Exp</th>\n          <th colspan=\"2\">Loans</th>\n          <th colspan=\"2\">Outside</th> uncomment and replace th below if you wish to show subtotals broken out-->\n          <th colspan=\"14\" class=\"centerlean\"></th>\n          <th colspan=\"3\" class=\"centerlean\">Total Nets</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxA</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxB</th>\n          <th colspan=\"3\" class=\"rightlean \">Grand Total</th>\n        </tr>\n        <tr>\n          <!-- <td colspan=\"2\"></td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllPartsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLoansNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td> uncomment and replace td below if you wish to show subtotals broken out-->\n           <td colspan=\"14\"></td>\n          <td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisWOTotalNets}}</td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"centerlean \">Thank you for your business!</th>\n          <th colspan=\"12\" class=\"centerlean \">Terms: Net 30 days</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"24\" class=\"centerlean \">I acknowledge the satisfactory provision and completion of the above for {{ayT 'WorkOrderServiceNumber'}} {{Serial}}</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          {{#if CustomerSignature}}<th colspan=\"3\">Digital {{ayT 'CustomerSignature'}}</th>{{else}} <th colspan=\"3\">{{ayT 'CustomerSignature'}}</th> {{/if}}\n          {{#if CustomerSignature}}<th colspan=\"5\"> <img src=\"{{CustomerSignature}}\" height=\"40px\"/> </th>{{else}} <th colspan=\"5\">___________________</th> {{/if}}\n\n          {{#if CustomerSignatureCaptured}}<th colspan=\"3\">Digital Signature Date</th>{{else}} <th colspan=\"3\">Signature Date</th> {{/if}}\n          {{#if CustomerSignatureCaptured}}<th colspan=\"5\">{{ayDateTime CustomerSignatureCaptured}}</th>{{else}}<th colspan=\"5\">____________________</th> {{/if}}\n\n          {{#if CustomerSignatureName}}<th colspan=\"3\">Digital Print of Name</th>{{else}} <th colspan=\"3\">Print of Name</th> {{/if}}\n          {{#if CustomerSignatureName}}<th colspan=\"5\">{{CustomerSignatureName}}</th>{{else}} <th colspan=\"5\">____________________</th> {{/if}}\n        </tr>\n\n      </tbody>\n\n\n    </table>\n\n\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":"/* if not using a rule set or specific property it is recommended to comment out or delete fully for report performance*/\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderInvoiceNumber\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"WorkOrderCustomerReferenceNumber\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"WorkOrderItemExpenses\", \"WorkOrderItemLoanList\", \"WorkOrderItemPartPartID\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemTravels\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemOutsideService\", \"CustomerSignature\" ]);\n\n\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Customer Invoice","Active":true,"Notes":"Displays small logo if present. Displays digital Signature fields if present. Heading and Signature lines display once per WO regardless number of pages for the work order. \nPrepare functions to derive nets and grand totals\n","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table class=\"singlePage\">\n      <!-- the css to start a new page when a new object - i.e.  work order -->\n\n\n      <tbody>\n        {{#if ../ayServerMetaData.HasSmallLogo}} <!-- this displays if have uploaded small logo -->\n        <tr style=\"background-color:white\">\n          <td colspan=\"12\">{{ ayLogo \"small\" }}</td>\n          <td colspan=\"4\" class=\"rightlean\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"16\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{myDate ServiceDate}}</td>\n        </tr>\n\n        {{else}}  <!-- else this displays if have do NOT have small logo -->\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\"class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <td colspan=\"4\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyPostAddress}} {{../ayServerMetaData.CompanyPostCity}}</th>\n          <td colspan=\"4\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{myDate ServiceDate}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}  <!-- this closes this if/else statement -->\n\n        \n        <tr style=\"background-color:white\">\n          <th colspan=\"5\">Service performed for</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean \">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"1\"></th>\n          <td colspan=\"11\"class=\"reporttitle\">{{CustomerViz}}</td>\n          <th colspan=\"8\" class=\"rightlean\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{CustomerReferenceNumber}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{PostAddress}}, {{PostCity}} {{PostCode}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}}</th>\n          <td colspan=\"20\">{{Notes}} </td>\n        </tr>\n        {{#each Units}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"12\">&nbsp;</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Expenses}}\n        {{#if ChargeToCustomer}}\n        <tr>\n          <!-- note the encompassing #each statement which only does this IF ChargeToCustomer is true-->\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\"> {{ayT 'WorkOrderItemExpenses'}}: {{Name}}</td>\n          <!-- note too the custom Prepare function that WILL NOT include Expense charges in the Net Totals and Grand Total IF ChargeToCustomer is false -->\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency ChargeAmount}}</td>\n          <!--this is the \"net\" charge -->\n          <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\"> </td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n          <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n        </tr>{{else}} <tr>\n          <td colspan=\"24\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}} at no charge to customer </td>\n        </tr>{{/if}}\n        {{/each}}\n        {{#each Loans}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLoanList'}}: {{LoanUnitViz}} / {{UnitOfMeasureViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency 0.00}}</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLabors'}} performed {{ayDateTime ServiceStartDate}} with {{ayT 'WorkOrderItemLaborServiceRateID'}} of {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Travels}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemTravels'}} performed {{ayDate TravelStartDate}} with {{ayT 'WorkOrderItemTravelServiceRateID'}} of {{TravelRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each OutsideServices}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{ayT 'WorkOrderItemOutsideService'}} performed on Unit: {{UnitViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <!-- <th colspan=\"2\">Nets</th>\n          <th colspan=\"2\">Labor</th>\n          <th colspan=\"2\">Travel</th>\n          <th colspan=\"2\">Parts</th>\n          <th colspan=\"2\">Exp</th>\n          <th colspan=\"2\">Loans</th>\n          <th colspan=\"2\">Outside</th> uncomment and replace th below if you wish to show subtotals broken out-->\n          <th colspan=\"14\" class=\"centerlean\"></th>\n          <th colspan=\"3\" class=\"centerlean\">Total Nets</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxA</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxB</th>\n          <th colspan=\"3\" class=\"rightlean \">Grand Total</th>\n        </tr>\n        <tr>\n          <!-- <td colspan=\"2\"></td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllPartsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLoansNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td> uncomment and replace td below if you wish to show subtotals broken out-->\n           <td colspan=\"14\"></td>\n          <td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisWOTotalNets}}</td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"centerlean \">Thank you for your business!</th>\n          <th colspan=\"12\" class=\"centerlean \">Terms: Net 30 days</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"24\" class=\"centerlean \">I acknowledge the satisfactory provision and completion of the above for {{ayT 'WorkOrderServiceNumber'}} {{Serial}}</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          {{#if CustomerSignature}}<th colspan=\"3\">Digital {{ayT 'CustomerSignature'}}</th>{{else}} <th colspan=\"3\">{{ayT 'CustomerSignature'}}</th> {{/if}}\n          {{#if CustomerSignature}}<th colspan=\"5\"> <img src=\"{{CustomerSignature}}\" height=\"40px\"/> </th>{{else}} <th colspan=\"5\">___________________</th> {{/if}}\n\n          {{#if CustomerSignatureCaptured}}<th colspan=\"3\">Digital Signature Date</th>{{else}} <th colspan=\"3\">Signature Date</th> {{/if}}\n          {{#if CustomerSignatureCaptured}}<th colspan=\"5\">{{ayDateTime CustomerSignatureCaptured}}</th>{{else}}<th colspan=\"5\">____________________</th> {{/if}}\n\n          {{#if CustomerSignatureName}}<th colspan=\"3\">Digital Print of Name</th>{{else}} <th colspan=\"3\">Print of Name</th> {{/if}}\n          {{#if CustomerSignatureName}}<th colspan=\"5\">{{CustomerSignatureName}}</th>{{else}} <th colspan=\"5\">____________________</th> {{/if}}\n        </tr>\n\n      </tbody>\n\n\n    </table>\n\n\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderInvoiceNumber\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"WorkOrderCustomerReferenceNumber\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"WorkOrderItemExpenses\", \"WorkOrderItemLoanList\", \"WorkOrderItemPartPartID\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemTravels\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemOutsideService\", \"CustomerSignature\" ]);\n\n\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Customer Notes.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Customer Notes.ayrt
index fc05f1d1..ca75eca2 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Customer Notes.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Customer Notes.ayrt	
@@ -1 +1 @@
-{"Name":"Customer Notes","Active":true,"Notes":"Uses custom Prepare ayGroupByKey to group by the customer","Roles":50538,"AType":59,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <table>\n      {{#each ayReportData}}\n      <thead>\n\n        <tr>\n          <th colspan=\"5\" class=\"leftlean\">{{ayT 'CustomerNoteList'}} for {{ayT 'Customer'}}:</th>\n          <td colspan=\"10\">{{group}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"15\">&nbsp;</th>\n        </tr>\n        <tr>\n          <th colspan=\"3\">Who entered:</th>\n          <th colspan=\"3\">{{ayT 'CustomerNoteNoteDate'}}</th>\n          <th colspan=\"3\">{{ayT 'Tags'}}</th>\n          <th colspan=\"6\">{{ayT 'CustomerNoteList'}}</th>\n        </tr>\n        <tr>\n          <th colspan=\"15\">&nbsp;</th>\n        <tr>\n      </thead>\n\n      <tbody>\n\n        {{#each items}}\n\n        <tr>\n          <td colspan=\"3\">{{UserViz}}</td>\n          <td colspan=\"3\">{{ayDateTime NoteDate}}</td>\n          <td colspan=\"3\">{{Tags}}</td>\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n      {{/each}}\n    </table>\n\n    <!--  <p> uncomment to see the raw data returned from the custom Prepare </p>\n    <div>\n   <p>{{ayJSON ayReportData}} </p>\n    </div> -->\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"CustomerNoteNotes\", \"CustomerNoteList\", \"Customer\", \"CustomerNoteNoteDate\", \"Tags\" ]);\n\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'CustomerViz')\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Customer Notes","Active":true,"Notes":"Uses custom Prepare ayGroupByKey to group by the customer","Roles":50538,"AType":59,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <table>\n      {{#each ayReportData}}\n      <thead>\n\n        <tr>\n          <th colspan=\"5\" class=\"leftlean\">{{ayT 'CustomerNoteList'}} for {{ayT 'Customer'}}:</th>\n          <td colspan=\"10\">{{group}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"15\">&nbsp;</th>\n        </tr>\n        <tr>\n          <th colspan=\"3\">Who entered:</th>\n          <th colspan=\"3\">{{ayT 'CustomerNoteNoteDate'}}</th>\n          <th colspan=\"3\">{{ayT 'Tags'}}</th>\n          <th colspan=\"6\">{{ayT 'CustomerNoteList'}}</th>\n        </tr>\n        <tr>\n          <th colspan=\"15\">&nbsp;</th>\n        <tr>\n      </thead>\n\n      <tbody>\n\n        {{#each items}}\n\n        <tr>\n          <td colspan=\"3\">{{UserViz}}</td>\n          <td colspan=\"3\">{{ayDateTime NoteDate}}</td>\n          <td colspan=\"3\">{{Tags}}</td>\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n      {{/each}}\n    </table>\n\n    <!--  <p> uncomment to see the raw data returned from the custom Prepare </p>\n    <div>\n   <p>{{ayJSON ayReportData}} </p>\n    </div> -->\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"CustomerNoteNotes\", \"CustomerNoteList\", \"Customer\", \"CustomerNoteNoteDate\", \"Tags\" ]);\n\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'CustomerViz')\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Customer Quote.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Customer Quote.ayrt
index 0f977d4a..dbcbf977 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Customer Quote.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Customer Quote.ayrt	
@@ -1 +1 @@
-{"Name":"Customer Quote","Active":true,"Notes":"\n","Roles":49514,"AType":27,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table>\n      <!-- the css to start a new page when a new object -->\n      <thead>\n        <!--table header will repeat on multiple pages if total thead content is less than 25% of page - IF NOT SHOWING ON 2nd PAGE of WO, is because is too high - note css -->\n\n        {{#if ../ayServerMetaData.HasSmallLogo}}\n        <!-- this displays if have uploaded small logo -->\n        <tr class=\"reporttitle\">\n          <th colspan=\"12\" class=\"leftlean\">{{ ayLogo \"small\" }}</th>\n          <th colspan=\"4\"></th>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'Quote'}}</th>\n          <td colspan=\"4\"> {{Serial}}</td>\n        </tr>\n        {{else}}\n        <!-- else this displays if have do NOT have small logo -->\n        <tr class=\"reporttitle\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <th colspan=\"4\"></th>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'Quote'}}</th>\n          <td colspan=\"4\">{{Serial}}</td>\n        </tr>\n        {{/if}}\n        <!-- this closes this if/else statement -->\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"24\" class=\"leftlean\">{{ayT 'Quote'}} prepared for:</th>\n        </tr>\n        <tr class=\"reporttitle\">\n          <td colspan=\"1\"></td>\n          <td colspan=\"23\">{{CustomerViz}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{Address}}, {{City}}</td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuotePreparedByID'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{PreparedByViz}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{CustomerPhone1Viz}}</td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{CustomerReferenceNumber}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{CustomerEmailAddressViz}}</td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderInternalReferenceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{InternalReferenceNumber}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT \"QuoteQuoteRequestDate\"}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate Requested}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderSummary'}}</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuoteDateSubmitted'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate Submitted}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{Notes}} </td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuoteValidUntilDate'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate ValidUntil}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'QuoteIntroduction'}}</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuoteDateApproved'}} </th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate Approved}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"23\">{{Introduction}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}} &#35;{{Sequence}}</th>\n          <td colspan=\"20\">{{Notes}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemTechNotes'}}</th>\n          <td colspan=\"20\">{{TechNotes}}</td>\n        </tr>\n\n        {{#each Units}}\n        <tr>\n          <td colspan=\"1\"></td>\n          <th colspan=\"3\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n        {{#if Units}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}\n\n        <tr>\n          <td colspan=\"1\"></td>\n          <th colspan=\"11\" class=\"leftlean\">{{ayT 'WorkOrderItemList'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\"></td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLaborServiceRateID'}}: {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n\n        {{#if Labors}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}\n\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\"></td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n\n        {{#if Parts}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}\n\n        {{/each}}\n      </tbody>\n    </table>\n\n    <table class=\"singlePage\">\n      <tfoot>\n        <!--footer ONLY displays on last page for each workorder because it is within its own table.  if want to display on each page of multi-page workorder, move tfoot back up within the above table and edit above table with class=\"singlePage\" -->\n\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr>\n          <th colspan=\"12\"></th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"1\"></th>\n          <th colspan=\"2\" class=\"centerlean\">{{ayT 'TaxCodeTaxA'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"2\" class=\"centerlean\">{{ayT 'TaxCodeTaxB'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"3\" class=\"rightlean \"> {{ayT 'Quote'}} {{ayT 'Total'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"12\"></td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllPartsNetViz}}</td>\n          <td colspan=\"1\"></td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"24\">Thank you for your business!</th>\n        </tr>\n        <tr>\n          <th colspan=\"24\">If any questions about this price quote, please contact {{../ayServerMetaData.CompanyPhone1}} referencing {{ayT 'Quote'}} {{Serial}}</th>\n        </tr>\n      </tfoot>\n    </table>\n\n    {{/each}}\n\n  </div>\n</body>\n\n</html>","Style":"/* if not using a rule set or specific property it is recommended to comment out or delete fully for report performance*/\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 8pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n.fontpurple {\n  color: purple;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData) { \n\t//this function (if present) is called with the report data   \n\t//before the report is rendered \n\t//modify data as required here and return it to change the data before the report renders  \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"WorkOrderItemParts\", \"WorkOrderItemLabors\", \"WorkOrderItemList\", \"QuoteIntroduction\", \"WorkOrderSummary\", \"QuotePreparedByID\", \"WorkOrderInternalReferenceNumber\", \"WorkOrderCustomerReferenceNumber\", \"QuoteDateSubmitted\", \"QuoteDateApproved\", \"QuoteValidUntilDate\", \"QuoteQuoteRequestDate\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemTechNotes\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"Total\", \"WorkOrderItemPartPartID\", \"WorkOrderItemLaborServiceRateID\"]);\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this quote so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this quote so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\n\n\t//below declares a key on the entire wo to hold ALL of THIS quote's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS quote's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS quote's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS quote's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS quote in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS quote in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS quote in this report data\n          \t      \t\t}\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS quote in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS quote in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS quote in this report data\n          \t      \t\t}\t\t\t\n\t\t\t}\n\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Customer Quote","Active":true,"Notes":"\n","Roles":49514,"AType":27,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table>\n      <!-- the css to start a new page when a new object -->\n      <thead>\n        <!--table header will repeat on multiple pages if total thead content is less than 25% of page - IF NOT SHOWING ON 2nd PAGE of WO, is because is too high - note css -->\n\n        {{#if ../ayServerMetaData.HasSmallLogo}}\n        <!-- this displays if have uploaded small logo -->\n        <tr class=\"reporttitle\">\n          <th colspan=\"12\" class=\"leftlean\">{{ ayLogo \"small\" }}</th>\n          <th colspan=\"4\"></th>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'Quote'}}</th>\n          <td colspan=\"4\"> {{Serial}}</td>\n        </tr>\n        {{else}}\n        <!-- else this displays if have do NOT have small logo -->\n        <tr class=\"reporttitle\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <th colspan=\"4\"></th>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'Quote'}}</th>\n          <td colspan=\"4\">{{Serial}}</td>\n        </tr>\n        {{/if}}\n        <!-- this closes this if/else statement -->\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"24\" class=\"leftlean\">{{ayT 'Quote'}} prepared for:</th>\n        </tr>\n        <tr class=\"reporttitle\">\n          <td colspan=\"1\"></td>\n          <td colspan=\"23\">{{CustomerViz}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{Address}}, {{City}}</td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuotePreparedByID'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{PreparedByViz}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{CustomerPhone1Viz}}</td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{CustomerReferenceNumber}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{CustomerEmailAddressViz}}</td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'WorkOrderInternalReferenceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{InternalReferenceNumber}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT \"QuoteQuoteRequestDate\"}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate Requested}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderSummary'}}</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuoteDateSubmitted'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate Submitted}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{Notes}} </td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuoteValidUntilDate'}}</th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate ValidUntil}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'QuoteIntroduction'}}</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean\">{{ayT 'QuoteDateApproved'}} </th>\n          <td colspan=\"4\" class=\"rightlean\">{{ayDate Approved}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"23\">{{Introduction}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}} &#35;{{Sequence}}</th>\n          <td colspan=\"20\">{{Notes}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemTechNotes'}}</th>\n          <td colspan=\"20\">{{TechNotes}}</td>\n        </tr>\n\n        {{#each Units}}\n        <tr>\n          <td colspan=\"1\"></td>\n          <th colspan=\"3\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n        {{#if Units}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}\n\n        <tr>\n          <td colspan=\"1\"></td>\n          <th colspan=\"11\" class=\"leftlean\">{{ayT 'WorkOrderItemList'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\"></td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLaborServiceRateID'}}: {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n\n        {{#if Labors}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}\n\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\"></td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n\n        {{#if Parts}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}\n\n        {{/each}}\n      </tbody>\n    </table>\n\n    <table class=\"singlePage\">\n      <tfoot>\n        <!--footer ONLY displays on last page for each workorder because it is within its own table.  if want to display on each page of multi-page workorder, move tfoot back up within the above table and edit above table with class=\"singlePage\" -->\n\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr>\n          <th colspan=\"12\"></th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"1\"></th>\n          <th colspan=\"2\" class=\"centerlean\">{{ayT 'TaxCodeTaxA'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"2\" class=\"centerlean\">{{ayT 'TaxCodeTaxB'}} {{ayT 'NetValue'}}</th>\n          <th colspan=\"3\" class=\"rightlean \"> {{ayT 'Quote'}} {{ayT 'Total'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"12\"></td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllPartsNetViz}}</td>\n          <td colspan=\"1\"></td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"24\">Thank you for your business!</th>\n        </tr>\n        <tr>\n          <th colspan=\"24\">If any questions about this price quote, please contact {{../ayServerMetaData.CompanyPhone1}} referencing {{ayT 'Quote'}} {{Serial}}</th>\n        </tr>\n      </tfoot>\n    </table>\n\n    {{/each}}\n\n  </div>\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 8pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n.fontpurple {\n  color: purple;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData) { \n\t//this function (if present) is called with the report data   \n\t//before the report is rendered \n\t//modify data as required here and return it to change the data before the report renders  \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"WorkOrderItemParts\", \"WorkOrderItemLabors\", \"WorkOrderItemList\", \"QuoteIntroduction\", \"WorkOrderSummary\", \"QuotePreparedByID\", \"WorkOrderInternalReferenceNumber\", \"WorkOrderCustomerReferenceNumber\", \"QuoteDateSubmitted\", \"QuoteDateApproved\", \"QuoteValidUntilDate\", \"QuoteQuoteRequestDate\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemTechNotes\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"Total\", \"WorkOrderItemPartPartID\", \"WorkOrderItemLaborServiceRateID\"]);\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this quote so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this quote so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\n\n\t//below declares a key on the entire wo to hold ALL of THIS quote's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS quote's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS quote's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS quote's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS quote in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS quote in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS quote in this report data\n          \t      \t\t}\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS quote in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS quote in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS quote in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS quote in this report data\n          \t      \t\t}\t\t\t\n\t\t\t}\n\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Customer Work Order.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Customer Work Order.ayrt
index a13c729f..9e7bb28d 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Customer Work Order.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Customer Work Order.ayrt	
@@ -1 +1 @@
-{"Name":"Customer Work Order","Active":true,"Notes":"Displays small logo if present else displays company name and address as entered in Global Settings. Displays digital Signature fields if present. Heading and Signature lines display once per WO regardless number of pages for the work order. \nPrepare functions to derive nets and grand totals\n","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table class=\"singlePage\">\n      <!-- the css to start a new page when a new object - i.e.  work order -->\n      <!-- note - if DO want aspects to repeat on subsequent pages, place within thead -->\n\n      <tbody>\n        {{#if ../ayServerMetaData.HasSmallLogo}} <!-- this displays if have uploaded small logo -->\n        <tr style=\"background-color:white\">\n          <td colspan=\"12\">{{ ayLogo \"small\" }}</td>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\"></td>\n        </tr>\n\n        {{else}}  <!-- else this displays if do NOT have small logo -->\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\"class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyPostAddress}} {{../ayServerMetaData.CompanyPostCity}}</th>\n          <td colspan=\"12\"></td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}  <!-- this closes this if/else statement -->\n\n        \n        <tr style=\"background-color:white\">\n          <th colspan=\"5\">Service performed for</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean \">Printed Date</th>\n          <td colspan=\"4\" class=\"rightlean\">{{todaysMonthDDYYYYDate}}</td>\n          \n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"1\"></th>\n          <td colspan=\"11\"class=\"reporttitle\">{{CustomerViz}}</td>\n          <th colspan=\"12\" class=\"rightlean\"></th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{Address}}, {{City}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{CustomerPhone1Viz}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"8\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"8\" class=\"centerlean\">{{myDate ServiceDate}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{CustomerReferenceNumber}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}}</th>\n          <td colspan=\"20\">{{Notes}} </td>\n        </tr>\n        {{#each Units}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"12\">&nbsp;</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Expenses}}\n        {{#if ChargeToCustomer}}\n        <tr>\n          <!-- note the encompassing #each statement which only does this IF ChargeToCustomer is true-->\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}}</td>\n          <!-- note too the custom Prepare function that WILL NOT include Expense charges in the Net Totals and Grand Total IF ChargeToCustomer is false -->\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency ChargeAmount}}</td>\n          <!--this is the \"net\" charge -->\n          <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\"> </td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n          <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n        </tr>{{else}} <tr>\n          <td colspan=\"24\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}} at no charge to customer </td>\n        </tr>{{/if}}\n        {{/each}}\n        {{#each Loans}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLoanList'}}: {{LoanUnitViz}} / {{UnitOfMeasureViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency 0.00}}</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLabors'}} performed {{ayDateTime ServiceStartDate}} with {{ayT 'WorkOrderItemLaborServiceRateID'}} of {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if ServiceDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemLaborServiceDetails'}}:</th>\n          <td colspan=\"19\">{{ServiceDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if Serials}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"23\">{{ayT 'WorkOrderItemPartPartID'}} {{ayT 'WorkOrderItemPartPartSerialID'}}: {{Serials}}</td>\n        </tr>\n          {{else}}{{/if}}\n        {{/each}}\n        {{#each Travels}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemTravels'}} performed {{ayDate TravelStartDate}} with {{ayT 'WorkOrderItemTravelServiceRateID'}} of {{TravelRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if TravelDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemTravelDetails'}}:</th>\n          <td colspan=\"19\">{{TravelDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each OutsideServices}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{ayT 'WorkOrderItemOutsideService'}} performed on Unit: {{UnitViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/each}}\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <!-- <th colspan=\"2\">Nets</th>\n          <th colspan=\"2\">Labor</th>\n          <th colspan=\"2\">Travel</th>\n          <th colspan=\"2\">Parts</th>\n          <th colspan=\"2\">Exp</th>\n          <th colspan=\"2\">Loans</th>\n          <th colspan=\"2\">Outside</th> uncomment and replace th below if you wish to show subtotals broken out-->\n          <th colspan=\"14\" class=\"centerlean\"></th>\n          <th colspan=\"3\" class=\"centerlean\">Total Nets</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxA</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxB</th>\n          <th colspan=\"3\" class=\"rightlean \">Grand Total</th>\n        </tr>\n        <tr>\n          <!-- <td colspan=\"2\"></td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllPartsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLoansNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td> uncomment and replace td below if you wish to show subtotals broken out-->\n           <td colspan=\"14\"></td>\n          <td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisWOTotalNets}}</td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"centerlean \">Thank you for your business!</th>\n          <th colspan=\"12\" class=\"centerlean \">Terms: Net 30 days</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"24\" class=\"centerlean \">I acknowledge the satisfactory provision and completion of the above for {{ayT 'WorkOrderServiceNumber'}} {{Serial}}</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          {{#if CustomerSignature}}<th colspan=\"3\">Digital {{ayT 'CustomerSignature'}}</th>{{else}} <th colspan=\"3\">{{ayT 'CustomerSignature'}}</th> {{/if}}\n          {{#if CustomerSignature}}<th colspan=\"5\"> <img src=\"{{CustomerSignature}}\" height=\"40px\"/> </th>{{else}} <th colspan=\"5\">___________________</th> {{/if}}\n\n          {{#if CustomerSignatureCaptured}}<th colspan=\"3\">Digital Signature Date</th>{{else}} <th colspan=\"3\">Signature Date</th> {{/if}}\n          {{#if CustomerSignatureCaptured}}<th colspan=\"5\">{{ayDateTime CustomerSignatureCaptured}}</th>{{else}}<th colspan=\"5\">____________________</th> {{/if}}\n\n          {{#if CustomerSignatureName}}<th colspan=\"3\">Digital Print of Name</th>{{else}} <th colspan=\"3\">Print of Name</th> {{/if}}\n          {{#if CustomerSignatureName}}<th colspan=\"5\">{{CustomerSignatureName}}</th>{{else}} <th colspan=\"5\">____________________</th> {{/if}}\n        </tr>\n\n      </tbody>\n       <!-- note - if DO want summary area such as totals or signature to repeat on subsequent pages, place within tfoot -->\n\n    </table>\n\n\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":"/* if not using a rule set or specific property it is recommended to comment out or delete fully for report performance*/\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderInvoiceNumber\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"WorkOrderCustomerReferenceNumber\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"WorkOrderItemExpenses\", \"WorkOrderItemLoanList\", \"WorkOrderItemPartPartID\", \"WorkOrderItemPartPartSerialID\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemTravels\", \"WorkOrderItemTravelDetails\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemOutsideService\", \"CustomerSignature\" ]);\n\n\t//below checks if any parts have Serials to remove carriage returns so parts serials display on same line\n    for (EachWO of reportData.ayReportData) {\n        for (Item of EachWO.Items) {\n            for (Part of Item.Parts) {\n                if (Part.Serials != null) {\n                    s = Part.Serials;                    \n                    Part.Serials = s.replace(/[\\n\\r]+/g, ' ');\n                }\n            }\n        }\n    }\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Customer Work Order","Active":true,"Notes":"Displays small logo if present else displays company name and address as entered in Global Settings. Displays digital Signature fields if present. Heading and Signature lines display once per WO regardless number of pages for the work order. \nPrepare functions to derive nets and grand totals\n","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table class=\"singlePage\">\n      <!-- the css to start a new page when a new object - i.e.  work order -->\n      <!-- note - if DO want aspects to repeat on subsequent pages, place within thead -->\n\n      <tbody>\n        {{#if ../ayServerMetaData.HasSmallLogo}} <!-- this displays if have uploaded small logo -->\n        <tr style=\"background-color:white\">\n          <td colspan=\"12\">{{ ayLogo \"small\" }}</td>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\"></td>\n        </tr>\n\n        {{else}}  <!-- else this displays if do NOT have small logo -->\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\"class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyPostAddress}} {{../ayServerMetaData.CompanyPostCity}}</th>\n          <td colspan=\"12\"></td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/if}}  <!-- this closes this if/else statement -->\n\n        \n        <tr style=\"background-color:white\">\n          <th colspan=\"5\">Service performed for</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean \">Printed Date</th>\n          <td colspan=\"4\" class=\"rightlean\">{{todaysMonthDDYYYYDate}}</td>\n          \n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"1\"></th>\n          <td colspan=\"11\"class=\"reporttitle\">{{CustomerViz}}</td>\n          <th colspan=\"12\" class=\"rightlean\"></th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{Address}}, {{City}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{CustomerPhone1Viz}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"8\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"8\" class=\"centerlean\">{{myDate ServiceDate}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{CustomerReferenceNumber}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}}</th>\n          <td colspan=\"20\">{{Notes}} </td>\n        </tr>\n        {{#each Units}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"12\">&nbsp;</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Expenses}}\n        {{#if ChargeToCustomer}}\n        <tr>\n          <!-- note the encompassing #each statement which only does this IF ChargeToCustomer is true-->\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}}</td>\n          <!-- note too the custom Prepare function that WILL NOT include Expense charges in the Net Totals and Grand Total IF ChargeToCustomer is false -->\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency ChargeAmount}}</td>\n          <!--this is the \"net\" charge -->\n          <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\"> </td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n          <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n        </tr>{{else}} <tr>\n          <td colspan=\"24\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}} at no charge to customer </td>\n        </tr>{{/if}}\n        {{/each}}\n        {{#each Loans}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLoanList'}}: {{LoanUnitViz}} / {{UnitOfMeasureViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency 0.00}}</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLabors'}} performed {{ayDateTime ServiceStartDate}} with {{ayT 'WorkOrderItemLaborServiceRateID'}} of {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if ServiceDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemLaborServiceDetails'}}:</th>\n          <td colspan=\"19\">{{ServiceDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if Serials}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"23\">{{ayT 'WorkOrderItemPartPartID'}} {{ayT 'WorkOrderItemPartPartSerialID'}}: {{Serials}}</td>\n        </tr>\n          {{else}}{{/if}}\n        {{/each}}\n        {{#each Travels}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemTravels'}} performed {{ayDate TravelStartDate}} with {{ayT 'WorkOrderItemTravelServiceRateID'}} of {{TravelRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if TravelDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemTravelDetails'}}:</th>\n          <td colspan=\"19\">{{TravelDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each OutsideServices}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{ayT 'WorkOrderItemOutsideService'}} performed on Unit: {{UnitViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/each}}\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <!-- <th colspan=\"2\">Nets</th>\n          <th colspan=\"2\">Labor</th>\n          <th colspan=\"2\">Travel</th>\n          <th colspan=\"2\">Parts</th>\n          <th colspan=\"2\">Exp</th>\n          <th colspan=\"2\">Loans</th>\n          <th colspan=\"2\">Outside</th> uncomment and replace th below if you wish to show subtotals broken out-->\n          <th colspan=\"14\" class=\"centerlean\"></th>\n          <th colspan=\"3\" class=\"centerlean\">Total Nets</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxA</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxB</th>\n          <th colspan=\"3\" class=\"rightlean \">Grand Total</th>\n        </tr>\n        <tr>\n          <!-- <td colspan=\"2\"></td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllPartsNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllLoansNetViz}}</td>\n          <td colspan=\"2\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td> uncomment and replace td below if you wish to show subtotals broken out-->\n           <td colspan=\"14\"></td>\n          <td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisWOTotalNets}}</td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"centerlean \">Thank you for your business!</th>\n          <th colspan=\"12\" class=\"centerlean \">Terms: Net 30 days</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"24\" class=\"centerlean \">I acknowledge the satisfactory provision and completion of the above for {{ayT 'WorkOrderServiceNumber'}} {{Serial}}</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          {{#if CustomerSignature}}<th colspan=\"3\">Digital {{ayT 'CustomerSignature'}}</th>{{else}} <th colspan=\"3\">{{ayT 'CustomerSignature'}}</th> {{/if}}\n          {{#if CustomerSignature}}<th colspan=\"5\"> <img src=\"{{CustomerSignature}}\" height=\"40px\"/> </th>{{else}} <th colspan=\"5\">___________________</th> {{/if}}\n\n          {{#if CustomerSignatureCaptured}}<th colspan=\"3\">Digital Signature Date</th>{{else}} <th colspan=\"3\">Signature Date</th> {{/if}}\n          {{#if CustomerSignatureCaptured}}<th colspan=\"5\">{{ayDateTime CustomerSignatureCaptured}}</th>{{else}}<th colspan=\"5\">____________________</th> {{/if}}\n\n          {{#if CustomerSignatureName}}<th colspan=\"3\">Digital Print of Name</th>{{else}} <th colspan=\"3\">Print of Name</th> {{/if}}\n          {{#if CustomerSignatureName}}<th colspan=\"5\">{{CustomerSignatureName}}</th>{{else}} <th colspan=\"5\">____________________</th> {{/if}}\n        </tr>\n\n      </tbody>\n       <!-- note - if DO want summary area such as totals or signature to repeat on subsequent pages, place within tfoot -->\n\n    </table>\n\n\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderInvoiceNumber\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"WorkOrderCustomerReferenceNumber\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"WorkOrderItemExpenses\", \"WorkOrderItemLoanList\", \"WorkOrderItemPartPartID\", \"WorkOrderItemPartPartSerialID\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemTravels\", \"WorkOrderItemTravelDetails\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemOutsideService\", \"CustomerSignature\" ]);\n\n\t//below checks if any parts have Serials to remove carriage returns so parts serials display on same line\n    for (const EachWO of reportData.ayReportData) {\n        for (const Item of EachWO.Items) {\n            for (const Part of Item.Parts) {\n                if (Part.Serials != null) {\n                    var s = Part.Serials;                    \n                    Part.Serials = s.replace(/[\\n\\r]+/g, ' ');\n                }\n            }\n        }\n    }\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Head Offices list.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Head Offices list.ayrt
index 067b4968..0fb80682 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Head Offices list.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Head Offices list.ayrt	
@@ -1 +1 @@
-{"Name":"Head Offices list","Active":true,"Notes":"","Roles":50538,"AType":15,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'HeadOfficeList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"3\" class=\"leftlean\">{{ayT 'Name'}}</th>\n          <th colspan=\"2\" class=\"leftlean\">{{ayT 'HeadOfficeAccountNumber'}}</th>\n          <th colspan=\"2\">{{ayT 'AddressTypePostal'}}</th>\n          <th colspan=\"2\">{{ayT 'HeadOfficePhone1'}}</th>\n          <th colspan=\"2\">{{ayT 'HeadOfficeEmail'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"3\">{{Name}}</td>\n          <td colspan=\"2\">{{AccountNumber}}</td>\n          <td colspan=\"2\">{{PostAddress}}</td>\n          <td colspan=\"2\">{{Phone1}}</td>\n          <td colspan=\"2\">{{EmailAddress}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Contact\", \"Name\", \"HeadOfficeList\", \"HeadOffice\", \"HeadOfficeAccountNumber\", \"AddressTypePostal\", \"HeadOfficePhone1\", \"HeadOfficeEmail\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Head Offices list","Active":true,"Notes":"","Roles":50538,"AType":15,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'HeadOfficeList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"3\" class=\"leftlean\">{{ayT 'Name'}}</th>\n          <th colspan=\"2\" class=\"leftlean\">{{ayT 'HeadOfficeAccountNumber'}}</th>\n          <th colspan=\"2\">{{ayT 'AddressTypePostal'}}</th>\n          <th colspan=\"2\">{{ayT 'HeadOfficePhone1'}}</th>\n          <th colspan=\"2\">{{ayT 'HeadOfficeEmail'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"3\">{{Name}}</td>\n          <td colspan=\"2\">{{AccountNumber}}</td>\n          <td colspan=\"2\">{{PostAddress}}</td>\n          <td colspan=\"2\">{{Phone1}}</td>\n          <td colspan=\"2\">{{EmailAddress}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Contact\", \"Name\", \"HeadOfficeList\", \"HeadOffice\", \"HeadOfficeAccountNumber\", \"AddressTypePostal\", \"HeadOfficePhone1\", \"HeadOfficeEmail\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Inventory Reconciliation Form Grouped By Warehouse.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Inventory Reconciliation Form Grouped By Warehouse.ayrt
index b6eb9420..1b1719ab 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Inventory Reconciliation Form Grouped By Warehouse.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Inventory Reconciliation Form Grouped By Warehouse.ayrt	
@@ -1 +1 @@
-{"Name":"Inventory Reconciliation Form Grouped By Warehouse","Active":true,"Notes":"Custom Prepare iterates through all the records in the reportData obtaining a running total of ReOrderQty for each group; \nPrepare uses ayGroupByKey to group by PartWarehouseName","Roles":49258,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayServerMetaData.CompanyName}} Inventory Reconciliation Form Grouped By {{ayT 'PartWarehouse'}}</p>\n\t\t</div>\t    \n\n\t\t<table> \n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"8\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'Tags'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartByWarehouseInventoryQuantityOnHand'}}</th>\n\t\t\t\t\t<th colspan=\"2\">Actual Count</th>\n\t\t\t\t\t<th colspan=\"2\">Difference + / (-)</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" >{{ayT 'PartWarehouse'}}:&nbsp;</th>\n\t\t\t\t\t<td colspan=\"20\">&nbsp;&nbsp;&nbsp;{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t\t{{#each items}}\n\t\t\t\t\t<tr>\n\t\t\t\t\t\t<td colspan=\"3\"></td>\n\t\t\t\t\t\t<td colspan=\"8\" class=\"centerlean\">{{PartName}}</td>\n\t\t\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{PartTags}}</td>\n\t\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency PartRetail}}</td>\n\t\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{OnHandQty}}</td>\t\t\t\t\t\n\t\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">{{count}} different parts in {{ayT 'PartWarehouse'}} {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">Total {{ayT 'PartByWarehouseInventoryQuantityOnHand'}}  for {{ayT 'PartWarehouse'}} {{group}}:&emsp;{{ThisGroupTotalQty}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\n\t\t\t<tfoot>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"3\">Count By:</td>\n\t\t\t\t<td colspan=\"9\">________________________________________</td>\n\t\t\t\t<td colspan=\"3\" >Count Date:</td>\n\t\t\t\t<td colspan=\"9\">________________________________________</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"3\">Signature:</td>\n\t\t\t\t<td colspan=\"9\">________________________________________</td>\n\t\t\t\t<td colspan=\"12\"></td>\n\t\t\t\t</tr>\n\t\t\t </tfoot>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\ntfoot {\n  border-top: solid 1pt #9e9e9e; \n  height: 30px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'PartWarehouseName')\n\n    await ayGetTranslations([\"PartWarehouse\", \"PartByWarehouseInventoryQuantityOnHand\", \"Tags\", \"PartRetail\", \"Part\" ]);\n\n     //Iterate through all the records in the reportData obtaining a running total of ReOrderQty for each group\n    for (EachGroup of ayData.ayReportData) \n    {  \n         let ThisGroupTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS group\n            for (Item of EachGroup.items)  //Iterate through all the poitems of THIS po adding the Qty amount of each item to the ThisPOTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.OnHandQty != null) \n                {\n                    ThisGroupTotalQty += Item.OnHandQty;\n                }\n                Item.QuantityRunning=ThisGroupTotalQty;\n            }\n        EachGroup.ThisGroupTotalQty=ThisGroupTotalQty;\n\n\n    }\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Inventory Reconciliation Form Grouped By Warehouse","Active":true,"Notes":"Custom Prepare iterates through all the records in the reportData obtaining a running total of ReOrderQty for each group; \nPrepare uses ayGroupByKey to group by PartWarehouseName","Roles":49258,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayServerMetaData.CompanyName}} Inventory Reconciliation Form Grouped By {{ayT 'PartWarehouse'}}</p>\n\t\t</div>\t    \n\n\t\t<table> \n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"8\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'Tags'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartByWarehouseInventoryQuantityOnHand'}}</th>\n\t\t\t\t\t<th colspan=\"2\">Actual Count</th>\n\t\t\t\t\t<th colspan=\"2\">Difference + / (-)</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" >{{ayT 'PartWarehouse'}}:&nbsp;</th>\n\t\t\t\t\t<td colspan=\"20\">&nbsp;&nbsp;&nbsp;{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t\t{{#each items}}\n\t\t\t\t\t<tr>\n\t\t\t\t\t\t<td colspan=\"3\"></td>\n\t\t\t\t\t\t<td colspan=\"8\" class=\"centerlean\">{{PartName}} {{PartDescription}}</td>\n\t\t\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{PartTags}}</td>\n\t\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency PartRetail}}</td>\n\t\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{OnHandQty}}</td>\t\t\t\t\t\n\t\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t</tr>\n\t\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">{{count}} different parts in {{ayT 'PartWarehouse'}} {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">Total {{ayT 'PartByWarehouseInventoryQuantityOnHand'}}  for {{ayT 'PartWarehouse'}} {{group}}:&emsp;{{ThisGroupTotalQty}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\n\t\t\t<tfoot>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"3\">Count By:</td>\n\t\t\t\t<td colspan=\"9\">________________________________________</td>\n\t\t\t\t<td colspan=\"3\" >Count Date:</td>\n\t\t\t\t<td colspan=\"9\">________________________________________</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t<td colspan=\"3\">Signature:</td>\n\t\t\t\t<td colspan=\"9\">________________________________________</td>\n\t\t\t\t<td colspan=\"12\"></td>\n\t\t\t\t</tr>\n\t\t\t </tfoot>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\ntfoot {\n  border-top: solid 1pt #9e9e9e; \n  height: 30px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'PartWarehouseName')\n\n    await ayGetTranslations([\"PartWarehouse\", \"PartByWarehouseInventoryQuantityOnHand\", \"Tags\", \"PartRetail\", \"Part\" ]);\n\n     //Iterate through all the records in the reportData obtaining a running total of ReOrderQty for each group\n    for (const EachGroup of ayData.ayReportData) \n    {  \n         let ThisGroupTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS group\n            for (const Item of EachGroup.items)  //Iterate through all the poitems of THIS po adding the Qty amount of each item to the ThisPOTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.OnHandQty != null) \n                {\n                    ThisGroupTotalQty += Item.OnHandQty;\n                }\n                Item.QuantityRunning=ThisGroupTotalQty;\n            }\n        EachGroup.ThisGroupTotalQty=ThisGroupTotalQty;\n\n\n    }\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Inventory transactions grouped by Part.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Inventory transactions grouped by Part.ayrt
index 5349ce3b..c40e6802 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Inventory transactions grouped by Part.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Inventory transactions grouped by Part.ayrt	
@@ -1 +1 @@
-{"Name":"Inventory transactions grouped by Part","Active":true,"Notes":"","Roles":50538,"AType":67,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'PartInventoryTransactionList'}} grouped by {{ayT 'Part'}}</p>\n\t\t</div>\n\n\t\t<table>\n\t\t\t<thead>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'Part'}}:</th>\n\t\t\t\t\t<td colspan=\"12\"> {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartInventoryTransactionEntryDate'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PartInventoryTransactionDescription'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartWarehouse'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartInventoryTransactionQuantity'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartInventoryBalance'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}<!-- note that this reiteration references the items array generated from the custom Prepare ayGroupByKey rather than referencing the Sample Data  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"2\">{{ayDateTime EntryDate}}</td>\n\t\t\t\t\t<td colspan=\"4\">{{Description}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{PartWarehouseViz}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{Balance}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"14\">&nbsp;</td>\n\t\t\t\t</tr>\n\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\n\t\t\t<tfoot>\n\t\t\t</tfoot>\n\n\t\t</table>\n\n<!-- uncomment if you want to see output of raw data onto the printed output as returned from the Custom Prepare - be advised that doing so may result in a delay due to the number of pages needed to be returned\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"5\">This is a printout of the data returned from the Custom Prepare that this report now uses. Compare against the data that shows in the \"Sample Data\" when editing this report template.</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"5\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n        </table>\n-->\n\n\n\t</div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  padding: 5px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n  text-align: left;\r\n}\r\n\r\ntbody td {\r\n  padding: 5px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}","JsPrerender":"async function ayPrepareData(ayData){      \n\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'PartNameViz')\n\n     await ayGetTranslations([\"PartInventoryTransactionList\", \"PartInventoryTransactionDescription\", \"PartInventoryTransactionEntryDate\", \"PartInventoryTransactionQuantity\", \"PartInventoryBalance\", \"PartWarehouse\", \"Part\" ]);\n\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Inventory transactions grouped by Part","Active":true,"Notes":"","Roles":50538,"AType":67,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'PartInventoryTransactionList'}} grouped by {{ayT 'Part'}}</p>\n\t\t</div>\n\n\t\t<table>\n\t\t\t<thead>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'Part'}}:</th>\n\t\t\t\t\t<td colspan=\"12\"> {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartInventoryTransactionEntryDate'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PartInventoryTransactionDescription'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartWarehouse'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartInventoryTransactionQuantity'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartInventoryBalance'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}<!-- note that this reiteration references the items array generated from the custom Prepare ayGroupByKey rather than referencing the Sample Data  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"2\">{{ayDateTime EntryDate}}</td>\n\t\t\t\t\t<td colspan=\"4\">{{Description}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{PartWarehouseViz}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{Balance}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"14\">&nbsp;</td>\n\t\t\t\t</tr>\n\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\n\t\t\t<tfoot>\n\t\t\t</tfoot>\n\n\t\t</table>\n\n<!-- uncomment if you want to see output of raw data onto the printed output as returned from the Custom Prepare - be advised that doing so may result in a delay due to the number of pages needed to be returned\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"5\">This is a printout of the data returned from the Custom Prepare that this report now uses. Compare against the data that shows in the \"Sample Data\" when editing this report template.</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"5\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n        </table>\n-->\n\n\n\t</div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  padding: 5px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n  text-align: left;\r\n}\r\n\r\ntbody td {\r\n  padding: 5px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}","JsPrerender":"async function ayPrepareData(ayData){      \n\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'PartNameViz');\n\n     await ayGetTranslations([\"PartInventoryTransactionList\", \"PartInventoryTransactionDescription\", \"PartInventoryTransactionEntryDate\", \"PartInventoryTransactionQuantity\", \"PartInventoryBalance\", \"PartWarehouse\", \"Part\" ]);\n\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Labor Billing & Hours Grouped By Technician.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Labor Billing & Hours Grouped By Technician.ayrt
index d7aca232..31ead3b4 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Labor Billing & Hours Grouped By Technician.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Labor Billing & Hours Grouped By Technician.ayrt	
@@ -1 +1 @@
-{"Name":"Labor Billing & Hours Grouped By Technician","Active":true,"Notes":"Custom Prepare to group by the technician, and get running totals of NC, Billable and Actual for grouping AND for all wo records in this report","Roles":51182,"AType":37,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n    <div>\n        <table>\n            <thead>\n                <tr>\n                    <th colspan=\"1\"></th>\n                    <th colspan=\"2\">{{ayT \"WorkOrder\"}}</th>  \n                    <th colspan=\"7\">{{ayT \"WorkOrderItemLaborServiceStartDate\"}} / {{ayT \"WorkOrderItemLaborServiceStopDate\"}} </th>                  \n                    <th colspan=\"3\">{{ayT \"WorkOrderItemLaborServiceRateID\"}}</th>\n                    <th colspan=\"3\">{{ayT \"WorkOrderItemLaborRateCharge\"}}</th>\n                    \n                    <th colspan=\"2\">Actual Total Quantity</th>\n                    <th colspan=\"2\">{{ayT \"WorkOrderItemLaborNoChargeQuantity\"}}</th>\n                    <th colspan=\"2\">{{ayT \"WorkOrderItemLaborServiceRateQuantity\"}}</th>\n                    <th colspan=\"2\">{{ayT \"NetValue\"}}</th>\n                </tr>\n            </thead>\n            <tbody>\n                {{#each ayReportData}}\n                <tr>\n                    <th colspan=\"2\" class=\"leftlean\">{{ayT 'WorkOrderItemLabors'}} for </th>\n                    <td colspan=\"5\">{{group}}</td>\n                    <th colspan=\"17\" class=\"leftlean\"># of labor items: {{count}}</th>\n                </tr>\n                \n                {{#each items}}\n                <tr>\n                    <td colspan=\"1\">&nbsp;</td>\n                    <td colspan=\"2\">{{Serial}}</td> \n                    <td colspan=\"7\">{{ayDateTime ServiceStartDate}} to {{ayDateTime ServiceStopDate}}</td>                   \n                    <td colspan=\"3\">{{ServiceRateViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency PriceViz}} {{UnitOfMeasureViz}}</td>\n                    \n                    <td colspan=\"2\">{{diffHours}}</td>\n                    <td colspan=\"2\">{{NoChargeQuantity}}</td>\n                    <td colspan=\"2\">{{ServiceRateQuantity}}</td>\n                    <td colspan=\"2\">{{ayCurrency NetViz}}</td>\n                </tr>\n                {{/each}}\n                <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"16\" class=\"rightlean\">Total {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}} &#43; {{ayT \"WorkOrderItemLaborNoChargeQuantity\" }} &#61; {{EachGroupWOLaborsNCQtyplusBillableQty}} for {{group}}</th>                    \n                    <td colspan=\"2\">{{EachGroupWOActualHoursQty}}</td>\n                    <td colspan=\"2\">{{EachGroupWOLaborsNCQty}}</td>\n                    <td colspan=\"2\">{{EachGroupWOLaborsBillableQty}}</td>\n                    <td colspan=\"2\">{{ayCurrency EachGroupWOLaborsNetViz}}</td>\n                </tr>\n                <tr>\n                    <td colspan=\"24\">&nbsp;</td>\n                </tr>\n                {{/each}}\n            </tbody>\n        </table>\n\n        <table><!-- footer is in its own table so displays once at end of report-->\n            <tfoot>\n                <tr>\n                    <th colspan=\"4\">&nbsp;</th>\n                    <th colspan=\"4\">Total {{ayT 'WorkOrderItemLabors'}} records</th>\n                    <th colspan=\"4\">Total Combined {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}} &#38; {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}}</th>\n                    <th colspan=\"4\">Total {{ayT \"WorkOrderItemLaborNoChargeQuantity\"}}</th>\n                    <th colspan=\"4\">Total {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}}</th>                    \n                    <th colspan=\"4\">Total {{ayT \"NetValue\"}}</th>\n                </tr>\n                <tr>\n                    <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborsNetViz  -->                    \n                    <td colspan=\"4\">&nbsp;</td>\n                    <td colspan=\"4\">{{AllWOLaborsCount}}</td>\n                    <td colspan=\"4\">{{AllWOLaborsNCQtyplusBillableQty}}</td>\n                    <td colspan=\"4\">{{AllWOLaborsNCQty}}</td>\n                    <td colspan=\"4\">{{AllWOLaborsBillableQty}}</td>                    \n                    <td colspan=\"4\">{{ayCurrency AllWOLaborsNetViz}}</td>\n                </tr>                \n            </tfoot>\n        </table>\n    </div>\n</body>\n\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 14pt; \r\n  color: #9e9e9e;\r\n  text-align: left;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%; \r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntfoot th{\r\n  border-top: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  text-align: center;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n  text-align: center;\r\n}\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\ntfoot td{\r\n  font-size: 10pt;\r\n  text-align: center;\r\n  }\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n  font-weight: bold;\r\n}\r\n.fontpurple {\r\n  color: purple;\r\n}\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\nawait ayGetTranslations([\"Total\", \"WorkOrder\", \"WorkOrderList\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborUserID\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborRateCharge\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemLaborNoChargeQuantity\", \"WorkOrderItemLaborServiceStartDate\", \"WorkOrderItemLaborServiceStopDate\", \"NetValue\"]);\n\n\n\t//below is the code to group by the technician - the UserViz\n\tlet ret = [];\n    //iterate workorders -> items -> workorder item labors\n    reportData.ayReportData.forEach(workorder => {\n        workorder.Items.forEach(workorderitem => {\n            workorderitem.Labors.forEach(labor => {\n                //new shape of data required for report\n                let record = {\n                    Serial: workorder.Serial,\n                    ServiceRateViz: labor.ServiceRateViz,\n                    PriceViz: labor.PriceViz,\n                    UnitOfMeasureViz: labor.UnitOfMeasureViz,\n                    ServiceStartDate: labor.ServiceStartDate,\n                    ServiceStopDate: labor.ServiceStopDate,\n                    NoChargeQuantity: labor.NoChargeQuantity,\n                    ServiceRateQuantity: labor.ServiceRateQuantity,\n\t\t\t\t\tServiceDetails: labor.ServiceDetails,\n                    NetViz: labor.NetViz\n                };\n\n                //Find or create group and insert this record               \n                let groupObject = ret.find(z => z.group == labor.UserViz);\n                if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                    ret.push({ group: labor.UserViz, items: [record], count: 1 });\n                }\n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//need to now edit below to get running totals of THE DATA returned above - can't reference items as not in the returned data\n\n\t//below declares variables for running total for ALL\n\treportData.AllWOLaborsNCQty = 0; \n\treportData.AllWOLaborsBillableQty = 0;\n\treportData.AllWOLaborsNCQtyplusBillableQty = 0; \n\treportData.AllWOLaborsNetViz = 0;\n\t\n\treportData.AllWOLaborsCount = 0;\n\n \t\t\n\n\t\t\t\tfor (EachGroup of reportData.ayReportData)   \n\t\t\t\t{\n\t\t\t\t//below declares a key on the entire grouping to hold running totals for each labor record for each Item for EachWO for each \"items\" \n\t\t\t\tEachGroup.EachGroupWOLaborsNCQty = 0;\n\t\t\t\tEachGroup.EachGroupWOLaborsBillableQty = 0;\n\t\t\t\tEachGroup.EachGroupWOLaborsNCQtyplusBillableQty = 0;\n\t\t\t\tEachGroup.EachGroupWOLaborsNetViz = 0;\n\t\t\t\tEachGroup.EachGroupWOActualHoursQty = 0;\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t for (groupitem of EachGroup.items) \n\t\t\t\t\t\t \t{\n\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsCount += 1;\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tif (groupitem.ServiceStartDate != null && groupitem.ServiceStopDate != null) \n\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\tdateTime1 = new Date (groupitem.ServiceStopDate);\n\t\t\t\t\t\t\t\t\t\t\tdateTime2 = new Date (groupitem.ServiceStartDate);\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\tdiffMillis = (dateTime1.getTime() - dateTime2.getTime()); \n\t\t\t\t\t\t\t\t\t\t\tgroupitem.diffHours = (diffMillis/3600) / 1000;\n\n\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOActualHoursQty += groupitem.diffHours;\n\t\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t\tif (groupitem.NoChargeQuantity != null) \n\t\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNCQty += groupitem.NoChargeQuantity;\t\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNCQtyplusBillableQty += groupitem.NoChargeQuantity;\t\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNCQty\t+= groupitem.NoChargeQuantity;\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNCQtyplusBillableQty += groupitem.NoChargeQuantity;\n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\tif (groupitem.ServiceRateQuantity != null) \n\t\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsBillableQty += groupitem.ServiceRateQuantity; \n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNCQtyplusBillableQty += groupitem.ServiceRateQuantity;\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsBillableQty += groupitem.ServiceRateQuantity; \n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNCQtyplusBillableQty += groupitem.ServiceRateQuantity; \n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\tif (groupitem.NetViz != null) \n\t\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNetViz += groupitem.NetViz;\n\t\t\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNetViz += groupitem.NetViz; //this is the actual adding to running total for all\n\t\t\t\t\t\t\t\t\t\t\t\t}\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t \t\t\n\t\t\t\t\t\t \t}\n\t\t\t\t}\n\t\t\t\n\n\t//return the data into the pipeline to send to the report template \n\treturn reportData;\n}\n\n\n\n","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span></span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp; <span class=\"date\"></span>&nbsp; </span>\n<span style=\"font-size:6pt;width: 94%; text-align: right; \">Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Labor Billing & Hours Grouped By Technician","Active":true,"Notes":"Custom Prepare to group by the technician, and get running totals of NC, Billable and Actual for grouping AND for all wo records in this report","Roles":51182,"AType":37,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n    <div>\n        <table>\n            <thead>\n                <tr>\n                    <th colspan=\"1\"></th>\n                    <th colspan=\"2\">{{ayT \"WorkOrder\"}}</th>  \n                    <th colspan=\"7\">{{ayT \"WorkOrderItemLaborServiceStartDate\"}} / {{ayT \"WorkOrderItemLaborServiceStopDate\"}} </th>                  \n                    <th colspan=\"3\">{{ayT \"WorkOrderItemLaborServiceRateID\"}}</th>\n                    <th colspan=\"3\">{{ayT \"WorkOrderItemLaborRateCharge\"}}</th>\n                    \n                    <th colspan=\"2\">Actual Start minus Stop</th>\n                    <th colspan=\"2\">{{ayT \"WorkOrderItemLaborNoChargeQuantity\"}}</th>\n                    <th colspan=\"2\">{{ayT \"WorkOrderItemLaborServiceRateQuantity\"}}</th>\n                    <th colspan=\"2\">{{ayT \"NetValue\"}}</th>\n                </tr>\n            </thead>\n            <tbody>\n                {{#each ayReportData}}\n                <tr>\n                    <th colspan=\"2\" class=\"leftlean\">{{ayT 'WorkOrderItemLabors'}} for </th>\n                    <td colspan=\"5\">{{group}}</td>\n                    <th colspan=\"17\" class=\"leftlean\"># of labor items: {{count}}</th>\n                </tr>\n                \n                {{#each items}}\n                <tr>\n                    <td colspan=\"1\">&nbsp;</td>\n                    <td colspan=\"2\">{{Serial}}</td> \n                    <td colspan=\"7\">{{ayDateTime ServiceStartDate}} to {{ayDateTime ServiceStopDate}}</td>                   \n                    <td colspan=\"3\">{{ServiceRateViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency PriceViz}} {{UnitOfMeasureViz}}</td>\n                    \n                    <td colspan=\"2\">{{ayDecimal diffHours}}</td>\n                    <td colspan=\"2\">{{NoChargeQuantity}}</td>\n                    <td colspan=\"2\">{{ServiceRateQuantity}}</td>\n                    <td colspan=\"2\">{{ayCurrency NetViz}}</td>\n                </tr>\n                {{/each}}\n                <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"16\" class=\"rightlean\">Total {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}} &#43; {{ayT \"WorkOrderItemLaborNoChargeQuantity\" }} &#61; {{EachGroupWOLaborsNCQtyplusBillableQty}} for {{group}}</th>                    \n                    <td colspan=\"2\">{{ayDecimal EachGroupWOActualHoursQty}}</td>\n                    <td colspan=\"2\">{{EachGroupWOLaborsNCQty}}</td>\n                    <td colspan=\"2\">{{EachGroupWOLaborsBillableQty}}</td>\n                    <td colspan=\"2\">{{ayCurrency EachGroupWOLaborsNetViz}}</td>\n                </tr>\n                <tr>\n                    <td colspan=\"24\">&nbsp;</td>\n                </tr>\n                {{/each}}\n            </tbody>\n        </table>\n\n        <table><!-- footer is in its own table so displays once at end of report-->\n            <tfoot>\n                <tr>\n                    <th colspan=\"4\">&nbsp;</th>\n                    <th colspan=\"4\">Total {{ayT 'WorkOrderItemLabors'}} records</th>\n                    <th colspan=\"4\">Total Combined {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}} &#38; {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}}</th>\n                    <th colspan=\"4\">Total {{ayT \"WorkOrderItemLaborNoChargeQuantity\"}}</th>\n                    <th colspan=\"4\">Total {{ayT \"WorkOrderItemLaborServiceRateQuantity\"}}</th>                    \n                    <th colspan=\"4\">Total {{ayT \"NetValue\"}}</th>\n                </tr>\n                <tr>\n                    <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborsNetViz  -->                    \n                    <td colspan=\"4\">&nbsp;</td>\n                    <td colspan=\"4\">{{AllWOLaborsCount}}</td>\n                    <td colspan=\"4\">{{AllWOLaborsNCQtyplusBillableQty}}</td>\n                    <td colspan=\"4\">{{AllWOLaborsNCQty}}</td>\n                    <td colspan=\"4\">{{AllWOLaborsBillableQty}}</td>                    \n                    <td colspan=\"4\">{{ayCurrency AllWOLaborsNetViz}}</td>\n                </tr>                \n            </tfoot>\n        </table>\n    </div>\n</body>\n\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 14pt; \r\n  color: #9e9e9e;\r\n  text-align: left;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%; \r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntfoot th{\r\n  border-top: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  text-align: center;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n  text-align: center;\r\n}\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\ntfoot td{\r\n  font-size: 10pt;\r\n  text-align: center;\r\n  }\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n  font-weight: bold;\r\n}\r\n.fontpurple {\r\n  color: purple;\r\n}\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\nawait ayGetTranslations([\"Total\", \"WorkOrder\", \"WorkOrderList\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborUserID\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborRateCharge\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemLaborNoChargeQuantity\", \"WorkOrderItemLaborServiceStartDate\", \"WorkOrderItemLaborServiceStopDate\", \"NetValue\"]);\n\n\n\t//below is the code to group by the technician - the UserViz\n\tlet ret = [];\n    //iterate workorders -> items -> workorder item labors\n    reportData.ayReportData.forEach(workorder => {\n        workorder.Items.forEach(workorderitem => {\n            workorderitem.Labors.forEach(labor => {\n                //new shape of data required for report\n                let record = {\n                    Serial: workorder.Serial,\n                    ServiceRateViz: labor.ServiceRateViz,\n                    PriceViz: labor.PriceViz,\n                    UnitOfMeasureViz: labor.UnitOfMeasureViz,\n                    ServiceStartDate: labor.ServiceStartDate,\n                    ServiceStopDate: labor.ServiceStopDate,\n                    NoChargeQuantity: labor.NoChargeQuantity,\n                    ServiceRateQuantity: labor.ServiceRateQuantity,\n\t\t\t\t\tServiceDetails: labor.ServiceDetails,\n                    NetViz: labor.NetViz\n                };\n\n                //Find or create group and insert this record               \n                let groupObject = ret.find(z => z.group == labor.UserViz);\n                if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                    ret.push({ group: labor.UserViz, items: [record], count: 1 });\n                }\n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//below to get running totals of THE DATA returned above\n\n\t//below declares variables for running total for ALL\n\treportData.AllWOLaborsNCQty = 0; \n\treportData.AllWOLaborsBillableQty = 0;\n\treportData.AllWOLaborsNCQtyplusBillableQty = 0; \n\treportData.AllWOLaborsNetViz = 0;\n\t\n\treportData.AllWOLaborsCount = 0;\n\n \t\t\n\n\t\t\t\tfor (const EachGroup of reportData.ayReportData)   \n\t\t\t\t{\n\t\t\t\t//below declares a key on the entire grouping to hold running totals for each labor record for each Item for EachWO for each \"items\" \n\t\t\t\tEachGroup.EachGroupWOLaborsNCQty = 0;\n\t\t\t\tEachGroup.EachGroupWOLaborsBillableQty = 0;\n\t\t\t\tEachGroup.EachGroupWOLaborsNCQtyplusBillableQty = 0;\n\t\t\t\tEachGroup.EachGroupWOLaborsNetViz = 0;\n\t\t\t\tEachGroup.EachGroupWOActualHoursQty = 0;\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t for (const groupitem of EachGroup.items) \n\t\t\t\t\t\t \t{\n\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsCount += 1;\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tif (groupitem.ServiceStartDate != null && groupitem.ServiceStopDate != null) \n\t\t\t\t\t\t\t\t\t\t{\n\n\t\t\t\t\t\t\t\t\t\t\tvar dateTime1 = new Date (groupitem.ServiceStopDate);\n\t\t\t\t\t\t\t\t\t\t\tvar dateTime2 = new Date (groupitem.ServiceStartDate);\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\tvar diffMillis = (dateTime1.getTime() - dateTime2.getTime()); \n\t\t\t\t\t\t\t\t\t\t\tgroupitem.diffHours = ((diffMillis/3600) / 1000)\n\n\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOActualHoursQty += groupitem.diffHours;\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t\tif (groupitem.NoChargeQuantity != null) \n\t\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNCQty += groupitem.NoChargeQuantity;\t\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNCQtyplusBillableQty += groupitem.NoChargeQuantity;\t\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNCQty\t+= groupitem.NoChargeQuantity;\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNCQtyplusBillableQty += groupitem.NoChargeQuantity;\n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\tif (groupitem.ServiceRateQuantity != null) \n\t\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsBillableQty += groupitem.ServiceRateQuantity; \n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNCQtyplusBillableQty += groupitem.ServiceRateQuantity;\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsBillableQty += groupitem.ServiceRateQuantity; \n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNCQtyplusBillableQty += groupitem.ServiceRateQuantity; \n\t\t\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\tif (groupitem.NetViz != null) \n\t\t\t\t\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\t\t\t\tEachGroup.EachGroupWOLaborsNetViz += groupitem.NetViz;\n\t\t\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\t\t\treportData.AllWOLaborsNetViz += groupitem.NetViz; //this is the actual adding to running total for all\n\t\t\t\t\t\t\t\t\t\t\t\t}\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t \t\t\n\t\t\t\t\t\t \t}\n\t\t\t\t}\n\t\t\t\n\n\t//return the data into the pipeline to send to the report template \n\treturn reportData;\n}\n\n\n\n","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span></span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp; <span class=\"date\"></span>&nbsp; </span>\n<span style=\"font-size:6pt;width: 94%; text-align: right; \">Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Loaner Items.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Loaner Items.ayrt
index 4e00131a..2ccf42d4 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Loaner Items.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Loaner Items.ayrt	
@@ -1 +1 @@
-{"Name":"Loaner Items","Active":true,"Notes":"","Roles":50538,"AType":16,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'LoanUnitList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'LoanUnit'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n          <th colspan=\"3\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanOutDate'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanDueDate'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          {{#if Serial}}<td colspan=\"4\">{{ayT 'LoanUnitSerial'}}: {{Serial}} {{Name}}</td>{{else}}<td colspan=\"3\">{{Name}}</td>{{/if}}\n          {{#if WorkOrderSerialViz}} <!-- if this is true then displays below -->\n          <td colspan=\"1\" class=\"centerlean\">{{WorkOrderSerialViz}}</td>\n          <td colspan=\"3\">{{WorkOrderCustomerViz}}</td>\n          <td colspan=\"2\">{{ayDateTime WorkOrderOutDateViz}}</td>\n          <td colspan=\"2\">{{ayDateTime WorkOrderDueDateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{WorkOrderQuantityViz}}</td>\n          <td colspan=\"2\">{{WorkOrderRateViz}}</td>\n          {{else}} <!-- else if false, then displays below -->\n          <td colspan=\"1\"></td>\n          <td colspan=\"11\">Not presently loaned out on any work order</td>\n          {{/if}}\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([  \"LoanUnitList\", \"LoanUnitSerial\", \"LoanUnit\", \"WorkOrder\", \"Customer\", \"WorkOrderItemLoanDueDate\", \"WorkOrderItemLoanOutDate\", \"WorkOrderItemLoanReturnDate\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Loaner Items","Active":true,"Notes":"","Roles":50538,"AType":16,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'LoanUnitList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'LoanUnit'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n          <th colspan=\"3\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanOutDate'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanDueDate'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          {{#if Serial}}<td colspan=\"4\">{{ayT 'LoanUnitSerial'}}: {{Serial}} {{Name}}</td>{{else}}<td colspan=\"3\">{{Name}}</td>{{/if}}\n          {{#if WorkOrderSerialViz}} <!-- if this is true then displays below -->\n          <td colspan=\"1\" class=\"centerlean\">{{WorkOrderSerialViz}}</td>\n          <td colspan=\"3\">{{WorkOrderCustomerViz}}</td>\n          <td colspan=\"2\">{{ayDateTime WorkOrderOutDateViz}}</td>\n          <td colspan=\"2\">{{ayDateTime WorkOrderDueDateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{WorkOrderQuantityViz}}</td>\n          <td colspan=\"2\">{{WorkOrderRateViz}}</td>\n          {{else}} <!-- else if false, then displays below -->\n          <td colspan=\"1\"></td>\n          <td colspan=\"11\">Not presently loaned out on any work order</td>\n          {{/if}}\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([  \"LoanUnitList\", \"LoanUnitSerial\", \"LoanUnit\", \"WorkOrder\", \"Customer\", \"WorkOrderItemLoanDueDate\", \"WorkOrderItemLoanOutDate\", \"WorkOrderItemLoanReturnDate\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Memos.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Memos.ayrt
index 22d10f8c..b5eb7c4c 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Memos.ayrt
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Memos.ayrt
@@ -1 +1 @@
-{"Name":"Memos","Active":true,"Notes":"","Roles":124927,"AType":60,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'MemoList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'MemoViewed'}}</th>\n          <th colspan=\"2\">{{ayT 'MemoSent'}}</th>\n          <th colspan=\"2\">{{ayT 'MemoFromID'}}</th>\n          <th colspan=\"3\">{{ayT 'MemoSubject'}}</th>          \n          <th colspan=\"5\">{{ayT 'MemoMessage'}}</th>\n          \n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n         <!-- if Viewed is true, will show checkmarked checkbox -->\n\t\t\t\t\t{{#if Viewed}}<td colspan=\"1\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"1\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n\n          <td colspan=\"2\">{{ayDateTime Sent}}</td>\n          <td colspan=\"2\">{{FromViz}}</td>\n          <td colspan=\"3\">{{Name}}</td>\n          <td colspan=\"5\">{{Notes}}</td>\n          \n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"MemoFromID\", \"MemoSent\", \"MemoList\", \"MemoSubject\", \"MemoViewed\", \"MemoMessage\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Memos","Active":true,"Notes":"","Roles":124927,"AType":60,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'MemoList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'MemoViewed'}}</th>\n          <th colspan=\"2\">{{ayT 'MemoSent'}}</th>\n          <th colspan=\"2\">{{ayT 'MemoFromID'}}</th>\n          <th colspan=\"3\">{{ayT 'MemoSubject'}}</th>          \n          <th colspan=\"5\">{{ayT 'MemoMessage'}}</th>\n          \n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n         <!-- if Viewed is true, will show checkmarked checkbox  -->\n\t\t\t\t\t{{#if Viewed}}<td colspan=\"1\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"1\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n\n          <td colspan=\"2\">{{ayDateTime Sent}}</td>\n          <td colspan=\"2\">{{FromViz}}</td>\n          <td colspan=\"3\">{{Name}}</td>\n          <td colspan=\"5\">{{Notes}}</td>\n          \n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"MemoFromID\", \"MemoSent\", \"MemoList\", \"MemoSubject\", \"MemoViewed\", \"MemoMessage\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Net Taxes and Totals for Each WO.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Net Taxes and Totals for Each WO.ayrt
index 9121f06e..bcf87996 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Net Taxes and Totals for Each WO.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Net Taxes and Totals for Each WO.ayrt	
@@ -1 +1 @@
-{"Name":"Net Taxes and Totals for Each WO","Active":true,"Notes":"Custom Prepare to display each WO total nets, taxes and grand total; and totals for all workorders in list","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Taxes and Totals for each {{ayT 'WorkOrder'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td  colspan=\"1\">{{Serial}}</td>\n               <td  colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}}<td class=\"nodata\">no Service Date specified</td>{{/if}}\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ThisWOTotalNets}}</td> {{else}} <td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOTotalTaxAs }}<td colspan=\"1\">{{ayCurrency ThisWOTotalTaxAs}}</td> {{else}} <td class=\"nodata\">none</td>{{/if}}\n               {{#if ThisWOTotalTaxBs }}<td colspan=\"1\">{{ayCurrency ThisWOTotalTaxBs}}</td> {{else}} <td class=\"nodata\">none</td>{{/if}}\n               {{#if ThisWOTotalGrand }}<td colspan=\"2\">{{ayCurrency ThisWOTotalGrand}}</td> {{else}} <td class=\"nodata\">none billable</td>{{/if}}\n               \n          </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"3\">Totals for all</th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th>{{ayT 'NetValue'}}</th>\n               <th>{{ayT 'TaxCodeTaxA'}}</th>\n               <th>{{ayT 'TaxCodeTaxB'}}</th>\n               <th>{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"3\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td>{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxAs}} <td>{{ ayCurrency AllWOTotalTaxAs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxBs }} <td>{{ ayCurrency AllWOTotalTaxBs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalGrand}} <td>{{ ayCurrency AllWOTotalGrand }}</td>{{else}} <td>$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n//below declares a key to hold all Tax As from all workorders in this list so it exists\nreportData.AllWOTotalTaxAs = 0;\n//below declares a key to hold all Tax Bs from all workorders in this list so it exists\nreportData.AllWOTotalTaxBs = 0;\n//below declares a key to hold all GrandTotal from all workorders in this list so it exists\nreportData.AllWOTotalGrand = 0;\n\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.ChargeAmount; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Net Taxes and Totals for Each WO","Active":true,"Notes":"Custom Prepare to display each WO total nets, taxes and grand total; and totals for all workorders in list","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Taxes and Totals for each {{ayT 'WorkOrder'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td  colspan=\"1\">{{Serial}}</td>\n               <td  colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}}<td  colspan=\"2\" class=\"nodata\">no Service Date specified</td>{{/if}}\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>{{else}}<td colspan=\"1\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllPartsNetViz}}</td>{{else}}<td colspan=\"1\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>{{else}}<td colspan=\"1\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td colspan=\"1\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLoansNetViz}}</td>{{else}}<td colspan=\"1\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td>{{else}}<td colspan=\"1\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ThisWOTotalNets}}</td> {{else}} <td colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOTotalTaxAs }}<td colspan=\"1\">{{ayCurrency ThisWOTotalTaxAs}}</td> {{else}} <td colspan=\"1\" class=\"nodata\">none</td>{{/if}}\n               {{#if ThisWOTotalTaxBs }}<td colspan=\"1\">{{ayCurrency ThisWOTotalTaxBs}}</td> {{else}} <td colspan=\"1\" class=\"nodata\">none</td>{{/if}}\n               {{#if ThisWOTotalGrand }}<td colspan=\"2\">{{ayCurrency ThisWOTotalGrand}}</td> {{else}} <td colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}\n               \n          </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"3\">Totals for all</th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th>{{ayT 'NetValue'}}</th>\n               <th>{{ayT 'TaxCodeTaxA'}}</th>\n               <th>{{ayT 'TaxCodeTaxB'}}</th>\n               <th>{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"3\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td>{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxAs}} <td>{{ ayCurrency AllWOTotalTaxAs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalTaxBs }} <td>{{ ayCurrency AllWOTotalTaxBs }}</td>{{else}} <td>$0.00</td> {{/if}}\n               {{#if AllWOTotalGrand}} <td>{{ ayCurrency AllWOTotalGrand }}</td>{{else}} <td>$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n//below declares a key to hold all Tax As from all workorders in this list so it exists\nreportData.AllWOTotalTaxAs = 0;\n//below declares a key to hold all Tax Bs from all workorders in this list so it exists\nreportData.AllWOTotalTaxBs = 0;\n//below declares a key to hold all GrandTotal from all workorders in this list so it exists\nreportData.AllWOTotalGrand = 0;\n\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Labor.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Part.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Travel.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.ChargeAmount; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Exp.TaxPaid; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Loan.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.NetViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxAs += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax As in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxAViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOTotalTaxBs += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Tax Bs in this report data\n\t\t\t\t\t\treportData.AllWOTotalGrand += Outside.TaxBViz; //this is where the actual adding to the running GRAND TOTAL for ALL workorders Grand Totals in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each PM Item.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each PM Item.ayrt
index 9761f75a..3764c4fb 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each PM Item.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each PM Item.ayrt	
@@ -1 +1 @@
-{"Name":"Net Totals for Each PM Item","Active":true,"Notes":"Custom Prepare to display each PM Item total nets and totals for all workorder items in list","Roles":50538,"AType":22,"IncludeWoItemDescendants":true,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'PM'}} {{ayT 'WorkOrderItem'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'PM'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n               {{#each Items}} <!--note the differences below between this Net Totals for Work Order Items report template vs the Net Totals for Work Orders report template -->\n            <tr>\n               <td  colspan=\"2\">{{PMId}} - {{Sequence}}</td>\n               <td  colspan=\"2\">{{../CustomerViz}}</td>\n               {{#if ../NextServiceDate }}<td colspan=\"1\">{{ayDate ../NextServiceDate}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Next Service Date specified</td>{{/if}}\n               <td colspan=\"3\"   style=\"background-color:{{WorkOrderItemStatusColorViz}}\" >{{WorkOrderItemStatusNameViz}}</td>\n               {{#if ../ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ../ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}               \n          </tr>\n               {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"8\" class=\"rightlean\" >Totals for all </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"8\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"PM\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Net Totals for Each PM Item","Active":true,"Notes":"Custom Prepare to display each PM Item total nets and totals for all workorder items in list","Roles":50538,"AType":22,"IncludeWoItemDescendants":true,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'PM'}} {{ayT 'WorkOrderItem'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'PM'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n               {{#each Items}} <!--note the differences below between this Net Totals for Work Order Items report template vs the Net Totals for Work Orders report template -->\n            <tr>\n               <td  colspan=\"2\">{{PMId}} - {{Sequence}}</td>\n               <td  colspan=\"2\">{{../CustomerViz}}</td>\n               {{#if ../NextServiceDate }}<td colspan=\"1\">{{ayDate ../NextServiceDate}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Next Service Date specified</td>{{/if}}\n               <td colspan=\"3\"   style=\"background-color:{{WorkOrderItemStatusColorViz}}\" >{{WorkOrderItemStatusNameViz}}</td>\n               {{#if ../ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ../ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}               \n          </tr>\n               {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"8\" class=\"rightlean\" >Totals for all </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"8\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"PM\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each Quote Item.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each Quote Item.ayrt
index 3821b328..384c5329 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each Quote Item.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each Quote Item.ayrt	
@@ -1 +1 @@
-{"Name":"Net Totals for Each Quote Item","Active":true,"Notes":"Custom Prepare to display each Quote Item total nets and totals for all workorder items in list","Roles":50538,"AType":28,"IncludeWoItemDescendants":true,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'Quote'}} {{ayT 'WorkOrderItem'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'Quote'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Quote'}} {{ayT 'Status'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'Quote'}} {{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n               {{#each Items}} <!--note the differences below between this Net Totals for Work Order Items report template vs the Net Totals for Work Orders report template -->\n            <tr>\n               <td  colspan=\"2\">{{QuoteId}} - {{Sequence}}</td>\n               <td colspan=\"2\"   style=\"background-color:{{../LastStateColorViz}}\" >{{../LastStateNameViz}}</td>\n               <td  colspan=\"3\">{{../CustomerViz}}</td>\n               {{#if ../Requested }}<td colspan=\"1\">{{ayDate ../Requested}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Requested Date specified</td>{{/if}}               \n               {{#if ../ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ../ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none quoted</td>{{/if}}               \n          </tr>\n               {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"8\" class=\"rightlean\" >Totals for all {{ayT 'Quote'}} </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"8\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"QuoteQuoteRequestDate\", \"Status\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Net Totals for Each Quote Item","Active":true,"Notes":"Custom Prepare to display each Quote Item total nets and totals for all workorder items in list","Roles":50538,"AType":28,"IncludeWoItemDescendants":true,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'Quote'}} {{ayT 'WorkOrderItem'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'Quote'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Quote'}} {{ayT 'Status'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'Quote'}} {{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n               {{#each Items}} <!--note the differences below between this Net Totals for Work Order Items report template vs the Net Totals for Work Orders report template -->\n            <tr>\n               <td  colspan=\"2\">{{QuoteId}} - {{Sequence}}</td>\n               <td colspan=\"2\"   style=\"background-color:{{../LastStateColorViz}}\" >{{../LastStateNameViz}}</td>\n               <td  colspan=\"3\">{{../CustomerViz}}</td>\n               {{#if ../Requested }}<td colspan=\"1\">{{ayDate ../Requested}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Requested Date specified</td>{{/if}}               \n               {{#if ../ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none quoted</td>{{/if}}\n               {{#if ../ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ../ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none quoted</td>{{/if}}               \n          </tr>\n               {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"8\" class=\"rightlean\" >Totals for all {{ayT 'Quote'}} </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"8\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"QuoteQuoteRequestDate\", \"Status\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO Item.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO Item.ayrt
index fc0652af..9c080969 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO Item.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO Item.ayrt	
@@ -1 +1 @@
-{"Name":"Net Totals for Each WO Item","Active":true,"Notes":"Custom Prepare to display each WO Item total nets and totals for all workorder items in list","Roles":50538,"AType":35,"IncludeWoItemDescendants":true,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'WorkOrderItem'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n               {{#each Items}} <!--note the differences below between this Net Totals for Work Order Items report template vs the Net Totals for Work Orders report template -->\n            <tr>\n               <td  colspan=\"2\">{{WorkOrderId}} - {{Sequence}}</td>\n               <td  colspan=\"3\">{{../CustomerViz}}</td>\n               {{#if ../ServiceDate }}<td colspan=\"1\">{{ayDate ../ServiceDate}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\"   style=\"background-color:{{WorkOrderItemStatusColorViz}}\" >{{WorkOrderItemStatusNameViz}}</td>\n               {{#if ../ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ../ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}               \n          </tr>\n               {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"8\" class=\"rightlean\" >Totals for all </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"8\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Net Totals for Each WO Item","Active":true,"Notes":"Custom Prepare to display each WO Item total nets and totals for all workorder items in list","Roles":50538,"AType":35,"IncludeWoItemDescendants":true,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'WorkOrderItem'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n               {{#each Items}}\n            <tr>\n               <td  colspan=\"2\">{{WorkOrderId}} - {{Sequence}}</td>\n               <td  colspan=\"3\">{{../CustomerViz}}</td>\n               {{#if ../ServiceDate }}<td colspan=\"1\">{{ayDate ../ServiceDate}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\"   style=\"background-color:{{WorkOrderItemStatusColorViz}}\" >{{WorkOrderItemStatusNameViz}}</td>\n               {{#if ../ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ../ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ../ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ../ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}               \n          </tr>\n               {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table to displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"8\" class=\"rightlean\" >Totals for all </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"8\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO.ayrt
index 71ca61da..d7a3fd84 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Net Totals for Each WO.ayrt	
@@ -1 +1 @@
-{"Name":"Net Totals for Each WO","Active":true,"Notes":"Custom Prepare to display each WO total nets and totals for all workorders in list","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'WorkOrder'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderStatus'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td  colspan=\"1\">{{Serial}}</td>\n               <td  colspan=\"3\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"1\">{{ayDate ServiceDate}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\"   style=\"background-color:{{LastStateColorViz}}\" >{{LastStateNameViz}}</td>\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}               \n          </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"15\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"7\" class=\"rightlean\" >Totals for all </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"7\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderStatus\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Net Totals for Each WO","Active":true,"Notes":"Custom Prepare to display each WO total nets and totals for all workorders in list","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>Nets Totals for each {{ayT 'WorkOrder'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderStatus'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td  colspan=\"1\">{{Serial}}</td>\n               <td  colspan=\"3\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"1\">{{ayDate ServiceDate}}</td>{{else}}<td  colspan=\"1\" class=\"nodata\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\"   style=\"background-color:{{LastStateColorViz}}\" >{{LastStateNameViz}}</td>\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLaborsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllPartsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllTravelsNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllTravelsNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllExpsNetChargeAmount }}<td colspan=\"1\">{{ayCurrency ThisWOAllExpsNetChargeAmount}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllLoansNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllLoansNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOAllOutsidesNetViz }}<td colspan=\"1\">{{ayCurrency ThisWOAllOutsidesNetViz}}</td>{{else}}<td class=\"nodata\">none billable</td>{{/if}}\n               {{#if ThisWOTotalNets }}<td colspan=\"2\">{{ayCurrency ThisWOTotalNets}}</td> {{else}} <td  colspan=\"2\" class=\"nodata\">none billable</td>{{/if}}               \n          </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table><!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                    <td colspan=\"15\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"7\" class=\"rightlean\" >Totals for all </th>\n               <th>{{ayT 'WorkOrderItemLaborList'}}</th>\n               <th>{{ayT 'WorkOrderItemPartList'}}</th>\n               <th>{{ayT 'WorkOrderItemTravelList'}}</th>\n               <th>{{ayT 'WorkOrderItemExpenseList'}}</th>\n               <th>{{ayT 'WorkOrderItemLoanList'}}</th>\n               <th>{{ayT 'WorkOrderItemOutsideService'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllWOLaborNetViz  -->\n               <td colspan=\"7\"></td>\n               {{#if AllWOLaborsNetViz}} <td>{{ ayCurrency AllWOLaborsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td>{{ ayCurrency AllWOPartsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTravelsNetViz}} <td>{{ ayCurrency AllWOTravelsNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOExpsNetChargeAmount}} <td>{{ ayCurrency AllWOExpsNetChargeAmount }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOLoansNetViz}} <td>{{ ayCurrency AllWOLoansNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOOutsidesNetViz}} <td>{{ ayCurrency AllWOOutsidesNetViz }}</td>{{else}}<td>$0.00</td> {{/if}}\n               {{#if AllWOTotalNets}} <td colspan=\"2\">{{ ayCurrency AllWOTotalNets }}</td>{{else}}<td colspan=\"2\">$0.00</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":".nodata {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderStatus\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemPartList\", \"WorkOrderItemTravelList\", \"WorkOrderItemExpenseList\", \"WorkOrderItemLoanList\", \"WorkOrderItemOutsideService\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\" ]);\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor Net Viz from all workorders so it exists\nreportData.AllWOLaborsNetViz = 0;\n//below declares a key on the entire wo to hold all Part Net Viz from all workorders so it exists\nreportData.AllWOPartsNetViz = 0;\n//below declares a key on the entire wo to hold all Travel Net Viz from all workorders so it exists\nreportData.AllWOTravelsNetViz = 0;\n//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all workorders so it exists\nreportData.AllWOExpsNetChargeAmount = 0;\n//below declares a key on the entire wo to hold all Loan Net Viz from all workorders so it exists\nreportData.AllWOLoansNetViz = 0;\n//below declares a key on the entire wo to hold all OutsideServices Net Viz from all workorders so it exists\nreportData.AllWOOutsidesNetViz = 0;\n\n//below declares a key to hold all Nets from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\t\t\t\t\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz;\t//this IS where the actual adding to the running total for all Travels for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Travel.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for all Exp ChargeAmount for all workorders in this report data\t\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Exp.ChargeAmount;//this is where the actual adding to the running total for all workorder Net ChargeAmount in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz;\t\t//this IS where the actual adding to the running total for all Loans for all workorders in this report data\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Loan.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOOutsidesNetViz += Outside.NetViz;\t//this IS where the actual adding to the running total for all Outside for all workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Outside.NetViz;//this is where the actual adding to the running total for all workorder Nets in this report data\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Expense.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Expense.ayrt
index c4f69ffc..99b13859 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Expense.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Expense.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each PM Expense","Active":true,"Notes":"","Roles":50538,"AType":80,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemExpenseList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"4\">{{ayT 'WorkOrderItemExpenseName'}}</th>               \n               <th colspan=\"2\">{{ayT 'WorkOrderItemExpenseChargeToCustomer'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th> \n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Expenses}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"4\">{{Name}} {{Description}} </td>\n               {{#if ChargeToCustomer}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ChargeAmount}}</td>\n               <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}} {{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n               <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"17\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemExpenseChargeToCustomer'}} {{ayT 'WorkOrderItemExpenseList'}} in this report</th> \n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"11\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesNetViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTaxs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemExpenseChargeToCustomer\", \"NetValue\", \"WorkOrderItemExpenseList\", \"WorkOrderItemExpenseName\", \"WorkOrderItemExpenseChargeAmount\", \"Tax\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Expenses so it exists\n\treportData.AllWOExpensesNetViz = 0;\n\treportData.AllWOExpensesTaxs = 0;\n\treportData.AllWOExpensesTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\n\n\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \treportData.AllWOExpensesNetViz += Exp.ChargeAmount;\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.ChargeAmount;\n          \t      \t\t}\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxAViz; \n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxBViz;\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each PM Expense","Active":true,"Notes":"","Roles":50538,"AType":80,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemExpenseList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"4\">{{ayT 'WorkOrderItemExpenseName'}}</th>               \n               <th colspan=\"2\">{{ayT 'WorkOrderItemExpenseChargeToCustomer'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th> \n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Expenses}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"4\">{{Name}} {{Description}} </td>\n               {{#if ChargeToCustomer}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ChargeAmount}}</td>\n               <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}} {{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n               <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"17\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemExpenseChargeToCustomer'}} {{ayT 'WorkOrderItemExpenseList'}} in this report</th> \n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"11\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesNetViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTaxs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemExpenseChargeToCustomer\", \"NetValue\", \"WorkOrderItemExpenseList\", \"WorkOrderItemExpenseName\", \"WorkOrderItemExpenseChargeAmount\", \"Tax\", \"Total\"]);\n\n\n\t//below declares keys to hold for all Expenses so it exists\n\treportData.AllWOExpensesNetViz = 0;\n\treportData.AllWOExpensesTaxs = 0;\n\treportData.AllWOExpensesTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\n\n\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \treportData.AllWOExpensesNetViz += Exp.ChargeAmount;\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.ChargeAmount;\n          \t      \t\t}\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxAViz; \n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxBViz;\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Labor.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Labor.ayrt
index 9c378a8c..384df97c 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Labor.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Labor.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each PM Labor","Active":true,"Notes":"","Roles":50538,"AType":81,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemLaborList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'ServicePreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLaborServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemLaborPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborServiceRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Labors}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"3\">{{ServiceRateViz}}</td>               \n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLaborList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"ServicePreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all labors so it exists\n\treportData.AllWOLaborsNetViz = 0;\n\treportData.AllWOLaborsTaxAs = 0;\n\treportData.AllWOLaborsTaxBs = 0;\n\treportData.AllWOLaborsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Labor.NetViz != null) {\n\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net labor\n\t\t\t\t\treportData.AllWOLaborsTaxAs += Labor.TaxAViz;\n\t\t\t\t\treportData.AllWOLaborsTaxBs += Labor.TaxBViz;\n\t\t\t\t\treportData.AllWOLaborsTotalGrand += Labor.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each PM Labor","Active":true,"Notes":"","Roles":50538,"AType":81,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemLaborList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'ServicePreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLaborServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemLaborPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborServiceRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Labors}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"3\">{{ServiceRateViz}}</td>               \n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLaborList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"ServicePreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all labors so it exists\n\treportData.AllWOLaborsNetViz = 0;\n\treportData.AllWOLaborsTaxAs = 0;\n\treportData.AllWOLaborsTaxBs = 0;\n\treportData.AllWOLaborsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Labor.NetViz != null) {\n\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net labor\n\t\t\t\t\treportData.AllWOLaborsTaxAs += Labor.TaxAViz;\n\t\t\t\t\treportData.AllWOLaborsTaxBs += Labor.TaxBViz;\n\t\t\t\t\treportData.AllWOLaborsTotalGrand += Labor.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Loans.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Loans.ayrt
index 1668b942..75ff016d 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Loans.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Loans.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each PM Loans","Active":true,"Notes":"","Roles":50538,"AType":82,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemLoanList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLoanUnit'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Loans}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>     \n               <td colspan=\"3\">{{LoanUnitViz}}</td>          \n               <td colspan=\"1\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLoanList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemLoanList\", \"WorkOrderItemLoanUnit\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Loans so it exists\n\treportData.AllWOLoansNetViz = 0;\n\treportData.AllWOLoansTaxAs = 0;\n\treportData.AllWOLoansTaxBs = 0;\n\treportData.AllWOLoansTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Loan.NetViz != null) {\n\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz; //this IS where the actual adding to running total for this WOItem's Net Loan\n\t\t\t\t\treportData.AllWOLoansTaxAs += Loan.TaxAViz;\n\t\t\t\t\treportData.AllWOLoansTaxBs += Loan.TaxBViz;\n\t\t\t\t\treportData.AllWOLoansTotalGrand += Loan.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each PM Loans","Active":true,"Notes":"","Roles":50538,"AType":82,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemLoanList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLoanUnit'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Loans}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>     \n               <td colspan=\"3\">{{LoanUnitViz}}</td>          \n               <td colspan=\"1\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLoanList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemLoanList\", \"WorkOrderItemLoanUnit\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//below declares keys to hold for all Loans so it exists\n\treportData.AllWOLoansNetViz = 0;\n\treportData.AllWOLoansTaxAs = 0;\n\treportData.AllWOLoansTaxBs = 0;\n\treportData.AllWOLoansTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Loan.NetViz != null) {\n\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz; //this IS where the actual adding to running total for this WOItem's Net Loan\n\t\t\t\t\treportData.AllWOLoansTaxAs += Loan.TaxAViz;\n\t\t\t\t\treportData.AllWOLoansTaxBs += Loan.TaxBViz;\n\t\t\t\t\treportData.AllWOLoansTotalGrand += Loan.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Part.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Part.ayrt
index 1980ffa4..ab5d01a3 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Part.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Part.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each PM Part","Active":true,"Notes":"","Roles":50538,"AType":83,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemPartList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'ServicePreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemPartPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Parts}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"3\">{{PartNameViz}} {{PartDescriptionViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemPartList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"ServicePreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemPartList\", \"WorkOrderItemPartQuantity\", \"WorkOrderItemPartPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all parts so it exists\n\treportData.AllWOPartsNetViz = 0;\n\treportData.AllWOPartsTaxAs = 0;\n\treportData.AllWOPartsTaxBs = 0;\n\treportData.AllWOPartsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Part.NetViz != null) {\n\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\treportData.AllWOPartsTaxAs += Part.TaxAViz;\n\t\t\t\t\treportData.AllWOPartsTaxBs += Part.TaxBViz;\n\t\t\t\t\treportData.AllWOPartsTotalGrand += Part.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each PM Part","Active":true,"Notes":"","Roles":50538,"AType":83,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemPartList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'ServicePreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemPartPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Parts}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"3\">{{PartNameViz}} {{PartDescriptionViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemPartList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"ServicePreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemPartList\", \"WorkOrderItemPartQuantity\", \"WorkOrderItemPartPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all parts so it exists\n\treportData.AllWOPartsNetViz = 0;\n\treportData.AllWOPartsTaxAs = 0;\n\treportData.AllWOPartsTaxBs = 0;\n\treportData.AllWOPartsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Part.NetViz != null) {\n\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\treportData.AllWOPartsTaxAs += Part.TaxAViz;\n\t\t\t\t\treportData.AllWOPartsTaxBs += Part.TaxBViz;\n\t\t\t\t\treportData.AllWOPartsTotalGrand += Part.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Travel.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Travel.ayrt
index f3224efc..3eef6c87 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Travel.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each PM Travel.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each PM Travel","Active":true,"Notes":"","Roles":50538,"AType":87,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemTravelList'}} Nets Taxes LineTotals and Grand Totals </p> \n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'ServicePreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemTravelServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemTravelRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Travels}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"3\">{{TravelRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemTravelList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"ServicePreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemTravelList\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemTravelRateQuantity\", \"WorkOrderItemTravelRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Travels so it exists\n\treportData.AllWOTravelsNetViz = 0;\n\treportData.AllWOTravelsTaxAs = 0;\n\treportData.AllWOTravelsTaxBs = 0;\n\treportData.AllWOTravelsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Travel.NetViz != null) {\n\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz; //this IS where the actual adding to running total for this WOItem's Net Travel\n\t\t\t\t\treportData.AllWOTravelsTaxAs += Travel.TaxAViz;\n\t\t\t\t\treportData.AllWOTravelsTaxBs += Travel.TaxBViz;\n\t\t\t\t\treportData.AllWOTravelsTotalGrand += Travel.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each PM Travel","Active":true,"Notes":"","Roles":50538,"AType":87,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemTravelList'}} Nets Taxes LineTotals and Grand Totals </p> \n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'ServicePreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemTravelServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemTravelRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Travels}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td>               \n               <td colspan=\"3\">{{TravelRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemTravelList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"ServicePreventiveMaintenance\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemTravelList\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemTravelRateQuantity\", \"WorkOrderItemTravelRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Travels so it exists\n\treportData.AllWOTravelsNetViz = 0;\n\treportData.AllWOTravelsTaxAs = 0;\n\treportData.AllWOTravelsTaxBs = 0;\n\treportData.AllWOTravelsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Travel.NetViz != null) {\n\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz; //this IS where the actual adding to running total for this WOItem's Net Travel\n\t\t\t\t\treportData.AllWOTravelsTaxAs += Travel.TaxAViz;\n\t\t\t\t\treportData.AllWOTravelsTaxBs += Travel.TaxBViz;\n\t\t\t\t\treportData.AllWOTravelsTotalGrand += Travel.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Expense.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Expense.ayrt
index e86d63ba..ea77ca3b 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Expense.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Expense.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each Quote Expense","Active":true,"Notes":"","Roles":50538,"AType":23,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemExpenseList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"4\">{{ayT 'WorkOrderItemExpenseName'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemExpenseChargeToCustomer'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th> \n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Expenses}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"4\">{{Name}} {{Description}} </td>\n               {{#if ChargeToCustomer}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ChargeAmount}}</td>\n               <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}} {{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n               <!-- NOTE LineTotalViz is derived  from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount) -->\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"17\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemExpenseChargeToCustomer'}} {{ayT 'WorkOrderItemExpenseList'}} in this report</th> \n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"11\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesNetViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTaxs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"WorkOrderItemExpenseChargeToCustomer\", \"NetValue\", \"WorkOrderItemExpenseList\", \"WorkOrderItemExpenseName\", \"WorkOrderItemExpenseChargeAmount\", \"Tax\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Expenses so it exists\n\treportData.AllWOExpensesNetViz = 0;\n\treportData.AllWOExpensesTaxs = 0;\n\treportData.AllWOExpensesTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\n\n\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \treportData.AllWOExpensesNetViz += Exp.ChargeAmount;\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.ChargeAmount;\n          \t      \t\t}\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxAViz; \n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxBViz;\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each Quote Expense","Active":true,"Notes":"","Roles":50538,"AType":23,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemExpenseList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"4\">{{ayT 'WorkOrderItemExpenseName'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemExpenseChargeToCustomer'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th> \n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Expenses}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"4\">{{Name}} {{Description}} </td>\n               {{#if ChargeToCustomer}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ChargeAmount}}</td>\n               <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}} {{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n               <!-- NOTE LineTotalViz is derived  from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount) -->\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"17\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemExpenseChargeToCustomer'}} {{ayT 'WorkOrderItemExpenseList'}} in this report</th> \n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"11\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesNetViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTaxs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"WorkOrderItemExpenseChargeToCustomer\", \"NetValue\", \"WorkOrderItemExpenseList\", \"WorkOrderItemExpenseName\", \"WorkOrderItemExpenseChargeAmount\", \"Tax\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Expenses so it exists\n\treportData.AllWOExpensesNetViz = 0;\n\treportData.AllWOExpensesTaxs = 0;\n\treportData.AllWOExpensesTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\n\n\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \treportData.AllWOExpensesNetViz += Exp.ChargeAmount;\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.ChargeAmount;\n          \t      \t\t}\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxAViz; \n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxBViz;\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Labor.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Labor.ayrt
index df57e41b..914c2b51 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Labor.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Labor.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each Quote Labor","Active":true,"Notes":"","Roles":50538,"AType":24,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemLaborList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLaborServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemLaborPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborServiceRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Labors}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../Requested}}</td>               \n               <td colspan=\"3\">{{ServiceRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLaborList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\",  \"Customer\", \"QuoteQuoteRequestDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all labors so it exists\n\treportData.AllWOLaborsNetViz = 0;\n\treportData.AllWOLaborsTaxAs = 0;\n\treportData.AllWOLaborsTaxBs = 0;\n\treportData.AllWOLaborsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Labor.NetViz != null) {\n\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net labor\n\t\t\t\t\treportData.AllWOLaborsTaxAs += Labor.TaxAViz;\n\t\t\t\t\treportData.AllWOLaborsTaxBs += Labor.TaxBViz;\n\t\t\t\t\treportData.AllWOLaborsTotalGrand += Labor.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each Quote Labor","Active":true,"Notes":"","Roles":50538,"AType":24,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemLaborList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLaborServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemLaborRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborServiceRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Labors}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../Requested}}</td>               \n               <td colspan=\"3\">{{ServiceRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <td colspan=\"16\"></td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLaborList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\",  \"Customer\", \"QuoteQuoteRequestDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all labors so it exists\n\treportData.AllWOLaborsNetViz = 0;\n\treportData.AllWOLaborsTaxAs = 0;\n\treportData.AllWOLaborsTaxBs = 0;\n\treportData.AllWOLaborsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Labor.NetViz != null) {\n\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net labor\n\t\t\t\t\treportData.AllWOLaborsTaxAs += Labor.TaxAViz;\n\t\t\t\t\treportData.AllWOLaborsTaxBs += Labor.TaxBViz;\n\t\t\t\t\treportData.AllWOLaborsTotalGrand += Labor.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Loans.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Loans.ayrt
index f7baa53d..d8420702 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Loans.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Loans.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each Quote Loans","Active":true,"Notes":"","Roles":50538,"AType":29,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemLoanList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLoanUnit'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Loans}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../Requested}}</td>     \n               <td colspan=\"3\">{{LoanUnitViz}}</td>          \n               <td colspan=\"1\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLoanList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"NetValue\", \"WorkOrderItemLoanList\", \"WorkOrderItemLoanUnit\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Loans so it exists\n\treportData.AllWOLoansNetViz = 0;\n\treportData.AllWOLoansTaxAs = 0;\n\treportData.AllWOLoansTaxBs = 0;\n\treportData.AllWOLoansTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Loan.NetViz != null) {\n\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz; //this IS where the actual adding to running total for this WOItem's Net Loan\n\t\t\t\t\treportData.AllWOLoansTaxAs += Loan.TaxAViz;\n\t\t\t\t\treportData.AllWOLoansTaxBs += Loan.TaxBViz;\n\t\t\t\t\treportData.AllWOLoansTotalGrand += Loan.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each Quote Loans","Active":true,"Notes":"","Roles":50538,"AType":29,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemLoanList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLoanUnit'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Loans}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../Requested}}</td>     \n               <td colspan=\"3\">{{LoanUnitViz}}</td>          \n               <td colspan=\"1\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLoanList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"NetValue\", \"WorkOrderItemLoanList\", \"WorkOrderItemLoanUnit\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Loans so it exists\n\treportData.AllWOLoansNetViz = 0;\n\treportData.AllWOLoansTaxAs = 0;\n\treportData.AllWOLoansTaxBs = 0;\n\treportData.AllWOLoansTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Loan.NetViz != null) {\n\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz; //this IS where the actual adding to running total for this WOItem's Net Loan\n\t\t\t\t\treportData.AllWOLoansTaxAs += Loan.TaxAViz;\n\t\t\t\t\treportData.AllWOLoansTaxBs += Loan.TaxBViz;\n\t\t\t\t\treportData.AllWOLoansTotalGrand += Loan.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Part.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Part.ayrt
index 51e2d4c2..87e8facf 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Part.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Part.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each Quote Part","Active":true,"Notes":"","Roles":50538,"AType":30,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemPartList'}} Nets Taxes LineTotals and Grand Totals for each </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemPartPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Parts}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ../../Requested}}</td>               \n               <td colspan=\"3\">{{PartNameViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemPartList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"NetValue\", \"WorkOrderItemPartList\", \"WorkOrderItemPartQuantity\", \"WorkOrderItemPartPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all parts so it exists\n\treportData.AllWOPartsNetViz = 0;\n\treportData.AllWOPartsTaxAs = 0;\n\treportData.AllWOPartsTaxBs = 0;\n\treportData.AllWOPartsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Part.NetViz != null) {\n\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\treportData.AllWOPartsTaxAs += Part.TaxAViz;\n\t\t\t\t\treportData.AllWOPartsTaxBs += Part.TaxBViz;\n\t\t\t\t\treportData.AllWOPartsTotalGrand += Part.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each Quote Part","Active":true,"Notes":"","Roles":50538,"AType":30,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemPartList'}} Nets Taxes LineTotals and Grand Totals for each </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemPartPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Parts}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ../../Requested}}</td>               \n               <td colspan=\"3\">{{PartNameViz}} {{PartDescriptionViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemPartList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"NetValue\", \"WorkOrderItemPartList\", \"WorkOrderItemPartQuantity\", \"WorkOrderItemPartPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all parts so it exists\n\treportData.AllWOPartsNetViz = 0;\n\treportData.AllWOPartsTaxAs = 0;\n\treportData.AllWOPartsTaxBs = 0;\n\treportData.AllWOPartsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Part.NetViz != null) {\n\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\treportData.AllWOPartsTaxAs += Part.TaxAViz;\n\t\t\t\t\treportData.AllWOPartsTaxBs += Part.TaxBViz;\n\t\t\t\t\treportData.AllWOPartsTotalGrand += Part.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Travel.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Travel.ayrt
index 9f143a85..69521c72 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Travel.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each Quote Travel.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each Quote Travel","Active":true,"Notes":"","Roles":50538,"AType":76,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemTravelList'}} Nets Taxes LineTotals and Grand Totals </p> \n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemTravelServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemTravelRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Travels}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../Requested}}</td>               \n               <td colspan=\"3\">{{TravelRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemTravelList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"QuoteQuoteRequestDate\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemTravelList\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemTravelRateQuantity\", \"WorkOrderItemTravelRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Travels so it exists\n\treportData.AllWOTravelsNetViz = 0;\n\treportData.AllWOTravelsTaxAs = 0;\n\treportData.AllWOTravelsTaxBs = 0;\n\treportData.AllWOTravelsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Travel.NetViz != null) {\n\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz; //this IS where the actual adding to running total for this WOItem's Net Travel\n\t\t\t\t\treportData.AllWOTravelsTaxAs += Travel.TaxAViz;\n\t\t\t\t\treportData.AllWOTravelsTaxBs += Travel.TaxBViz;\n\t\t\t\t\treportData.AllWOTravelsTotalGrand += Travel.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each Quote Travel","Active":true,"Notes":"","Roles":50538,"AType":76,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemTravelList'}} Nets Taxes LineTotals and Grand Totals </p> \n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemTravelServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemTravelRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Travels}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../Requested}}</td>               \n               <td colspan=\"3\">{{TravelRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            \n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <td colspan=\"16\"></td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemTravelList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"QuoteQuoteRequestDate\", \"Customer\", \"PMNextServiceDate\", \"NetValue\", \"WorkOrderItemTravelList\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemTravelRateQuantity\", \"WorkOrderItemTravelRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Travels so it exists\n\treportData.AllWOTravelsNetViz = 0;\n\treportData.AllWOTravelsTaxAs = 0;\n\treportData.AllWOTravelsTaxBs = 0;\n\treportData.AllWOTravelsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Travel.NetViz != null) {\n\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz; //this IS where the actual adding to running total for this WOItem's Net Travel\n\t\t\t\t\treportData.AllWOTravelsTaxAs += Travel.TaxAViz;\n\t\t\t\t\treportData.AllWOTravelsTaxBs += Travel.TaxBViz;\n\t\t\t\t\treportData.AllWOTravelsTotalGrand += Travel.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Expense.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Expense.ayrt
index cd89221f..7afd2cd6 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Expense.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Expense.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each WO Expense","Active":true,"Notes":"","Roles":50538,"AType":36,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemExpenseList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"4\">{{ayT 'WorkOrderItemExpenseName'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemExpenseChargeToCustomer'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th> \n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Expenses}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"4\">{{Name}} {{Description}} </td>\n               {{#if ChargeToCustomer}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ChargeAmount}}</td>\n               <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}} {{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n               <!-- NOTE that LineTotalViz is derived from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount) -->\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"17\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemExpenseChargeToCustomer'}} {{ayT 'WorkOrderItemExpenseList'}} in this report</th> \n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"11\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesNetViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTaxs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemExpenseChargeToCustomer\", \"NetValue\", \"WorkOrderItemExpenseList\", \"WorkOrderItemExpenseName\", \"WorkOrderItemExpenseChargeAmount\", \"Tax\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Expenses so it exists\n\treportData.AllWOExpensesNetViz = 0;\n\treportData.AllWOExpensesTaxs = 0;\n\treportData.AllWOExpensesTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\n\n\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \treportData.AllWOExpensesNetViz += Exp.ChargeAmount;\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.ChargeAmount;\n          \t      \t\t}\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxAViz; \n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxBViz;\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each WO Expense","Active":true,"Notes":"","Roles":50538,"AType":36,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemExpenseList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"4\">{{ayT 'WorkOrderItemExpenseName'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemExpenseChargeToCustomer'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th> \n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Expenses}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"4\">{{Name}} {{Description}} </td>\n               {{#if ChargeToCustomer}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ChargeAmount}}</td>\n               <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}} {{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n               <!-- NOTE that LineTotalViz is derived from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount) -->\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"17\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemExpenseChargeToCustomer'}} {{ayT 'WorkOrderItemExpenseList'}} in this report</th> \n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'WorkOrderItemExpenseChargeAmount'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Tax'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"11\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesNetViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTaxs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOExpensesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemExpenseChargeToCustomer\", \"NetValue\", \"WorkOrderItemExpenseList\", \"WorkOrderItemExpenseName\", \"WorkOrderItemExpenseChargeAmount\", \"Tax\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Expenses so it exists\n\treportData.AllWOExpensesNetViz = 0;\n\treportData.AllWOExpensesTaxs = 0;\n\treportData.AllWOExpensesTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\n\n\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \treportData.AllWOExpensesNetViz += Exp.ChargeAmount;\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.ChargeAmount;\n          \t      \t\t}\t\t\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxAViz; \n\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxBViz;\n          \t      \t\t}\t\t\t\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\treportData.AllWOExpensesTaxs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOExpensesTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Labor.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Labor.ayrt
index 7dd24c49..9604d662 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Labor.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Labor.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each WO Labor","Active":true,"Notes":"","Roles":50538,"AType":37,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemLaborList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLaborServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemLaborPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborServiceRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Labors}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"3\">{{ServiceRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLaborList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all labors so it exists\n\treportData.AllWOLaborsNetViz = 0;\n\treportData.AllWOLaborsTaxAs = 0;\n\treportData.AllWOLaborsTaxBs = 0;\n\treportData.AllWOLaborsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Labor.NetViz != null) {\n\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net labor\n\t\t\t\t\treportData.AllWOLaborsTaxAs += Labor.TaxAViz;\n\t\t\t\t\treportData.AllWOLaborsTaxBs += Labor.TaxBViz;\n\t\t\t\t\treportData.AllWOLaborsTotalGrand += Labor.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each WO Labor","Active":true,"Notes":"","Roles":50538,"AType":37,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemLaborList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLaborServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemLaborPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLaborServiceRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Labors}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"3\">{{ServiceRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLaborList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLaborsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLaborsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemLaborList\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceRateQuantity\", \"WorkOrderItemLaborPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all labors so it exists\n\treportData.AllWOLaborsNetViz = 0;\n\treportData.AllWOLaborsTaxAs = 0;\n\treportData.AllWOLaborsTaxBs = 0;\n\treportData.AllWOLaborsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Labor.NetViz != null) {\n\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net labor\n\t\t\t\t\treportData.AllWOLaborsTaxAs += Labor.TaxAViz;\n\t\t\t\t\treportData.AllWOLaborsTaxBs += Labor.TaxBViz;\n\t\t\t\t\treportData.AllWOLaborsTotalGrand += Labor.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Loans.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Loans.ayrt
index dad596c6..88bd91c4 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Loans.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Loans.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each WO Loans","Active":true,"Notes":"","Roles":50538,"AType":38,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemLoanList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLoanUnit'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Loans}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>     \n               <td colspan=\"3\">{{LoanUnitViz}}</td>          \n               <td colspan=\"1\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLoanList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemLoanList\", \"WorkOrderItemLoanUnit\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Loans so it exists\n\treportData.AllWOLoansNetViz = 0;\n\treportData.AllWOLoansTaxAs = 0;\n\treportData.AllWOLoansTaxBs = 0;\n\treportData.AllWOLoansTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Loan.NetViz != null) {\n\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz; //this IS where the actual adding to running total for this WOItem's Net Loan\n\t\t\t\t\treportData.AllWOLoansTaxAs += Loan.TaxAViz;\n\t\t\t\t\treportData.AllWOLoansTaxBs += Loan.TaxBViz;\n\t\t\t\t\treportData.AllWOLoansTotalGrand += Loan.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each WO Loans","Active":true,"Notes":"","Roles":50538,"AType":38,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemLoanList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemLoanUnit'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLoanRate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemLoanQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Loans}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>     \n               <td colspan=\"3\">{{LoanUnitViz}}</td>          \n               <td colspan=\"1\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemLoanList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOLoansTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOLoansTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemLoanList\", \"WorkOrderItemLoanUnit\", \"WorkOrderItemLoanQuantity\", \"WorkOrderItemLoanRate\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Loans so it exists\n\treportData.AllWOLoansNetViz = 0;\n\treportData.AllWOLoansTaxAs = 0;\n\treportData.AllWOLoansTaxBs = 0;\n\treportData.AllWOLoansTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Loan.NetViz != null) {\n\t\t\t\t\treportData.AllWOLoansNetViz += Loan.NetViz; //this IS where the actual adding to running total for this WOItem's Net Loan\n\t\t\t\t\treportData.AllWOLoansTaxAs += Loan.TaxAViz;\n\t\t\t\t\treportData.AllWOLoansTaxBs += Loan.TaxBViz;\n\t\t\t\t\treportData.AllWOLoansTotalGrand += Loan.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Part.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Part.ayrt
index f59556a7..c3ca6df7 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Part.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Part.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each WO Part","Active":true,"Notes":"","Roles":50538,"AType":39,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemPartList'}} Nets Taxes LineTotals and Grand Totals for each </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemPartPrice'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Parts}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"3\">{{PartNameViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemPartList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemPartList\", \"WorkOrderItemPartQuantity\", \"WorkOrderItemPartPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all parts so it exists\n\treportData.AllWOPartsNetViz = 0;\n\treportData.AllWOPartsTaxAs = 0;\n\treportData.AllWOPartsTaxBs = 0;\n\treportData.AllWOPartsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Part.NetViz != null) {\n\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\treportData.AllWOPartsTaxAs += Part.TaxAViz;\n\t\t\t\t\treportData.AllWOPartsTaxBs += Part.TaxBViz;\n\t\t\t\t\treportData.AllWOPartsTotalGrand += Part.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each WO Part","Active":true,"Notes":"","Roles":50538,"AType":39,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemPartList'}} Nets Taxes LineTotals and Grand Totals for each </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartList'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemPartPrice'}} Per</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Parts}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"3\">{{PartNameViz}} {{PartDescriptionViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{Quantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemPartList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOPartsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOPartsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemPartList\", \"WorkOrderItemPartQuantity\", \"WorkOrderItemPartPrice\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//below declares keys to hold for all parts so it exists\n\treportData.AllWOPartsNetViz = 0;\n\treportData.AllWOPartsTaxAs = 0;\n\treportData.AllWOPartsTaxBs = 0;\n\treportData.AllWOPartsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Part.NetViz != null) {\n\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\treportData.AllWOPartsTaxAs += Part.TaxAViz;\n\t\t\t\t\treportData.AllWOPartsTaxBs += Part.TaxBViz;\n\t\t\t\t\treportData.AllWOPartsTotalGrand += Part.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Travel.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Travel.ayrt
index 69a13b8c..c82a6d41 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Travel.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Nets Taxes LineTotals for each WO Travel.ayrt	
@@ -1 +1 @@
-{"Name":"Nets Taxes LineTotals for each WO Travel","Active":true,"Notes":"","Roles":50538,"AType":43,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemTravelList'}} Nets Taxes LineTotals and Grand Totals </p> \n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemTravelServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemTravelRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Travels}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"3\">{{TravelRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemTravelList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\",  \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemTravelList\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemTravelRateQuantity\", \"WorkOrderItemTravelRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Travels so it exists\n\treportData.AllWOTravelsNetViz = 0;\n\treportData.AllWOTravelsTaxAs = 0;\n\treportData.AllWOTravelsTaxBs = 0;\n\treportData.AllWOTravelsTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Travel.NetViz != null) {\n\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz; //this IS where the actual adding to running total for this WOItem's Net Travel\n\t\t\t\t\treportData.AllWOTravelsTaxAs += Travel.TaxAViz;\n\t\t\t\t\treportData.AllWOTravelsTaxBs += Travel.TaxBViz;\n\t\t\t\t\treportData.AllWOTravelsTotalGrand += Travel.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Nets Taxes LineTotals for each WO Travel","Active":true,"Notes":"","Roles":50538,"AType":43,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemTravelList'}} Nets Taxes LineTotals and Grand Totals </p> \n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemTravelServiceRateID'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'WorkOrderItemTravelRateCharge'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemTravelRateQuantity'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each Travels}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{../../CustomerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td>               \n               <td colspan=\"3\">{{TravelRateViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemTravelList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOTravelsTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOTravelsTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders\n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\",  \"Customer\", \"WorkOrderServiceDate\", \"NetValue\", \"WorkOrderItemTravelList\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemTravelRateQuantity\", \"WorkOrderItemTravelRateCharge\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all Travels so it exists\n\treportData.AllWOTravelsNetViz = 0;\n\treportData.AllWOTravelsTaxAs = 0;\n\treportData.AllWOTravelsTaxBs = 0;\n\treportData.AllWOTravelsTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (Travel.NetViz != null) {\n\t\t\t\t\treportData.AllWOTravelsNetViz += Travel.NetViz; //this IS where the actual adding to running total for this WOItem's Net Travel\n\t\t\t\t\treportData.AllWOTravelsTaxAs += Travel.TaxAViz;\n\t\t\t\t\treportData.AllWOTravelsTaxBs += Travel.TaxBViz;\n\t\t\t\t\treportData.AllWOTravelsTotalGrand += Travel.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via PMs.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via PMs.ayrt
index afb3763c..9531f363 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via PMs.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via PMs.ayrt	
@@ -1 +1 @@
-{"Name":"Outside Service via PMs","Active":true,"Notes":"","Roles":50538,"AType":89,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemOutsideServiceList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateSent'}}</th>\n               <th colspan=\"3\">{{ayT 'Unit'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemOutsideServiceVendorSentToID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceRMANumber'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateReturned'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each OutsideServices}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate SentDate}}</td>\n               <td colspan=\"3\" class=\"centerlean\">{{UnitViz}}</td>               \n               <td colspan=\"3\" class=\"centerlean\">{{VendorSentToViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{RMANumber}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ReturnDate}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemOutsideServiceList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\r\ntfoot {\r\n  border-top: 2px solid #9e9e9e;\r\n  font-size: 7pt;\r\n  text-align: center;\r\n}\r\n\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 9pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 7pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"Customer\", \"Unit\", \"NetValue\", \"WorkOrderItemOutsideServiceList\", \"WorkOrderItemOutsideServiceDateSent\", \"WorkOrderItemOutsideServiceVendorSentToID\", \"WorkOrderItemOutsideServiceRMANumber\", \"WorkOrderItemOutsideServiceDateReturned\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all OutsideServices so it exists\n\treportData.AllWOOutsideServicesNetViz = 0;\n\treportData.AllWOOutsideServicesTaxAs = 0;\n\treportData.AllWOOutsideServicesTaxBs = 0;\n\treportData.AllWOOutsideServicesTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each OutsideService record of the wo's Item\n\t\t\tfor (OutsideService of Item.OutsideServices) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (OutsideService.NetViz != null) {\n\t\t\t\t\treportData.AllWOOutsideServicesNetViz += OutsideService.NetViz; //this IS where the actual adding to running total for this WOItem's Net OutsideService\n\t\t\t\t\treportData.AllWOOutsideServicesTaxAs += OutsideService.TaxAViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTaxBs += OutsideService.TaxBViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTotalGrand += OutsideService.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Outside Service via PMs","Active":true,"Notes":"","Roles":50538,"AType":89,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemOutsideServiceList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateSent'}}</th>\n               <th colspan=\"3\">{{ayT 'Unit'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemOutsideServiceVendorSentToID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceRMANumber'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateReturned'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each OutsideServices}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate SentDate}}</td>\n               <td colspan=\"3\" class=\"centerlean\">{{UnitViz}}</td>               \n               <td colspan=\"3\" class=\"centerlean\">{{VendorSentToViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{RMANumber}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ReturnDate}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n                <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemOutsideServiceList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\r\ntfoot {\r\n  border-top: 2px solid #9e9e9e;\r\n  font-size: 7pt;\r\n  text-align: center;\r\n}\r\n\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 9pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 7pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"Customer\", \"Unit\", \"NetValue\", \"WorkOrderItemOutsideServiceList\", \"WorkOrderItemOutsideServiceDateSent\", \"WorkOrderItemOutsideServiceVendorSentToID\", \"WorkOrderItemOutsideServiceRMANumber\", \"WorkOrderItemOutsideServiceDateReturned\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//below declares keys to hold for all OutsideServices so it exists\n\treportData.AllWOOutsideServicesNetViz = 0;\n\treportData.AllWOOutsideServicesTaxAs = 0;\n\treportData.AllWOOutsideServicesTaxBs = 0;\n\treportData.AllWOOutsideServicesTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each OutsideService record of the wo's Item\n\t\t\tfor (const OutsideService of Item.OutsideServices) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (OutsideService.NetViz != null) {\n\t\t\t\t\treportData.AllWOOutsideServicesNetViz += OutsideService.NetViz; //this IS where the actual adding to running total for this WOItem's Net OutsideService\n\t\t\t\t\treportData.AllWOOutsideServicesTaxAs += OutsideService.TaxAViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTaxBs += OutsideService.TaxBViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTotalGrand += OutsideService.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Quotes.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Quotes.ayrt
index 5472b6ea..a626f011 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Quotes.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Quotes.ayrt	
@@ -1 +1 @@
-{"Name":"Outside Service via Quotes","Active":true,"Notes":"","Roles":50538,"AType":79,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemOutsideServiceList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateSent'}}</th>\n               <th colspan=\"3\">{{ayT 'Unit'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemOutsideServiceVendorSentToID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceRMANumber'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateReturned'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each OutsideServices}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate SentDate}}</td>\n               <td colspan=\"3\" class=\"centerlean\">{{UnitViz}}</td>               \n               <td colspan=\"3\" class=\"centerlean\">{{VendorSentToViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{RMANumber}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ReturnDate}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemOutsideServiceList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\r\ntfoot {\r\n  border-top: 2px solid #9e9e9e;\r\n  font-size: 7pt;\r\n  text-align: center;\r\n}\r\n\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 9pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 7pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([ \"Quote\", \"Customer\", \"Unit\", \"NetValue\", \"WorkOrderItemOutsideServiceList\", \"WorkOrderItemOutsideServiceDateSent\", \"WorkOrderItemOutsideServiceVendorSentToID\", \"WorkOrderItemOutsideServiceRMANumber\", \"WorkOrderItemOutsideServiceDateReturned\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all OutsideServices so it exists\n\treportData.AllWOOutsideServicesNetViz = 0;\n\treportData.AllWOOutsideServicesTaxAs = 0;\n\treportData.AllWOOutsideServicesTaxBs = 0;\n\treportData.AllWOOutsideServicesTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each OutsideService record of the wo's Item\n\t\t\tfor (OutsideService of Item.OutsideServices) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (OutsideService.NetViz != null) {\n\t\t\t\t\treportData.AllWOOutsideServicesNetViz += OutsideService.NetViz; //this IS where the actual adding to running total for this WOItem's Net OutsideService\n\t\t\t\t\treportData.AllWOOutsideServicesTaxAs += OutsideService.TaxAViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTaxBs += OutsideService.TaxBViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTotalGrand += OutsideService.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Outside Service via Quotes","Active":true,"Notes":"","Roles":50538,"AType":79,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemOutsideServiceList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateSent'}}</th>\n               <th colspan=\"3\">{{ayT 'Unit'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemOutsideServiceVendorSentToID'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceRMANumber'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateReturned'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each OutsideServices}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate SentDate}}</td>\n               <td colspan=\"3\" class=\"centerlean\">{{UnitViz}}</td>               \n               <td colspan=\"3\" class=\"centerlean\">{{VendorSentToViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{RMANumber}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ReturnDate}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <td colspan=\"16\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"9\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemOutsideServiceList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"10\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\r\ntfoot {\r\n  border-top: 2px solid #9e9e9e;\r\n  font-size: 7pt;\r\n  text-align: center;\r\n}\r\n\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 9pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 7pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([ \"Quote\", \"Customer\", \"Unit\", \"NetValue\", \"WorkOrderItemOutsideServiceList\", \"WorkOrderItemOutsideServiceDateSent\", \"WorkOrderItemOutsideServiceVendorSentToID\", \"WorkOrderItemOutsideServiceRMANumber\", \"WorkOrderItemOutsideServiceDateReturned\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all OutsideServices so it exists\n\treportData.AllWOOutsideServicesNetViz = 0;\n\treportData.AllWOOutsideServicesTaxAs = 0;\n\treportData.AllWOOutsideServicesTaxBs = 0;\n\treportData.AllWOOutsideServicesTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each OutsideService record of the wo's Item\n\t\t\tfor (const OutsideService of Item.OutsideServices) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (OutsideService.NetViz != null) {\n\t\t\t\t\treportData.AllWOOutsideServicesNetViz += OutsideService.NetViz; //this IS where the actual adding to running total for this WOItem's Net OutsideService\n\t\t\t\t\treportData.AllWOOutsideServicesTaxAs += OutsideService.TaxAViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTaxBs += OutsideService.TaxBViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTotalGrand += OutsideService.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Work Orders.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Work Orders.ayrt
index 4bc7fe8d..68177fc0 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Work Orders.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Outside Service via Work Orders.ayrt	
@@ -1 +1 @@
-{"Name":"Outside Service via Work Orders","Active":true,"Notes":"","Roles":50538,"AType":73,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemOutsideServiceList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemOutsideServiceDateSent'}}</th>\n               <th colspan=\"3\">{{ayT 'Unit'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemOutsideServiceVendorSentToID'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemOutsideServiceRMANumber'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemOutsideServiceDateReturned'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each OutsideServices}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate SentDate}}</td>\n               <td colspan=\"3\" class=\"centerlean\">{{UnitViz}}</td>               \n               <td colspan=\"3\" class=\"centerlean\">{{VendorSentToViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{RMANumber}}</td>\n               <td colspan=\"1\" class=\"centerlean\">{{ayDate ReturnDate}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"11\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemOutsideServiceList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"12\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\r\ntfoot {\r\n  border-top: 2px solid #9e9e9e;\r\n  font-size: 7pt;\r\n  text-align: center;\r\n}\r\n\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 9pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 7pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"Unit\", \"NetValue\", \"WorkOrderItemOutsideServiceList\", \"WorkOrderItemOutsideServiceDateSent\", \"WorkOrderItemOutsideServiceVendorSentToID\", \"WorkOrderItemOutsideServiceRMANumber\", \"WorkOrderItemOutsideServiceDateReturned\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all OutsideServices so it exists\n\treportData.AllWOOutsideServicesNetViz = 0;\n\treportData.AllWOOutsideServicesTaxAs = 0;\n\treportData.AllWOOutsideServicesTaxBs = 0;\n\treportData.AllWOOutsideServicesTotalGrand = 0;\n\n\n\n\tfor (EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each OutsideService record of the wo's Item\n\t\t\tfor (OutsideService of Item.OutsideServices) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (OutsideService.NetViz != null) {\n\t\t\t\t\treportData.AllWOOutsideServicesNetViz += OutsideService.NetViz; //this IS where the actual adding to running total for this WOItem's Net OutsideService\n\t\t\t\t\treportData.AllWOOutsideServicesTaxAs += OutsideService.TaxAViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTaxBs += OutsideService.TaxBViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTotalGrand += OutsideService.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Outside Service via Work Orders","Active":true,"Notes":"","Roles":50538,"AType":73,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemOutsideServiceList'}} Nets Taxes LineTotals and Grand Totals </p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemOutsideServiceDateSent'}}</th>\n               <th colspan=\"3\">{{ayT 'Unit'}}</th>               \n               <th colspan=\"3\">{{ayT 'WorkOrderItemOutsideServiceVendorSentToID'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemOutsideServiceRMANumber'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemOutsideServiceDateReturned'}}</th>\n               <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            {{#each OutsideServices}}\n            <tr>\n               <td colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate SentDate}}</td>\n               <td colspan=\"3\" class=\"centerlean\">{{UnitViz}}</td>               \n               <td colspan=\"3\" class=\"centerlean\">{{VendorSentToViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{RMANumber}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayDate ReturnDate}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- footer is in its own table so displays once at end of report-->\n         <tfoot>\n            <tr>\n               <th colspan=\"12\" class=\"rightlean\">Totals for all {{ayT 'WorkOrderItemOutsideServiceList'}} in this report</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'NetValue'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n               <th colspan=\"1\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n               <th colspan=\"2\" class=\"rightlean\">{{ayT 'Total'}}</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is obtained through Prepare  -->\n               <td colspan=\"13\"></td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesNetViz}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxAs}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTaxBs}}</td>\n               <td colspan=\"2\" class=\"rightlean\">{{ayCurrency AllWOOutsideServicesTotalGrand}}</td>\n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n\n</html>","Style":"\r\ntfoot {\r\n  border-top: 2px solid #9e9e9e;\r\n  font-size: 7pt;\r\n  text-align: center;\r\n}\r\n\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 30px;\r\n  font-size: 9pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 7pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(reportData) {\n\t//this function (if present) is called with the report data \n\t//before the report is rendered\n\t//modify data as required here and return it to change the data before the report renders \n\t//see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"Unit\", \"NetValue\", \"WorkOrderItemOutsideServiceList\", \"WorkOrderItemOutsideServiceDateSent\", \"WorkOrderItemOutsideServiceVendorSentToID\", \"WorkOrderItemOutsideServiceRMANumber\", \"WorkOrderItemOutsideServiceDateReturned\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"Total\"]);\n\n\n\t//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n\t//below declares keys to hold for all OutsideServices so it exists\n\treportData.AllWOOutsideServicesNetViz = 0;\n\treportData.AllWOOutsideServicesTaxAs = 0;\n\treportData.AllWOOutsideServicesTaxBs = 0;\n\treportData.AllWOOutsideServicesTotalGrand = 0;\n\n\n\n\tfor (const EachWO of reportData.ayReportData) {\n\n\t\t//below is to Iterate through each item of the wo's Items\n\t\tfor (const Item of EachWO.Items) {\n\t\t\t//below is to Iterate through each OutsideService record of the wo's Item\n\t\t\tfor (const OutsideService of Item.OutsideServices) {\n\t\t\t\t//make sure it has a value before attempting to add it to the running total\n\t\t\t\tif (OutsideService.NetViz != null) {\n\t\t\t\t\treportData.AllWOOutsideServicesNetViz += OutsideService.NetViz; //this IS where the actual adding to running total for this WOItem's Net OutsideService\n\t\t\t\t\treportData.AllWOOutsideServicesTaxAs += OutsideService.TaxAViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTaxBs += OutsideService.TaxBViz;\n\t\t\t\t\treportData.AllWOOutsideServicesTotalGrand += OutsideService.LineTotalViz;\n\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\n\treturn reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/PM Item Summary.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/PM Item Summary.ayrt
index ca6448e1..1f64d817 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/PM Item Summary.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/PM Item Summary.ayrt	
@@ -1 +1 @@
-{"Name":"PM Item Summary","Active":true,"Notes":"Custom Prepare to display each PM Item total nets and totals for all workorder items in list","Roles":50538,"AType":22,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PM'}} {{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'PM'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"2\">{{ayT 'Priority'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            <!--note the need for trailing zeros and backslash to reference values above Items -->\n            <tr>\n               <td colspan=\"2\">{{PMId}} - {{Sequence}}</td>\n               <td colspan=\"2\">{{../CustomerViz}}</td>\n               <td colspan=\"1\">{{ayDate ../NextServiceDate}}</td>\n               <td colspan=\"1\">{{ayDate RequestDate}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemStatusColorViz}}\">{{WorkOrderItemStatusNameViz}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemPriorityColorViz}}\">{{WorkOrderItemPriorityNameViz}}</td>\n               <td colspan=\"3\">{{Notes}}</td>\n            </tr>\n            <tr>\n               <td colspan=\"14\">&nbsp;</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n         </tbody>\n         <tfoot>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":"\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 5px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"PM\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"Priority\", \"WorkOrderItemRequestDate\"]);\n\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"PM Item Summary","Active":true,"Notes":"Custom Prepare to display each PM Item total nets and totals for all workorder items in list","Roles":50538,"AType":22,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'PM'}} {{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'PM'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"2\">{{ayT 'Priority'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            <!--note the need for trailing zeros and backslash to reference values above Items -->\n            <tr>\n               <td colspan=\"2\">{{PMId}} - {{Sequence}}</td>\n               <td colspan=\"2\">{{../CustomerViz}}</td>\n               <td colspan=\"1\">{{ayDate ../NextServiceDate}}</td>\n               <td colspan=\"1\">{{ayDate RequestDate}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemStatusColorViz}}\">{{WorkOrderItemStatusNameViz}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemPriorityColorViz}}\">{{WorkOrderItemPriorityNameViz}}</td>\n               <td colspan=\"3\">{{Notes}}</td>\n            </tr>\n            <tr>\n               <td colspan=\"14\">&nbsp;</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n         </tbody>\n         <tfoot>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":"\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 5px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"PM\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"Priority\", \"WorkOrderItemRequestDate\"]);\n\n\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/PM Item Tasks .ayrt b/server/AyaNova/resource/rpt/stock-report-templates/PM Item Tasks .ayrt
index 43bf5ab7..892b8e45 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/PM Item Tasks .ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/PM Item Tasks .ayrt	
@@ -1 +1 @@
-{"Name":"PM Item Tasks ","Active":true,"Notes":"","Roles":50538,"AType":86,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemList'}} {{ayT 'WorkOrderItemTasks'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n          <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n\n\n\t\t\t\t\t<th colspan=\"2\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th> \n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemTasks'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each Tasks}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{ayDateTime ../../NextServiceDate}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"6\">{{Task}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemTasks\", \"PreventiveMaintenance\", \"WorkOrderItemList\", \"PMNextServiceDate\", \"WorkOrderItemSummary\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\" ]);\n\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n\r\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\r\n//note that this HAS to be added here in Helpers, is NOT built in\r\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\r\n    if(a == b) // Or === depending on your needs\r\n        return opts.fn(this);\r\n    else\r\n        return opts.inverse(this);\r\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"PM Item Tasks ","Active":true,"Notes":"","Roles":50538,"AType":86,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemList'}} {{ayT 'WorkOrderItemTasks'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n          <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n\n\n\t\t\t\t\t<th colspan=\"2\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th> \n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemTasks'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each Tasks}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{ayDateTime ../../NextServiceDate}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"6\">{{Task}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemTasks\", \"PreventiveMaintenance\", \"WorkOrderItemList\", \"PMNextServiceDate\", \"WorkOrderItemSummary\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\" ]);\n\n\n \n    return ayData;\n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\r\n\r\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\r\n    if(a == b) // Or === depending on your needs\r\n        return opts.fn(this);\r\n    else\r\n        return opts.inverse(this);\r\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/PM Parts Summary .ayrt b/server/AyaNova/resource/rpt/stock-report-templates/PM Parts Summary .ayrt
index 1083b05f..1ab73a2a 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/PM Parts Summary .ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/PM Parts Summary .ayrt	
@@ -1 +1 @@
-{"Name":"PM Parts Summary ","Active":true,"Notes":"Custom Prepare to obtain translations, group by the woitempart, derived amounts and running totals","Roles":49258,"AType":21,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"24\" class=\"reporttitle\">{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemParts'}} {{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"3\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"3\">{{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">{{ayT 'PartRetail'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">Difference</th>               \n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n            </tr>\n            {{#each items}}\n            <tr>\n               <td colspan=\"3\">&nbsp;</td>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{ayDate NextServiceDate}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{Quantity}}</td>\n               <td colspan=\"2\"  class=\"leftlean\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"2\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\">&nbsp;</td>               \n               {{#if NetCost }}<td colspan=\"3\">{{ayCurrency NetCost}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetViz }}<td colspan=\"3\">{{ayCurrency NetViz}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetDiff }}<td colspan=\"3\">{{ayCurrency NetDiff}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}               \n            </tr>\n            {{/each}}\n               <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"15\" class=\"rightlean\">{{ayT 'Total'}} for part {{group}}</th>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetCost}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsDiff}}</td>\n                </tr>\n                <tr>\n                   <td colspan=\"24\"><hr></td>\n                </tr>\n                <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>\n               <th colspan=\"24\">&nbsp;</th>\n            </tr>\n            <tr>               \n               <th colspan=\"15\" class=\"rightlean\">{{ayT 'Total'}} for all {{ayT 'WorkOrderItemParts'}} in this report</th>\n               <th colspan=\"3\">All Net Cost</th>\n               <th colspan=\"3\">All Net Charge</th>\n               <th colspan=\"3\">All Diff</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <td colspan=\"15\">&nbsp;</td>\n               {{#if AllWOPartsNetCost}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetCost}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}               \n               {{#if AllWOPartsDiff}} <td colspan=\"3\" class=\"centerlean\" >{{ayCurrency AllWOPartsDiff}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               \n            </tr>\n         </tfoot>\n      </table>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 20px;\n  font-size: 10pt; \n  color: #9e9e9e;\n  text-align: center;\n}\n\ntbody td {\n  padding: 2px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"Part\", \"PMNextServiceDate\", \"WorkOrderItemPartQuantity\", \"PreventiveMaintenance\", \"NetValue\", \"PartCost\", \"PartRetail\", \"Total\" ]);\n\n\t//below is the code to group by the part - the PartNameViz\n\tlet ret = [];\n    //iterate pms -> items -> pm item parts\n    reportData.ayReportData.forEach(pm => {\n        pm.Items.forEach(pmitem => {\n            pmitem.Parts.forEach(part => {\n                //new shape of data required for report \n                let record = {\n                    Serial: pm.Serial,\n\t\t\t\t\tNextServiceDate: pm.NextServiceDate,\n\t\t\t\t\tNetViz: part.NetViz,\n\t\t\t\t\tPriceOverride: part.PriceOverride,\n\t\t\t\t\tListPrice: part.ListPrice,\n                    UnitOfMeasureViz: part.UnitOfMeasureViz,\n                    PriceViz: part.PriceViz,\n                    Cost: part.Cost,\n                    SuggestedQuantity: part.SuggestedQuantity,\n                    Quantity: part.Quantity,\n                    PartWarehouseViz: part.PartWarehouseViz,\n                    UpcViz: part.UpcViz,\n                    Serials: part.Serials,\n                    PartDescriptionViz: part.PartDescriptionViz ?? \"\",\n                };\n\n                //Find or create group and insert this record               \n                let groupObject = ret.find(z => z.group == (part.PartNameViz + \" \" + record.PartDescriptionViz) );\n                if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                     ret.push({ group: (part.PartNameViz + \" \" + record.PartDescriptionViz), items: [record], count: 1 });\n                    \n                }\n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//need to now edit below to get running totals of THE DATA returned above - can't reference items as not in the returned data\n\n\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit (nets - costs), from all pms so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsNetCost = 0;\nreportData.AllWOPartsDiff = 0;\n\n\nfor (EachGroup of reportData.ayReportData) \n\t{\n\n\n\t//below declares a key on the entire group to hold all Part Net, costs, profit/loss (nets - costs), for this group (this group is a single Part that has one or more wo item parts records)\n\tEachGroup.GroupPartsNetViz = 0;\n\tEachGroup.GroupPartsNetCost = 0;\n\tEachGroup.GroupPartsDiff = 0; \n\t\n\n\t//below is to Iterate through each woitempart record for this part - groupitem is a woitempart record\n\tfor (groupitem of EachGroup.items)\n\t\t{\n\t\t\t\t\t\n\t\t\tgroupitem.ThisItemPartNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartNetCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartDiff = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (groupitem.Quantity != 0) \n        \t        \t{\n\t\t\t\t\t\tEachGroup.GroupPartsNetViz += groupitem.NetViz;\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += groupitem.NetViz;\t\n\n\n\t\t\t\t\t\tgroupitem.NetCost = (groupitem.Cost * groupitem.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupPartsNetCost += groupitem.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsNetCost += groupitem.NetCost;\n\n\n\t\t\t\t\t\tif (groupitem.NetViz != 0) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tgroupitem.NetDiff = (groupitem.NetViz - groupitem.NetCost)\n\t\t\t\t\t\tEachGroup.GroupPartsDiff += groupitem.NetDiff; //\n\t\t\t\t\t\treportData.AllWOPartsDiff += groupitem.NetDiff;  //\n\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\n\n\t\t\t\n\t\t}\n\n    }\n\n    return reportData; \n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"PM Parts Summary ","Active":true,"Notes":"Custom Prepare to obtain translations, group by the woitempart, derived amounts and running totals","Roles":49258,"AType":21,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"24\" class=\"reporttitle\">{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemParts'}} {{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"3\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"2\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"3\">{{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">{{ayT 'PartRetail'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">Difference</th>               \n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n            </tr>\n            {{#each items}}\n            <tr>\n               <td colspan=\"3\">&nbsp;</td>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{ayDate NextServiceDate}}</td>\n               <td colspan=\"1\" class=\"rightlean\">{{Quantity}}</td>\n               <td colspan=\"2\"  class=\"leftlean\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"2\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\">&nbsp;</td>               \n               {{#if NetCost }}<td colspan=\"3\">{{ayCurrency NetCost}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetViz }}<td colspan=\"3\">{{ayCurrency NetViz}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetDiff }}<td colspan=\"3\">{{ayCurrency NetDiff}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}               \n            </tr>\n            {{/each}}\n               <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"15\" class=\"rightlean\">{{ayT 'Total'}} for part {{group}}</th>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetCost}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsDiff}}</td>\n                </tr>\n                <tr>\n                   <td colspan=\"24\"><hr></td>\n                </tr>\n                <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>\n               <th colspan=\"24\">&nbsp;</th>\n            </tr>\n            <tr>               \n               <th colspan=\"15\" class=\"rightlean\">{{ayT 'Total'}} for all {{ayT 'WorkOrderItemParts'}} in this report</th>\n               <th colspan=\"3\">All Net Cost</th>\n               <th colspan=\"3\">All Net Charge</th>\n               <th colspan=\"3\">All Diff</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <td colspan=\"15\">&nbsp;</td>\n               {{#if AllWOPartsNetCost}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetCost}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}               \n               {{#if AllWOPartsDiff}} <td colspan=\"3\" class=\"centerlean\" >{{ayCurrency AllWOPartsDiff}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               \n            </tr>\n         </tfoot>\n      </table>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 20px;\n  font-size: 10pt; \n  color: #9e9e9e;\n  text-align: center;\n}\n\ntbody td {\n  padding: 2px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"Part\", \"PMNextServiceDate\", \"WorkOrderItemPartQuantity\", \"PreventiveMaintenance\", \"NetValue\", \"PartCost\", \"PartRetail\", \"Total\" ]);\n\n\t//below is the code to group by the part - the PartNameViz\n\tlet ret = [];\n    //iterate pms -> items -> pm item parts\n    reportData.ayReportData.forEach(pm => {\n        pm.Items.forEach(pmitem => {\n            pmitem.Parts.forEach(part => {\n                //new shape of data required for report \n                let record = {\n                    Serial: pm.Serial,\n\t\t\t\t\tNextServiceDate: pm.NextServiceDate,\n\t\t\t\t\tNetViz: part.NetViz,\n\t\t\t\t\tPriceOverride: part.PriceOverride,\n\t\t\t\t\tListPrice: part.ListPrice,\n                    UnitOfMeasureViz: part.UnitOfMeasureViz,\n                    PriceViz: part.PriceViz,\n                    Cost: part.Cost,\n                    SuggestedQuantity: part.SuggestedQuantity,\n                    Quantity: part.Quantity,\n                    PartWarehouseViz: part.PartWarehouseViz,\n                    UpcViz: part.UpcViz,\n                    Serials: part.Serials,\n                    PartDescriptionViz: part.PartDescriptionViz ?? \"\",\n                };\n\n                //Find or create group and insert this record               \n                let groupObject = ret.find(z => z.group == (part.PartNameViz + \" \" + record.PartDescriptionViz) );\n                if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                     ret.push({ group: (part.PartNameViz + \" \" + record.PartDescriptionViz), items: [record], count: 1 });\n                    \n                }\n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//below to get running totals of THE DATA returned above\n\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit (nets - costs), from all pms so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsNetCost = 0;\nreportData.AllWOPartsDiff = 0;\n\n\nfor (const EachGroup of reportData.ayReportData) \n\t{\n\n\n\t//below declares a key on the entire group to hold all Part Net, costs, profit/loss (nets - costs), for this group (this group is a single Part that has one or more wo item parts records)\n\tEachGroup.GroupPartsNetViz = 0;\n\tEachGroup.GroupPartsNetCost = 0;\n\tEachGroup.GroupPartsDiff = 0; \n\t\n\n\t//below is to Iterate through each woitempart record for this part - groupitem is a woitempart record\n\tfor (const groupitem of EachGroup.items)\n\t\t{\n\t\t\t\t\t\n\t\t\tgroupitem.ThisItemPartNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartNetCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartDiff = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\n\t\t\t//makes sure it has a value before attempting to add it to the running total\n                \tif (groupitem.Quantity != 0) \n        \t        \t{\n\t\t\t\t\t\tEachGroup.GroupPartsNetViz += groupitem.NetViz;\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += groupitem.NetViz;\t\n\n\n\t\t\t\t\t\tgroupitem.NetCost = (groupitem.Cost * groupitem.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupPartsNetCost += groupitem.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsNetCost += groupitem.NetCost;\n\n\n\t\t\t\t\t\tif (groupitem.NetViz != 0) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tgroupitem.NetDiff = (groupitem.NetViz - groupitem.NetCost)\n\t\t\t\t\t\tEachGroup.GroupPartsDiff += groupitem.NetDiff; //\n\t\t\t\t\t\treportData.AllWOPartsDiff += groupitem.NetDiff;  //\n\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\n\t\t\t\n\n\t\t\t\n\t\t}\n\n    }\n\n    return reportData; \n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/PM Scheduled Users.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/PM Scheduled Users.ayrt
index 03f54ef3..24ba91f6 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/PM Scheduled Users.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/PM Scheduled Users.ayrt	
@@ -1 +1 @@
-{"Name":"PM Scheduled Users","Active":true,"Notes":"","Roles":50538,"AType":85,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemScheduledUserList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'PM'}}</th>\n          <th colspan=\"2\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUsers'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each ScheduledUsers}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{../../CustomerViz}}</td>\n          <td colspan=\"2\">{{../WorkOrderItemStatusNameViz}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n          <td colspan=\"2\">{{UserViz}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"1\">{{EstimatedQuantity}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"PM\", \"PreventiveMaintenance\", \"WorkOrderItemScheduledUsers\", \"WorkOrderItemScheduledUserList\", \"WorkOrder\", \"Customer\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserEstimatedQuantity\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"PM Scheduled Users","Active":true,"Notes":"","Roles":50538,"AType":85,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'PreventiveMaintenance'}} {{ayT 'WorkOrderItemScheduledUserList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'PM'}}</th>\n          <th colspan=\"2\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUsers'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each ScheduledUsers}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{../../CustomerViz}}</td>\n          <td colspan=\"2\">{{../WorkOrderItemStatusNameViz}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n          <td colspan=\"2\">{{UserViz}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"1\">{{EstimatedQuantity}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"PM\", \"PreventiveMaintenance\", \"WorkOrderItemScheduledUsers\", \"WorkOrderItemScheduledUserList\", \"WorkOrder\", \"Customer\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserEstimatedQuantity\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/PM Units grouped by Customer.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/PM Units grouped by Customer.ayrt
index 7419f718..f7f87ac5 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/PM Units grouped by Customer.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/PM Units grouped by Customer.ayrt	
@@ -1 +1 @@
-{"Name":"PM Units grouped by Customer","Active":true,"Notes":"","Roles":50538,"AType":88,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'PMList'}} {{ayT 'WorkOrderItemUnitList'}} grouped by {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\" class=\"leftlean\" >{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"1\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemUnit'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"10\">{{group}}</td>\n            </tr>\n           {{#each items}}\n               {{#each Items}}\n                     {{#each Units}}\n            <tr>               \n               <td  colspan=\"2\">&nbsp;</td>\n               <td  colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td> <!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"1\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td><!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"2\" >{{UnitViz}} - {{UnitModelNameViz}}</td>\n               <td  colspan=\"1\" >{{../WorkOrderItemStatusNameViz}}</td><!--note the  ../ to go up level to get this data -->\n               <td  colspan=\"3\" >{{../Notes}}</td><!--note the  ../ to go up level to get this data -->        \n          </tr>\n                     {{/each}}\n               {{/each}}\n          {{/each}}\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>     \n   </div>\n\n   <!-- uncomment to see the raw data returned from the custom Prepare \n<div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> \n-->\n\n</body>\n</html>","Style":".minimum {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"PMList\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitList\", \"WorkOrderStatus\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderSummary\" ]);\n\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"PM Units grouped by Customer","Active":true,"Notes":"","Roles":50538,"AType":88,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'PMList'}} {{ayT 'WorkOrderItemUnitList'}} grouped by {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\" class=\"leftlean\" >{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'PreventiveMaintenance'}}</th>\n               <th colspan=\"1\">{{ayT 'PMNextServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemUnit'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"10\">{{group}}</td>\n            </tr>\n           {{#each items}}\n               {{#each Items}}\n                     {{#each Units}}\n            <tr>               \n               <td  colspan=\"2\">&nbsp;</td>\n               <td  colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td> <!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"1\" class=\"centerlean\">{{ayDate ../../NextServiceDate}}</td><!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"2\" >{{UnitViz}} - {{UnitModelNameViz}}</td>\n               <td  colspan=\"1\" >{{../WorkOrderItemStatusNameViz}}</td><!--note the  ../ to go up level to get this data -->\n               <td  colspan=\"3\" >{{../Notes}}</td><!--note the  ../ to go up level to get this data -->        \n          </tr>\n                     {{/each}}\n               {{/each}}\n          {{/each}}\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>     \n   </div>\n\n   <!-- uncomment to see the raw data returned from the custom Prepare \n<div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> \n-->\n\n</body>\n</html>","Style":".minimum {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"PreventiveMaintenance\", \"PMList\", \"Customer\", \"PMNextServiceDate\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitList\", \"WorkOrderStatus\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderSummary\" ]);\n\n\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/PO Items Received vs Ordered.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/PO Items Received vs Ordered.ayrt
index 4f87c159..ac9d3f65 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/PO Items Received vs Ordered.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/PO Items Received vs Ordered.ayrt	
@@ -1 +1 @@
-{"Name":"PO Items Received vs Ordered","Active":true,"Notes":"Includes Prepare that determines the difference between Ordered and Received for display, and #if_eq Helper used to display red if difference between QuantityReceived and QuantityOrdered","Roles":33130,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div  >\t      \n\t\t<table  > \n     \t\t<thead>\n           <tr >\n               <th colspan=\"25\" class=\"reporttitle\" >Purchase Order Items Received compared to Ordered</th>\n           </tr>\n           <tr>\n               <td colspan=\"25\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"4\">{{ayT 'PurchaseOrderStatus'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t      <th colspan=\"5\">{{ayT 'PartWholesalerID'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderReceiptReceivedDate'}}</th>\n               <th colspan=\"5\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderItemQuantityOrdered'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderItemQuantityReceived'}}</th>        \n\t\t\t      <th colspan=\"1\">Diff +/- </th>       \n            </tr>\n            <tr>\n               <td colspan=\"25\">&nbsp;</td>\n            </tr>\n     \t\t</thead>\n          \n         <tbody>  \n            {{#each ayReportData}}\n            {{#each Items}}<!--  the #each  for the Sample Data MUST encompass the section  where its going to show - in this case the tbody, so needs to be placed within  -->\n                           <!-- note that the #each Items as is looping through the Items of each PO, not the PO header\n                                  <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t   <td colspan=\"4\" class=\"leftlean\">{{../StatusViz}}</td>\n               <td colspan=\"2\">{{../Serial}}</td> <!-- note the ../ in front of the variable name when calling a variable from 'above' the Items array of the object  -->\n\t\t\t      <td colspan=\"5\">{{../VendorViz}}</td> <!-- note the ../ in front of the variable name when calling a variable from 'above' the Items array of the object  -->\n               <td colspan=\"2\">{{ayDate ../OrderedDate}}</td> <!-- note the ../ in front of the variable name when calling a variable from 'above' the Items array of the object  -->\n               <td colspan=\"2\">{{ayDate ReceivedDate}}</td>\n               <td colspan=\"5\">{{PartViz}} {{PartNameViz}}</td>\n               <td colspan=\"2\">{{QuantityOrdered}}</td>\n               <td colspan=\"2\">{{QuantityReceived}}</td>     \n               {{#if_eq QuantityOrdered QuantityReceived }} <td colspan=\"1\" class=\"fontgreen\">{{ThisItemQtyDiff}}</td> {{else}}<td colspan=\"1\" class=\"fontred\">- {{ThisItemQtyDiff}}</td>{{/if_eq}}\n\t\t\t\t</tr>\n\n           \t {{/each}}   \n            {{/each}}  \n         </tbody>\n\n      </table>\n\n      \n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; /* the # of columns set in the first row of the thead will be fixed and applied throughout table and rows */\n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold; \n}\n\n","JsPrerender":"async function ayPrepareData(ayData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"PurchaseOrderStatus\", \"PurchaseOrderPONumber\", \"PartWholesalerID\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderReceiptReceivedDate\",  \"Part\", \"PurchaseOrderItemQuantityOrdered\", \"PurchaseOrderItemQuantityReceived\" ]);\n\n        //Iterate through all the records in the reportData to get the difference between ordered and received\n    for (EachPO of ayData.ayReportData) \n    {\n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po \n            {\n                let ThisItemQtyDiff = 0; //Declare a temporary variable to hold the difference for this item\n                if (Item.QuantityOrdered != null) //make sure QuantityOrdered has a value before attempting to use it\n                {\n                    ThisItemQtyDiff = Item.QuantityOrdered - Item.QuantityReceived;\n                }\n                Item.ThisItemQtyDiff=ThisItemQtyDiff;\n            }\n    }\n\n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})\n\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"PO Items Received vs Ordered","Active":true,"Notes":"Includes Prepare that determines the difference between Ordered and Received for display, and #if_eq Helper used to display red if difference between QuantityReceived and QuantityOrdered","Roles":33130,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div  >\t      \n\t\t<table  > \n     \t\t<thead>\n           <tr >\n               <th colspan=\"25\" class=\"reporttitle\" >Purchase Order Items Received compared to Ordered</th>\n           </tr>\n           <tr>\n               <td colspan=\"25\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"4\">{{ayT 'PurchaseOrderStatus'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t      <th colspan=\"5\">{{ayT 'PartWholesalerID'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderReceiptReceivedDate'}}</th>\n               <th colspan=\"5\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderItemQuantityOrdered'}}</th>\n               <th colspan=\"2\">{{ayT 'PurchaseOrderItemQuantityReceived'}}</th>        \n\t\t\t      <th colspan=\"1\">Diff +/- </th>       \n            </tr>\n            <tr>\n               <td colspan=\"25\">&nbsp;</td>\n            </tr>\n     \t\t</thead>\n          \n         <tbody>  \n            {{#each ayReportData}}\n            {{#each Items}}<!--  the #each  for the Sample Data MUST encompass the section  where its going to show - in this case the tbody, so needs to be placed within  -->\n                           <!-- note that the #each Items as is looping through the Items of each PO, not the PO header\n                                  <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t   <td colspan=\"4\" class=\"leftlean\">{{../StatusViz}}</td>\n               <td colspan=\"2\">{{../Serial}}</td> <!-- note the ../ in front of the variable name when calling a variable from 'above' the Items array of the object  -->\n\t\t\t      <td colspan=\"5\">{{../VendorViz}}</td> <!-- note the ../ in front of the variable name when calling a variable from 'above' the Items array of the object  -->\n               <td colspan=\"2\">{{ayDate ../OrderedDate}}</td> <!-- note the ../ in front of the variable name when calling a variable from 'above' the Items array of the object  -->\n               <td colspan=\"2\">{{ayDate ReceivedDate}}</td>\n               <td colspan=\"5\">{{PartViz}} {{PartNameViz}}</td>\n               <td colspan=\"2\">{{QuantityOrdered}}</td>\n               <td colspan=\"2\">{{QuantityReceived}}</td>     \n               {{#if_eq QuantityOrdered QuantityReceived }} <td colspan=\"1\" class=\"fontgreen\">{{ThisItemQtyDiff}}</td> {{else}}<td colspan=\"1\" class=\"fontred\">- {{ThisItemQtyDiff}}</td>{{/if_eq}}\n\t\t\t\t</tr>\n\n           \t {{/each}}   \n            {{/each}}  \n         </tbody>\n\n      </table>\n\n      \n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold; \n}\n\n","JsPrerender":"async function ayPrepareData(ayData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"PurchaseOrderStatus\", \"PurchaseOrderPONumber\", \"PartWholesalerID\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderReceiptReceivedDate\",  \"Part\", \"PurchaseOrderItemQuantityOrdered\", \"PurchaseOrderItemQuantityReceived\" ]);\n\n        //Iterate through all the records in the reportData to get the difference between ordered and received\n    for (const EachPO of ayData.ayReportData) \n    {\n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po \n            {\n                let ThisItemQtyDiff = 0; //Declare a temporary variable to hold the difference for this item\n                if (Item.QuantityOrdered != null) //make sure QuantityOrdered has a value before attempting to use it\n                {\n                    ThisItemQtyDiff = Item.QuantityOrdered - Item.QuantityReceived;\n                }\n                Item.ThisItemQtyDiff=ThisItemQtyDiff;\n            }\n    }\n\n    return ayData;\n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Part Grouped Net Cost Difference.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Part Grouped Net Cost Difference.ayrt
index 7e9599b5..e8f3736a 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Part Grouped Net Cost Difference.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Part Grouped Net Cost Difference.ayrt	
@@ -1 +1 @@
-{"Name":"Part Grouped Net Cost Difference","Active":true,"Notes":"Custom Prepare to obtain translations, group by the woitempart, derived amounts and running totals","Roles":49258,"AType":39,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"24\" class=\"reporttitle\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemParts'}} {{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"3\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"4\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}}</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}}</th>\n               <th colspan=\"3\">{{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">{{ayT 'PartRetail'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">Difference</th>               \n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n            </tr>\n            {{#each items}}\n            <tr>\n               <td colspan=\"3\">&nbsp;</td>\n               <td colspan=\"2\">{{Serial}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}} <td colspan=\"2\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{Quantity}}</td>\n               <td colspan=\"2\"  class=\"leftlean\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"2\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\">{{ayCurrency PriceViz}}</td>               \n               {{#if NetCost }}<td colspan=\"3\">{{ayCurrency NetCost}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetViz }}<td colspan=\"3\">{{ayCurrency NetViz}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetDiff }}<td colspan=\"3\">{{ayCurrency NetDiff}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}               \n            </tr>\n            {{/each}}\n               <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"15\" class=\"rightlean\" >{{ayT 'Total'}} for part {{group}}</th>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetCost}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsDiff}}</td>\n                </tr>\n                <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>               \n               <th colspan=\"15\" class=\"rightlean\">{{ayT 'Total'}} for all {{ayT 'WorkOrderItemParts'}} in this report</th>\n               <th colspan=\"3\">All Net Cost</th>\n               <th colspan=\"3\">All Net Charge</th>\n               <th colspan=\"3\">All Diff</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <td colspan=\"15\">&nbsp;</td>\n               {{#if AllWOPartsNetCost}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetCost}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}               \n               {{#if AllWOPartsDiff}} <td colspan=\"3\" class=\"centerlean\" >{{ayCurrency AllWOPartsDiff}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               \n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 10pt; \n  color: #9e9e9e;\n  text-align: center;\n}\n\ntbody td {\n  padding: 2px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"Part\", \"WorkOrderServiceDate\", \"WorkOrderItemPartQuantity\", \"WorkOrder\", \"WorkOrderList\", \"NetValue\", \"PartCost\", \"PartRetail\", \"Total\" ]);\n\n\t//below is the code to group by the part - the PartNameViz\n\tlet ret = [];\n    //iterate workorders -> items -> workorder item parts\n    reportData.ayReportData.forEach(workorder => {\n        workorder.Items.forEach(workorderitem => {\n            workorderitem.Parts.forEach(part => {\n                //new shape of data required for report\n                let record = {\n                    Serial: workorder.Serial,\n\t\t\t\t\tServiceDate: workorder.ServiceDate,\n\t\t\t\t\tNetViz: part.NetViz,\n\t\t\t\t\tPriceOverride: part.PriceOverride,\n\t\t\t\t\tListPrice: part.ListPrice,\n                    UnitOfMeasureViz: part.UnitOfMeasureViz,\n                    PriceViz: part.PriceViz,\n                    Cost: part.Cost,\n                    SuggestedQuantity: part.SuggestedQuantity,\n                    Quantity: part.Quantity,\n                    PartWarehouseViz: part.PartWarehouseViz,\n                    UpcViz: part.UpcViz,\n\t\t\t\t\tPartDescriptionViz: part.PartDescriptionViz ?? \"\",\n                    Serials: part.Serials\n                };\n\n                //Find or create group and insert this record               \n                let groupObject = ret.find(z => z.group == part.PartNameViz + \" \" + record.PartDescriptionViz);\n                if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                    ret.push({ group: part.PartNameViz + \" \" + record.PartDescriptionViz, items: [record], count: 1 });\n                }\n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//need to now edit below to get running totals of THE DATA returned above - can't reference items as not in the returned data\n\n\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit (nets - costs), from all workorders so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsNetCost = 0;\nreportData.AllWOPartsDiff = 0;\n\n\nfor (EachGroup of reportData.ayReportData) \n\t{\n\n\n\t//below declares a key on the entire group to hold all Part Net, costs, profit/loss (nets - costs), for this group (this group is a single Part that has one or more wo item parts records)\n\tEachGroup.GroupPartsNetViz = 0;\n\tEachGroup.GroupPartsNetCost = 0;\n\tEachGroup.GroupPartsDiff = 0; \n\t\n\n\t//below is to Iterate through each woitempart record for this part - groupitem is a woitempart record\n\tfor (groupitem of EachGroup.items)\n\t\t{\n\t\t\t\t\t\n\t\t\tgroupitem.ThisItemPartNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartNetCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartDiff = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (groupitem.Quantity != 0) \n        \t        \t{\n\t\t\t\t\t\tEachGroup.GroupPartsNetViz += groupitem.NetViz;\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += groupitem.NetViz;\t\n\n\n\t\t\t\t\t\tgroupitem.NetCost = (groupitem.Cost * groupitem.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupPartsNetCost += groupitem.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsNetCost += groupitem.NetCost;\n\n\n\t\t\t\t\t\tif (groupitem.NetViz != 0) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tgroupitem.NetDiff = (groupitem.NetViz - groupitem.NetCost)\n\t\t\t\t\t\tEachGroup.GroupPartsDiff += groupitem.NetDiff; //\n\t\t\t\t\t\treportData.AllWOPartsDiff += groupitem.NetDiff;  //\n\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\n\n\t\t\t\n\t\t}\n\n    }\n\n    return reportData; \n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Part Grouped Net Cost Difference","Active":true,"Notes":"Custom Prepare to obtain translations, group by the woitempart, derived amounts and running totals","Roles":49258,"AType":39,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"24\" class=\"reporttitle\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemParts'}} {{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"3\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"4\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n               <th colspan=\"3\">{{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">{{ayT 'PartRetail'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">Difference</th>               \n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n            </tr>\n            {{#each items}}\n            <tr>\n               <td colspan=\"3\">&nbsp;</td>\n               <td colspan=\"2\">{{Serial}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}} <td colspan=\"2\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\" class=\"rightlean\">{{Quantity}}</td>\n               <td colspan=\"2\"  class=\"leftlean\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"2\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\">{{ayCurrency PriceViz}}</td>               \n               {{#if NetCost }}<td colspan=\"3\">{{ayCurrency NetCost}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetViz }}<td colspan=\"3\">{{ayCurrency NetViz}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetDiff }}<td colspan=\"3\">{{ayCurrency NetDiff}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}               \n            </tr>\n            {{/each}}\n               <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"15\" class=\"rightlean\" >{{ayT 'Total'}} for part {{group}}</th>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetCost}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsDiff}}</td>\n                </tr>\n                <tr>\n                    <th colspan=\"24\">&nbsp;</th>\n                </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>               \n               <th colspan=\"15\" class=\"rightlean\">{{ayT 'Total'}} for all {{ayT 'WorkOrderItemParts'}} in this report</th>\n               <th colspan=\"3\">All Net Cost</th>\n               <th colspan=\"3\">All Net Charge</th>\n               <th colspan=\"3\">All Diff</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <td colspan=\"15\">&nbsp;</td>\n               {{#if AllWOPartsNetCost}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetCost}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}               \n               {{#if AllWOPartsDiff}} <td colspan=\"3\" class=\"centerlean\" >{{ayCurrency AllWOPartsDiff}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               \n            </tr>\n         </tfoot>\n      </table>\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 10pt; \n  color: #9e9e9e;\n  text-align: center;\n}\n\ntbody td {\n  padding: 2px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"Part\", \"WorkOrderServiceDate\", \"WorkOrderItemPartQuantity\", \"WorkOrder\", \"WorkOrderList\", \"NetValue\", \"PartCost\", \"PartRetail\", \"Total\" ]);\n\n\t//below is the code to group by the part - the PartNameViz\n\tlet ret = [];\n    //iterate workorders -> items -> workorder item parts\n    reportData.ayReportData.forEach(workorder => {\n        workorder.Items.forEach(workorderitem => {\n            workorderitem.Parts.forEach(part => {\n                //new shape of data required for report\n                let record = {\n                    Serial: workorder.Serial,\n\t\t\t\t\tServiceDate: workorder.ServiceDate,\n\t\t\t\t\tNetViz: part.NetViz,\n\t\t\t\t\tPriceOverride: part.PriceOverride,\n\t\t\t\t\tListPrice: part.ListPrice,\n                    UnitOfMeasureViz: part.UnitOfMeasureViz,\n                    PriceViz: part.PriceViz,\n                    Cost: part.Cost,\n                    SuggestedQuantity: part.SuggestedQuantity,\n                    Quantity: part.Quantity,\n                    PartWarehouseViz: part.PartWarehouseViz,\n                    UpcViz: part.UpcViz,\n\t\t\t\t\tPartDescriptionViz: part.PartDescriptionViz ?? \"\",\n                    Serials: part.Serials\n                };\n\n                //Find or create group and insert this record               \n                let groupObject = ret.find(z => z.group == part.PartNameViz + \" \" + record.PartDescriptionViz);\n                if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                    ret.push({ group: part.PartNameViz + \" \" + record.PartDescriptionViz, items: [record], count: 1 });\n                }\n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//below gets running totals of THE custom DATA returned above\n\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit (nets - costs), from all workorders so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsNetCost = 0;\nreportData.AllWOPartsDiff = 0;\n\n\nfor (const EachGroup of reportData.ayReportData) \n\t{\n\n\n\t//below declares a key on the entire group to hold all Part Net, costs, profit/loss (nets - costs), for this group (this group is a single Part that has one or more wo item parts records)\n\tEachGroup.GroupPartsNetViz = 0;\n\tEachGroup.GroupPartsNetCost = 0;\n\tEachGroup.GroupPartsDiff = 0; \n\t\n\n\t//below is to Iterate through each woitempart record for this part - groupitem is a woitempart record\n\tfor (const groupitem of EachGroup.items)\n\t\t{\n\t\t\t\t\t\n\t\t\tgroupitem.ThisItemPartNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartNetCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartDiff = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (groupitem.Quantity != 0) \n        \t        \t{\n\t\t\t\t\t\tEachGroup.GroupPartsNetViz += groupitem.NetViz;\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += groupitem.NetViz;\t\n\n\n\t\t\t\t\t\tgroupitem.NetCost = (groupitem.Cost * groupitem.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupPartsNetCost += groupitem.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsNetCost += groupitem.NetCost;\n\n\n\t\t\t\t\t\tif (groupitem.NetViz != 0) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tgroupitem.NetDiff = (groupitem.NetViz - groupitem.NetCost)\n\t\t\t\t\t\tEachGroup.GroupPartsDiff += groupitem.NetDiff; //\n\t\t\t\t\t\treportData.AllWOPartsDiff += groupitem.NetDiff;  //\n\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t\n\t\t\t\n\n\t\t\t\n\t\t}\n\n    }\n\n    return reportData; \n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Part Requests Grouped By Wholesaler.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Part Requests Grouped By Wholesaler.ayrt
index 31c3a4bf..6e2d94fc 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Part Requests Grouped By Wholesaler.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Part Requests Grouped By Wholesaler.ayrt	
@@ -1 +1 @@
-{"Name":"Part Requests Grouped By Wholesaler","Active":true,"Notes":"","Roles":50554,"AType":91,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'WorkOrderItemPartRequests'}} grouped by {{ayT 'PartWholesalerID'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"1\"></th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'QuantityRequired'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'WorkOrderItemPartPartWarehouseID'}}</th>\n\t\t\t\t\t<th colspan=\"3\">Date Requested</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PurchaseOrderItemUIOrderedFrom'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderExpectedReceiveDate'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" >{{ayT 'PartWholesalerID'}}:  </th>\n\t\t\t\t\t<td colspan=\"21\"> {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"4\">{{PartName}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{PartWarehouseName}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{ayDate RequestDate}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{PurchaseOrderSerial}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{ayDate OrderedDate}}</td>\n\t\t\t\t\t<td colspan=\"4\">{{PurchaseOrderVendor}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{ayDate ExpectedReceiveDate}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"22\" class=\"rightlean\"># of {{ayT 'WorkOrderItemPartRequests'}} for {{ayT 'PartWholesalerID'}} {{group}}:&emsp;</th>\n\t\t\t\t\t<td colspan=\"2\">{{count}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"22\" class=\"rightlean\">Total {{ayT 'QuantityRequired'}} of {{ayT 'PartList'}} for {{ayT 'PartWholesalerID'}} {{group}}:&emsp;</th>\n\t\t\t\t\t<td colspan=\"2\">{{ThisGroupTotalQty}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; /* the # of columns set in the first row of the thead will be fixed and applied throughout table and rows */\r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'WholesalerName')\n\n    await ayGetTranslations([\"WorkOrderItemPartRequests\", \"PartWholesalerID\", \"Part\", \"QuantityRequired\", \"WorkOrderItemPartPartWarehouseID\", \"PurchaseOrderPONumber\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderItemUIOrderedFrom\", \"PurchaseOrderExpectedReceiveDate\", \"PartList\" ]);\n\n     //Iterate through all the records in the reportData obtaining a running total of Quantity for each group\n    for (EachGroup of ayData.ayReportData) \n    {  \n         let ThisGroupTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS group\n            for (Item of EachGroup.items)  //Iterate through all the records adding the Qty amount of each item to the ThisGroupTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.Quantity != null) \n                {\n                    ThisGroupTotalQty += Item.Quantity;\n                }\n                Item.QuantityRunning=ThisGroupTotalQty;\n            }\n        EachGroup.ThisGroupTotalQty=ThisGroupTotalQty;\n\n\n    }\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Part Requests Grouped By Wholesaler","Active":true,"Notes":"","Roles":50554,"AType":91,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'WorkOrderItemPartRequests'}} grouped by {{ayT 'PartWholesalerID'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"1\"></th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'QuantityRequired'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'WorkOrderItemPartPartWarehouseID'}}</th>\n\t\t\t\t\t<th colspan=\"3\">Date Requested</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PurchaseOrderItemUIOrderedFrom'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderExpectedReceiveDate'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" >{{ayT 'PartWholesalerID'}}:  </th>\n\t\t\t\t\t<td colspan=\"21\"> {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"4\">{{PartName}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{PartWarehouseName}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{ayDate RequestDate}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{PurchaseOrderSerial}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{ayDate OrderedDate}}</td>\n\t\t\t\t\t<td colspan=\"4\">{{PurchaseOrderVendor}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{ayDate ExpectedReceiveDate}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"22\" class=\"rightlean\"># of {{ayT 'WorkOrderItemPartRequests'}} for {{ayT 'PartWholesalerID'}} {{group}}:&emsp;</th>\n\t\t\t\t\t<td colspan=\"2\">{{count}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"22\" class=\"rightlean\">Total {{ayT 'QuantityRequired'}} of {{ayT 'PartList'}} for {{ayT 'PartWholesalerID'}} {{group}}:&emsp;</th>\n\t\t\t\t\t<td colspan=\"2\">{{ThisGroupTotalQty}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'WholesalerName')\n\n    await ayGetTranslations([\"WorkOrderItemPartRequests\", \"PartWholesalerID\", \"Part\", \"QuantityRequired\", \"WorkOrderItemPartPartWarehouseID\", \"PurchaseOrderPONumber\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderItemUIOrderedFrom\", \"PurchaseOrderExpectedReceiveDate\", \"PartList\" ]);\n\n     //Iterate through all the records in the reportData obtaining a running total of Quantity for each group\n    for (const EachGroup of ayData.ayReportData) \n    {  \n         let ThisGroupTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS group\n            for (const Item of EachGroup.items)  //Iterate through all the records adding the Qty amount of each item to the ThisGroupTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.Quantity != null) \n                {\n                    ThisGroupTotalQty += Item.Quantity;\n                }\n                Item.QuantityRunning=ThisGroupTotalQty;\n            }\n        EachGroup.ThisGroupTotalQty=ThisGroupTotalQty;\n\n\n    }\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Parts & Labor Profit _ Loss.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Parts & Labor Profit _ Loss.ayrt
index 0f2c96f6..b7beec64 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Parts & Labor Profit _ Loss.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Parts & Labor Profit _ Loss.ayrt	
@@ -1 +1 @@
-{"Name":"Parts & Labor Profit / Loss","Active":true,"Notes":"Custom Prepare running totals and derived WO profit/loss ","Roles":49258,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"24\" class=\"reporttitle\">Parts &#38; Labor Profit / Loss</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} Cost</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} Profit / Loss</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} Cost</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} Profit / Loss</th>\n               <th colspan=\"3\" class=\"rightlean\">+ / -</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"3\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}} <td class=\"\">no Service Date specified</td>{{/if}}\n               <td colspan=\"1\">&nbsp;</td>\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"2\" class=\"fontblue\">{{ayCurrency ThisWOAllLaborsNetViz}}</td> {{else}}<td colspan=\"2\" class=\"\">no billable labor</td>{{/if}}\n               {{#if ThisWOAllLaborsCost }}<td colspan=\"2\" class=\"fontpurple\">{{ayCurrency ThisWOAllLaborsCost}}</td> {{else}}<td colspan=\"2\" class=\"\">no labor costs</td>{{/if}}\n               {{#if ThisWOAllLaborsLoss }}<td colspan=\"2\" class=\"fontred\">({{ayCurrency ThisWOAllLaborsLoss}})</td> {{else}}<td colspan=\"2\" class=\"fontgreen\">{{ayCurrency ThisWOAllLaborsProfit}}</td>{{/if}}\n               <td colspan=\"1\">&nbsp;</td>\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"2\" class=\"fontblue\">{{ayCurrency ThisWOAllPartsNetViz}}</td> {{else}}<td colspan=\"2\" class=\"\">no billable parts</td>{{/if}}\n               {{#if ThisWOAllPartsCost }}<td colspan=\"2\" class=\"fontpurple\">{{ayCurrency ThisWOAllPartsCost}}</td> {{else}}<td colspan=\"2\" class=\"\">no parts costs</td>{{/if}}\n               {{#if ThisWOAllPartsLoss }} <td colspan=\"2\" class=\"fontred\">({{ayCurrency ThisWOAllPartsLoss}})</td>{{else}}<td colspan=\"2\" class=\"fontgreen \">{{ayCurrency ThisWOAllPartsProfit}}</td>{{/if}}\n               {{#if ThisWOTotalLoss }}<td colspan=\"3\" class=\"fontred rightlean\">({{ayCurrency ThisWOTotalLoss}})</td> {{else}} <td colspan=\"3\" class=\"fontgreen rightlean\">{{ayCurrency ThisWOTotalProfit}}</td>{{/if}}\n            </tr>\n            {{/each}}\n         </tbody>\n\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>\n               <th colspan=\"24\">&nbsp;</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <th colspan=\"8\">Totals for all listed {{ayT 'WorkOrderList'}}</th>\n               {{#if AllWOLaborsNetViz}} <td colspan=\"2\" class=\"fontblue\">{{ ayCurrency AllWOLaborsNetViz}}</td> {{else}} <td colspan=\"2\">no billable labor</td>{{/if}}\n               {{#if AllWOLaborsCost}} <td colspan=\"2\" class=\"fontpurple\">{{ ayCurrency AllWOLaborsCost}}</td> {{else}} <td colspan=\"2\" class=\" fontpurple\">no labor costs</td>{{/if}}\n               {{#if AllWOLaborsLoss}} <td colspan=\"2\" class=\"fontred\">({{ ayCurrency AllWOLaborsLoss}})</td> {{else}} <td colspan=\"2\" class=\" fontgreen\"> {{ ayCurrency AllWOLaborsProfit }}</td>{{/if}}\n               <td colspan=\"1\">&nbsp;</td>\n               {{#if AllWOPartsNetViz}} <td colspan=\"2\" class=\"fontblue\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"2\">no billable parts</td> {{/if}}\n               {{#if AllWOPartsCost}} <td colspan=\"2\" class=\"fontpurple\">{{ ayCurrency AllWOPartsCost}}</td> {{else}} <td colspan=\"2\">no parts cost</td> {{/if}}\n               {{#if AllWOPartsLoss}} <td colspan=\"2\" class=\"fontred\">({{ ayCurrency AllWOPartsLoss}})</td> {{else}} <td colspan=\"2\" class=\"fontgreen\"> {{ ayCurrency AllWOPartsProfit }}</td> {{/if}}\n               {{#if AllWOTotalLoss}} <td colspan=\"3\" class=\"fontred rightlean\">({{ ayCurrency AllWOTotalLoss}})</td> {{else}} <td colspan=\"3\" class=\"fontgreen rightlean\">{{ ayCurrency AllWOTotalProfit}}</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 10pt; \n  color: #9e9e9e;\n}\n\ntfoot th{\n  border-top: solid 1pt #9e9e9e;\n  height: 50px;\n  text-align: center;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\ntfoot {\n  font-size: 9pt;\n  }\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"WorkOrderItemLabors\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrder\", \"WorkOrderList\", \"Total\", \"TaxCodeTaxAValue\", \"TaxCodeTaxBValue\", \"NetValue\" ]);\n\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor nets, costs, profit/loss (nets - costs),from all workorders so it exists and a key to hold all Labor Net Costs\nreportData.AllWOLaborsNetViz = 0;\nreportData.AllWOLaborsCost = 0;\nreportData.AllWOLaborsProfit = 0;\nreportData.AllWOLaborsLoss = 0;\n\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit/loss (nets - costs), from all workorders so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsCost = 0;\nreportData.AllWOPartsProfit = 0;\nreportData.AllWOPartsLoss = 0;\n\n\n//below declares a key to hold all Nets, hold all Costs, profit/loss (nets - costs), from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\nreportData.AllWOTotalCost = 0;\nreportData.AllWOTotalProfit = 0;\nreportData.AllWOTotalLoss = 0;\n\n\n\n\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor nets, costs, profit/loss (nets - costs) from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\tEachWO.ThisWOAllLaborsCost = 0;\n\tEachWO.ThisWOAllLaborsProfit = 0;\n\tEachWO.ThisWOAllLaborsLoss = 0;\n\n\t//below declares a key on the entire wo to hold all Part Net, costs, profit/loss (nets - costs), from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\tEachWO.ThisWOAllPartsCost = 0;\n\tEachWO.ThisWOAllPartsProfit = 0; \n\tEachWO.ThisWOAllPartsLoss = 0;  \n\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets , costs, profit/loss (nets - costs) so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\tEachWO.ThisWOTotalCost = 0;\n\tEachWO.ThisWOTotalProfit = 0;\n\tEachWO.ThisWOTotalLoss = 0;\n\t\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\tItem.ThisItemAllLaborsCost = 0; //declare a key on the Item to hold all of this item's labor costs and set it initially to 0\n\t\t\tItem.ThisItemAllLaborsProfit = 0; //declare a key on the Item to hold all of this item's labor profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\n\n\t\t\t\t\t\tLabor.NetCost = (Labor.CostViz * Labor.ServiceRateQuantity);\n\t\t\t\t\t\tItem.ThisItemAllLaborsCost += Labor.NetCost; //this IS where the actual adding to running total for this WOItem's Labors Cost\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsCost += Labor.NetCost; //this IS where the actual adding to the running total for this entire WO's  Labors costs\n\t\t\t\t\t\tEachWO.ThisWOTotalCost += Labor.NetCost; //this IS where the actual adding to the running total for ALL costs for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOLaborsCost += Labor.NetCost;\t//this IS where the actual adding to the running total for all labor costs for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalCost += Labor.NetCost; //this is where the actual adding to the running total for ALL workorders costs in this report data\n\n\t\t\t\t\t\tif (Labor.NetCost != null) \n\t\t\t\t\t\t{\n\n\t\t\t\t\t\tLabor.NetProfit = (Labor.NetViz - Labor.NetCost)\n\t\t\t\t\t\tItem.ThisItemAllLaborsProfit += Labor.NetProfit; //this NOT USED \n\t\t\t\t\t\tEachWO.ThisWOAllLaborsProfit += Labor.NetProfit; //this works\n\t\t\t\t\t\tEachWO.ThisWOTotalProfit += Labor.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOLaborsProfit += Labor.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOTotalProfit += Labor.NetProfit;  //this works\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tItem.ThisItemAllPartsCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tItem.ThisItemAllPartsProfit = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n\t\t\t\t\t\tPart.NetCost = (Part.Cost * Part.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tItem.ThisItemAllPartsCost += Part.NetCost;\n\t\t\t\t\t\tEachWO.ThisWOAllPartsCost += Part.NetCost;\n\t\t\t\t\t\tEachWO.ThisWOTotalCost += Part.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsCost += Part.NetCost;\n\t\t\t\t\t\treportData.AllWOTotalCost += Part.NetCost;\n\n\t\t\t\t\t\tif (Part.NetViz != null) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tPart.NetProfit = (Part.NetViz - Part.Cost)\n\t\t\t\t\t\tItem.ThisItemAllPartsProfit += Part.NetProfit; //this NOT USED \n\t\t\t\t\t\tEachWO.ThisWOAllPartsProfit += Part.NetProfit; //this works\n\t\t\t\t\t\tEachWO.ThisWOTotalProfit += Part.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOPartsProfit += Part.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOTotalProfit += Part.NetProfit;  //this works\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t\n\t\t}\n\n\n\t\tif (EachWO.ThisWOAllLaborsProfit <= 0) {\n\t\t\t\tEachWO.ThisWOAllLaborsLoss = EachWO.ThisWOAllLaborsProfit;\n\t\t\t\tEachWO.ThisWOAllLaborsProfit = 0;\n\t\t\t}\n\n\t\tif (EachWO.ThisWOAllPartsProfit <= 0) {\n\t\t\t\tEachWO.ThisWOAllPartsLoss = EachWO.ThisWOAllPartsProfit;\n\t\t\t\tEachWO.ThisWOAllPartsProfit = 0;\n\t\t\t}\n\n\t\tif (EachWO.ThisWOTotalProfit <= 0) {\n\t\t\t\tEachWO.ThisWOTotalLoss = EachWO.ThisWOTotalProfit;\n\t\t\t\tEachWO.ThisWOTotalProfit = 0;\n\t\t\t}\n\n\t}\n\n\nif (reportData.AllWOLaborsProfit <= 0) {\n\t\treportData.AllWOLaborsLoss = reportData.AllWOLaborsProfit;\n\t\treportData.AllWOLaborsProfit = 0;\n\t}\n\nif (reportData.AllWOPartsProfit <= 0) {\n\t\treportData.AllWOPartsProfit = reportData.AllWOPartsProfit;\n\t\treportData.AllWOPartsProfit = 0;\n\t}\n\nif (reportData.AllWOTotalProfit <= 0) {\n\t\treportData.AllWOTotalLoss = reportData.AllWOTotalProfit;\n\t\treportData.AllWOTotalProfit = 0;\n\t}\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Parts & Labor Profit / Loss","Active":true,"Notes":"Custom Prepare running totals and derived WO profit/loss ","Roles":49258,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"24\" class=\"reporttitle\">Parts &#38; Labor Profit / Loss</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"3\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} Cost</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemLabors'}} Profit / Loss</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} Cost</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemParts'}} Profit / Loss</th>\n               <th colspan=\"3\" class=\"rightlean\">+ / -</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"3\">{{CustomerViz}}</td>\n               <td colspan=\"2\">{{ayDate ServiceDate}}</td>\n               <td colspan=\"1\">&nbsp;</td>\n               {{#if ThisWOAllLaborsNetViz }}<td colspan=\"2\" class=\"fontblue\">{{ayCurrency ThisWOAllLaborsNetViz}}</td> {{else}}<td colspan=\"2\" class=\"\">no billable labor</td>{{/if}}\n               {{#if ThisWOAllLaborsCost }}<td colspan=\"2\" class=\"fontpurple\">{{ayCurrency ThisWOAllLaborsCost}}</td> {{else}}<td colspan=\"2\" class=\"\">no labor costs</td>{{/if}}\n               {{#if ThisWOAllLaborsLoss }}<td colspan=\"2\" class=\"fontred\">({{ayCurrency ThisWOAllLaborsLoss}})</td> {{else}}<td colspan=\"2\" class=\"fontgreen\">{{ayCurrency ThisWOAllLaborsProfit}}</td>{{/if}}\n               <td colspan=\"1\">&nbsp;</td>\n               {{#if ThisWOAllPartsNetViz }}<td colspan=\"2\" class=\"fontblue\">{{ayCurrency ThisWOAllPartsNetViz}}</td> {{else}}<td colspan=\"2\" class=\"\">no billable parts</td>{{/if}}\n               {{#if ThisWOAllPartsCost }}<td colspan=\"2\" class=\"fontpurple\">{{ayCurrency ThisWOAllPartsCost}}</td> {{else}}<td colspan=\"2\" class=\"\">no parts costs</td>{{/if}}\n               {{#if ThisWOAllPartsLoss }} <td colspan=\"2\" class=\"fontred\">({{ayCurrency ThisWOAllPartsLoss}})</td>{{else}}<td colspan=\"2\" class=\"fontgreen \">{{ayCurrency ThisWOAllPartsProfit}}</td>{{/if}}\n               {{#if ThisWOTotalLoss }}<td colspan=\"3\" class=\"fontred rightlean\">({{ayCurrency ThisWOTotalLoss}})</td> {{else}} <td colspan=\"3\" class=\"fontgreen rightlean\">{{ayCurrency ThisWOTotalProfit}}</td>{{/if}}\n            </tr>\n            {{/each}}\n         </tbody>\n\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <th colspan=\"8\">Totals for all listed {{ayT 'WorkOrderList'}}</th>\n               {{#if AllWOLaborsNetViz}} <td colspan=\"2\" class=\"fontblue\">{{ ayCurrency AllWOLaborsNetViz}}</td> {{else}} <td colspan=\"2\">no billable labor</td>{{/if}}\n               {{#if AllWOLaborsCost}} <td colspan=\"2\" class=\"fontpurple\">{{ ayCurrency AllWOLaborsCost}}</td> {{else}} <td colspan=\"2\" class=\" fontpurple\">no labor costs</td>{{/if}}\n               {{#if AllWOLaborsLoss}} <td colspan=\"2\" class=\"fontred\">({{ ayCurrency AllWOLaborsLoss}})</td> {{else}} <td colspan=\"2\" class=\" fontgreen\"> {{ ayCurrency AllWOLaborsProfit }}</td>{{/if}}\n               <td colspan=\"1\">&nbsp;</td>\n               {{#if AllWOPartsNetViz}} <td colspan=\"2\" class=\"fontblue\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"2\">no billable parts</td> {{/if}}\n               {{#if AllWOPartsCost}} <td colspan=\"2\" class=\"fontpurple\">{{ ayCurrency AllWOPartsCost}}</td> {{else}} <td colspan=\"2\">no parts cost</td> {{/if}}\n               {{#if AllWOPartsLoss}} <td colspan=\"2\" class=\"fontred\">({{ ayCurrency AllWOPartsLoss}})</td> {{else}} <td colspan=\"2\" class=\"fontgreen\"> {{ ayCurrency AllWOPartsProfit }}</td> {{/if}}\n               {{#if AllWOTotalLoss}} <td colspan=\"3\" class=\"fontred rightlean\">({{ ayCurrency AllWOTotalLoss}})</td> {{else}} <td colspan=\"3\" class=\"fontgreen rightlean\">{{ ayCurrency AllWOTotalProfit}}</td> {{/if}}\n            </tr>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 10pt; \n  color: #9e9e9e;\n}\n\ntfoot th{\n  border-top: solid 1pt #9e9e9e;\n  height: 50px;\n  text-align: center;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\ntfoot {\n  font-size: 9pt;\n  }\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"WorkOrderItemLabors\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrder\", \"WorkOrderList\", \"Total\", \"TaxCodeTaxAValue\", \"TaxCodeTaxBValue\", \"NetValue\" ]);\n\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n//below declares a key on the entire wo to hold all Labor nets, costs, profit/loss (nets - costs),from all workorders so it exists and a key to hold all Labor Net Costs\nreportData.AllWOLaborsNetViz = 0;\nreportData.AllWOLaborsCost = 0;\nreportData.AllWOLaborsProfit = 0;\nreportData.AllWOLaborsLoss = 0;\n\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit/loss (nets - costs), from all workorders so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsCost = 0;\nreportData.AllWOPartsProfit = 0;\nreportData.AllWOPartsLoss = 0;\n\n\n//below declares a key to hold all Nets, hold all Costs, profit/loss (nets - costs), from all workorders in this list so it exists\nreportData.AllWOTotalNets = 0;\nreportData.AllWOTotalCost = 0;\nreportData.AllWOTotalProfit = 0;\nreportData.AllWOTotalLoss = 0;\n\n\n\n\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor nets, costs, profit/loss (nets - costs) from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\tEachWO.ThisWOAllLaborsCost = 0;\n\tEachWO.ThisWOAllLaborsProfit = 0;\n\tEachWO.ThisWOAllLaborsLoss = 0;\n\n\t//below declares a key on the entire wo to hold all Part Net, costs, profit/loss (nets - costs), from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\tEachWO.ThisWOAllPartsCost = 0;\n\tEachWO.ThisWOAllPartsProfit = 0; \n\tEachWO.ThisWOAllPartsLoss = 0;  \n\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets , costs, profit/loss (nets - costs) so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\tEachWO.ThisWOTotalCost = 0;\n\tEachWO.ThisWOTotalProfit = 0;\n\tEachWO.ThisWOTotalLoss = 0;\n\t\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\tItem.ThisItemAllLaborsCost = 0; //declare a key on the Item to hold all of this item's labor costs and set it initially to 0\n\t\t\tItem.ThisItemAllLaborsProfit = 0; //declare a key on the Item to hold all of this item's labor profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOLaborsNetViz += Labor.NetViz;\t//this IS where the actual adding to the running total for all labor for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Labor.NetViz; //this is where the actual adding to the running total for ALL workorders Nets in this report data\t\n\n\t\t\t\t\t\tLabor.NetCost = (Labor.CostViz * Labor.ServiceRateQuantity);\n\t\t\t\t\t\tItem.ThisItemAllLaborsCost += Labor.NetCost; //this IS where the actual adding to running total for this WOItem's Labors Cost\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsCost += Labor.NetCost; //this IS where the actual adding to the running total for this entire WO's  Labors costs\n\t\t\t\t\t\tEachWO.ThisWOTotalCost += Labor.NetCost; //this IS where the actual adding to the running total for ALL costs for THIS workorders in this report data\n\t\t\t\t\t\treportData.AllWOLaborsCost += Labor.NetCost;\t//this IS where the actual adding to the running total for all labor costs for ALL workorders in this report data\t\t\t\n\t\t\t\t\t\treportData.AllWOTotalCost += Labor.NetCost; //this is where the actual adding to the running total for ALL workorders costs in this report data\n\n\t\t\t\t\t\tif (Labor.NetCost != null) \n\t\t\t\t\t\t{\n\n\t\t\t\t\t\tLabor.NetProfit = (Labor.NetViz - Labor.NetCost)\n\t\t\t\t\t\tItem.ThisItemAllLaborsProfit += Labor.NetProfit; //this NOT USED \n\t\t\t\t\t\tEachWO.ThisWOAllLaborsProfit += Labor.NetProfit; //this works\n\t\t\t\t\t\tEachWO.ThisWOTotalProfit += Labor.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOLaborsProfit += Labor.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOTotalProfit += Labor.NetProfit;  //this works\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tItem.ThisItemAllPartsCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tItem.ThisItemAllPartsProfit = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += Part.NetViz; //this IS where the actual adding to the running total for all Parts for all workorders in this report data\t\n\t\t\t\t\t\treportData.AllWOTotalNets += Part.NetViz; //this is where the actual adding to the running total for all workorder Nets in this report data\n\n\t\t\t\t\t\tPart.NetCost = (Part.Cost * Part.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tItem.ThisItemAllPartsCost += Part.NetCost;\n\t\t\t\t\t\tEachWO.ThisWOAllPartsCost += Part.NetCost;\n\t\t\t\t\t\tEachWO.ThisWOTotalCost += Part.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsCost += Part.NetCost;\n\t\t\t\t\t\treportData.AllWOTotalCost += Part.NetCost;\n\n\t\t\t\t\t\tif (Part.NetViz != null) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tPart.NetProfit = (Part.NetViz - Part.Cost)\n\t\t\t\t\t\tItem.ThisItemAllPartsProfit += Part.NetProfit; //this NOT USED \n\t\t\t\t\t\tEachWO.ThisWOAllPartsProfit += Part.NetProfit; //this works\n\t\t\t\t\t\tEachWO.ThisWOTotalProfit += Part.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOPartsProfit += Part.NetProfit;  //this works\n\t\t\t\t\t\treportData.AllWOTotalProfit += Part.NetProfit;  //this works\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t\n\t\t}\n\n\n\t\tif (EachWO.ThisWOAllLaborsProfit <= 0) {\n\t\t\t\tEachWO.ThisWOAllLaborsLoss = EachWO.ThisWOAllLaborsProfit;\n\t\t\t\tEachWO.ThisWOAllLaborsProfit = 0;\n\t\t\t}\n\n\t\tif (EachWO.ThisWOAllPartsProfit <= 0) {\n\t\t\t\tEachWO.ThisWOAllPartsLoss = EachWO.ThisWOAllPartsProfit;\n\t\t\t\tEachWO.ThisWOAllPartsProfit = 0;\n\t\t\t}\n\n\t\tif (EachWO.ThisWOTotalProfit <= 0) {\n\t\t\t\tEachWO.ThisWOTotalLoss = EachWO.ThisWOTotalProfit;\n\t\t\t\tEachWO.ThisWOTotalProfit = 0;\n\t\t\t}\n\n\t}\n\n\nif (reportData.AllWOLaborsProfit <= 0) {\n\t\treportData.AllWOLaborsLoss = reportData.AllWOLaborsProfit;\n\t\treportData.AllWOLaborsProfit = 0;\n\t}\n\nif (reportData.AllWOPartsProfit <= 0) {\n\t\treportData.AllWOPartsProfit = reportData.AllWOPartsProfit;\n\t\treportData.AllWOPartsProfit = 0;\n\t}\n\nif (reportData.AllWOTotalProfit <= 0) {\n\t\treportData.AllWOTotalLoss = reportData.AllWOTotalProfit;\n\t\treportData.AllWOTotalProfit = 0;\n\t}\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Parts with available serial numbers.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Parts with available serial numbers.ayrt
index 398b883b..622f3687 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Parts with available serial numbers.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Parts with available serial numbers.ayrt	
@@ -1 +1 @@
-{"Name":"Parts with available serial numbers","Active":true,"Notes":"Includes #if_eq custom Helper which results in ONLY displaying parts from the datalist that HAVE serial numbers \n","Roles":49514,"AType":20,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <div class=\"reporttitle\">\n            <p>Parts with Serials Report</p>\n      </div>\n\n      <table>\n         <thead>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"6\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"4\">{{ayT 'PartManufacturerID'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}}</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}}</th>\n               <th colspan=\"10\">{{ayT 'PartSerialNumbersAvailable'}}</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n         </thead>\n\n         <tbody>\n            {{#each ayReportData}}\n            <!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n            <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n            {{#if_eq PartSerialsViz \"\"}}\n            <!--this #if_eq from a custom Helpers  - if PartSerialsViz specifically is \"\"\"  then no row is printed... -->\n            {{else}}\n            <!-- ... anything else, then shows the row of columns below-->\n            <tr>\n               <td colspan=\"6\">{{Name}}</td>\n               <td colspan=\"4\" class=\"centerlean\">{{ManufacturerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayCurrency Retail}}</td>\n               <td colspan=\"10\" class=\"centerlean\">{{PartSerialsViz}}</td>\n            </tr>\n            {{/if_eq}}\n            {{/each}}\n         </tbody>\n\n      </table>\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([\"Part\", \"PartManufacturerID\", \"PartRetail\", \"PartCost\", \"PartSerialNumbersAvailable\" ]);\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})\n\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Parts with available serial numbers","Active":true,"Notes":"Includes #if_eq custom Helper which results in ONLY displaying parts from the datalist that HAVE serial numbers \n","Roles":49514,"AType":20,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <div class=\"reporttitle\">\n            <p>Parts with Serials Report</p>\n      </div>\n\n      <table>\n         <thead>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"6\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"4\">{{ayT 'PartManufacturerID'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}}</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}}</th>\n               <th colspan=\"10\">{{ayT 'PartSerialNumbersAvailable'}}</th>\n            </tr>\n            <tr>\n               <td colspan=\"24\">&nbsp;</td>\n            </tr>\n         </thead>\n\n         <tbody><!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n            {{#each ayReportData}} <!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n            \n            {{#if_eq PartSerialsViz \"\"}} <!--this #if_eq from a custom Helpers  - if PartSerialsViz specifically is \"\"\"  then no row is printed... -->\n            {{else}}\n            <!-- ... anything else, then shows the row of columns below-->\n            <tr>\n               <td colspan=\"6\">{{Name}}</td>\n               <td colspan=\"4\" class=\"centerlean\">{{ManufacturerViz}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\" class=\"centerlean\">{{ayCurrency Retail}}</td>\n               <td colspan=\"10\" class=\"centerlean\">{{PartSerialsViz}}</td>\n            </tr>\n            {{/if_eq}}\n            {{/each}}\n         </tbody>\n\n      </table>\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([\"Part\", \"PartManufacturerID\", \"PartRetail\", \"PartCost\", \"PartSerialNumbersAvailable\" ]);\n \n    return ayData;\n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Projects list.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Projects list.ayrt
index a7fe49da..79188dda 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Projects list.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Projects list.ayrt	
@@ -1 +1 @@
-{"Name":"Projects list","Active":true,"Notes":"","Roles":50538,"AType":25,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'ProjectList'}} List</p>\n    </div>\n\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"6\" class=\"leftlean\">{{ayT 'Project'}}</th>\n          <th colspan=\"2\">{{ayT 'ProjectDateStarted'}}</th>\n          <th colspan=\"2\">{{ayT 'ProjectDateCompleted'}}</th>\n          <th colspan=\"2\">{{ayT 'ProjectAccountNumber'}}</th>\n          <th colspan=\"3\">{{ayT 'ProjectProjectOverseerID'}}</th>\n          <th colspan=\"6\">{{ayT 'ProjectNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"6\">{{Name}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayDate DateStarted}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayDate DateCompleted}}</td>\n          <td colspan=\"2\">{{AccountNumber}}</td>\n          <td colspan=\"3\">{{ProjectOverseerViz}}</td>\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"ProjectList\", \"Project\", \"ProjectProjectOverseerID\", \"ProjectDateStarted\", \"ProjectDateCompleted\", \"ProjectAccountNumber\", \"ProjectNotes\" ]);\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Projects list","Active":true,"Notes":"","Roles":50538,"AType":25,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'ProjectList'}} List</p>\n    </div>\n\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"6\" class=\"leftlean\">{{ayT 'Project'}}</th>\n          <th colspan=\"2\">{{ayT 'ProjectDateStarted'}}</th>\n          <th colspan=\"2\">{{ayT 'ProjectDateCompleted'}}</th>\n          <th colspan=\"2\">{{ayT 'ProjectAccountNumber'}}</th>\n          <th colspan=\"3\">{{ayT 'ProjectProjectOverseerID'}}</th>\n          <th colspan=\"6\">{{ayT 'ProjectNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"6\">{{Name}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayDate DateStarted}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayDate DateCompleted}}</td>\n          <td colspan=\"2\">{{AccountNumber}}</td>\n          <td colspan=\"3\">{{ProjectOverseerViz}}</td>\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"ProjectList\", \"Project\", \"ProjectProjectOverseerID\", \"ProjectDateStarted\", \"ProjectDateCompleted\", \"ProjectAccountNumber\", \"ProjectNotes\" ]);\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Detailed.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Detailed.ayrt
index a25acfaa..03e76dc8 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Detailed.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Detailed.ayrt	
@@ -1 +1 @@
-{"Name":"Purchase Order Detailed","Active":true,"Notes":"custom Prepare for deriving net totals and grand total \n","Roles":49250,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t{{#each ayReportData}}\n\t\t<!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n\t\t<table class=\"singlePage\">\n\t\t\t<!-- the css to start a new page when a new object -->\n\t\t\t<thead>\n\t\t\t\t<!--table header will repeat on multiple pages if total thead content is less than 25% of page - IF NOT SHOWING ON 2nd PAGE of PO, is because is too high  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" class=\"leftlean\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t\t\t<td colspan=\"6\">{{Serial}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<th colspan=\"7\">{{ayT 'PurchaseOrderDropShipToCustomerID'}}</th>{{else}} <td colspan=\"7\"></td>{{/if}}\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<th colspan=\"8\" class=\"rightlean \">Bill To</th>{{else}} <th colspan=\"8\" class=\"rightlean  \">Bill To & Ship To</th>{{/if}}\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" class=\"leftlean\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n\t\t\t\t\t<td colspan=\"6\">{{ayDate OrderedDate}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\">{{DropShipToCustomerViz}}</td>{{else}}<td colspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyName}}</td><!-- displays your company name from your license -->\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"9\">&nbsp;</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\">{{DropShipToCustomerAddressViz}} {{DropShipToCustomerCityViz}}</td>{{else}} <td colspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyPostAddress}}</td><!-- displays your company email address as entered via in your Global Settings  -->\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\" class=\"leftlean\">{{ayT 'Vendor'}}</th>\n\t\t\t\t\t<td colspan=\"7\" class=\"reporttitle\" >{{VendorViz}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\"> {{DropShipToCustomerRegionViz}} {{DropShipToCustomerPostCodeViz}}</td>{{else}} <td\tcolspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyPostCity}} {{../ayServerMetaData.CompanyPostRegion}} {{../ayServerMetaData.CompanyPostCode}}</td> <!-- displays your company address as entered via in your Global Settings  -->\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"9\">{{VendorAddressViz}} {{VendorCityViz}} {{VendorRegionViz}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\">{{DropShipToCustomerPhone1Viz}}</td>{{else}} <td\tcolspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyPhone1}} {{../ayServerMetaData.CompanyEmailAddress}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"16\">{{VendorContactViz}} {{VendorPhone1Viz}} {{VendorEmailAddressViz}}</td>\n\t\t\t\t\t<th colspan=\"5\" class=\"rightlean\">{{ayT 'VendorAccountNumber'}}</th>\n\t\t\t\t\t<td colspan=\"3\" class=\"rightlean\">{{VendorAccountNumberViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"1\" class=\"leftlean\">Qty</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"leftlean\">UOM</th>\n\t\t\t\t\t<th colspan=\"5\">Our Part#</th>\n\t\t\t\t\t<th colspan=\"3\">MFG#</th>\n\t\t\t\t\t<th colspan=\"3\">Vendor#</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">Price Per</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">Net</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">{{ayT 'PurchaseOrderItemLineTotal'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{#each Items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\" class=\"leftlean\">{{QuantityOrdered}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"leftlean\">{{PartUnitOfMeasureViz}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartNameViz}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{PartManufacturerNumberViz}} </td>\n\t\t\t\t\t<td colspan=\"3\">{{VendorPartNumber}} </td>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency PurchaseOrderCost}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetTotalViz}}</td>\n\t\t\t\t\t{{#if TaxAViz}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t\t{{#if TaxBViz}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\n\n\t\t\t<tfoot>\n\t\t\t\t<!--this footer will repeat for each page that a PO expands over. To have footer display at bottom of po and not repeat, place within its own table.  -->\n\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"16\"></th>\n\t\t\t\t\t<th colspan=\"6\" class=\"rightlean\">Total Qty of Parts Ordered</th>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ThisPOTotalQty}} </td>\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"18\"></td>\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean\">{{ayT 'PurchaseOrderItemNetTotal'}}</th>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPONet}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" class=\"leftlean\">{{ayT 'VendorAlertNotes'}}</th>\n\t\t\t\t\t<td colspan=\"15\">{{VendorAlertNotesViz}} </td>\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n\t\t\t\t\t{{#if ThisPOTaxA}}<td colspan=\"2\" class=\"rightlean\">{{ ayCurrency ThisPOTaxA }}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"8\"></td>\n\t\t\t\t\t<th colspan=\"14\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n\t\t\t\t\t{{#if ThisPOTaxB}}<td colspan=\"2\" class=\"rightlean\">{{ ayCurrency ThisPOTaxB }}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t</tr>\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\n\t\t\t\t<tr> <!-- displays your company name from your license, displays your company email address as entered via in your Global Settings  -->\n\t\t\t\t\t<th colspan=\"16\" class=\"leftlean\">Direct all inquiries to {{../ayServerMetaData.CompanyName}} {{../ayServerMetaData.CompanyPhone1}} or {{../ayServerMetaData.CompanyEmailAddress}}</th>\n\t\t\t\t\t<th colspan=\"6\" class=\"rightlean\">Purchase Order Total</th>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ ayCurrency ThisPOTotalDollar}}</td>\n\t\t\t\t</tr>\n\n\t\t\t</tfoot>\n\n\t\t</table>\n\t\t{{/each}}\n\n\t</div>\n</body>\n\n</html>","Style":"\n.singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 10pt;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 25px; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 7px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n","JsPrerender":"async function ayPrepareData(ayData) {\n   //Example of both manipulating the ayData before rendering the report (by adding a running total field)\n   //and adding a field to the overall data calculating the total dollar amount for all records\n\n   await ayGetTranslations([\"PurchaseOrderPONumber\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderDropShipToCustomerID\", \"Vendor\", \"Part\", \"VendorAccountNumber\", \"PurchaseOrderItemNetTotal\",  \"VendorAlertNotes\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"PurchaseOrderItemLineTotal\" ]);\n\n\n    //Iterate through all the records in the ayData adding the dollar amount of each specified property to the appropriate declared variable\n\n    for (EachPO of ayData.ayReportData) \n    {\n        EachPO.ThisPONet = 0; //Declare a temporary variable to hold the running net total for THIS po\n        EachPO.ThisPOTaxA = 0; //Declare a temporary variable to hold the running Tax A total for THIS po \n        EachPO.ThisPOTaxB = 0; //Declare a temporary variable to hold the running Tax B total for THIS po\n        EachPO.ThisPOTotalDollar = 0; //Declare a temporary variable  to hold the running total of THIS PO   \n        EachPO.ThisPOTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS po\n\n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPONet variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.NetTotalViz != null) \n                {\n                    EachPO.ThisPONet += Item.NetTotalViz;\n                }\n            }\n        \n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxA variable\n            {\n                //make sure it has a value before attempting to add it to the running total \n                if (Item.TaxAViz != null) \n                {\n                    EachPO.ThisPOTaxA += Item.TaxAViz;\n                }\n            }\n        \n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxB variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.TaxBViz != null) \n                {\n                    EachPO.ThisPOTaxB += Item.TaxBViz;\n                }\n            }\n\n\n            for (Item of EachPO.Items)\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.LineTotalViz != null) \n                {\n                    EachPO.ThisPOTotalDollar += Item.LineTotalViz;\n                }\n            }\n     \n\n  \n  \n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the Qty amount of each item to the ThisPOTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.QuantityOrdered != null) \n                {\n                    EachPO.ThisPOTotalQty += Item.QuantityOrdered;\n                }\n            }\n\n    }\n\n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"\n<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Purchase Order Detailed","Active":true,"Notes":"custom Prepare for deriving net totals and grand total \n","Roles":49250,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t{{#each ayReportData}}\n\t\t<!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n\t\t<table class=\"singlePage\">\n\t\t\t<!-- the css to start a new page when a new object -->\n\t\t\t<thead>\n\t\t\t\t<!--table header will repeat on multiple pages if total thead content is less than 25% of page - IF NOT SHOWING ON 2nd PAGE of PO, is because is too high  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" class=\"leftlean\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t\t\t<td colspan=\"6\">{{Serial}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<th colspan=\"7\">{{ayT 'PurchaseOrderDropShipToCustomerID'}}</th>{{else}} <td colspan=\"7\"></td>{{/if}}\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<th colspan=\"8\" class=\"rightlean \">Bill To</th>{{else}} <th colspan=\"8\" class=\"rightlean  \">Bill To & Ship To</th>{{/if}}\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" class=\"leftlean\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n\t\t\t\t\t<td colspan=\"6\">{{ayDate OrderedDate}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\">{{DropShipToCustomerViz}}</td>{{else}}<td colspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyName}}</td><!-- displays your company name from your license -->\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"9\">&nbsp;</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\">{{DropShipToCustomerAddressViz}} {{DropShipToCustomerCityViz}}</td>{{else}} <td colspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyPostAddress}}</td><!-- displays your company email address as entered via in your Global Settings  -->\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\" class=\"leftlean\">{{ayT 'Vendor'}}</th>\n\t\t\t\t\t<td colspan=\"7\" class=\"reporttitle\" >{{VendorViz}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\"> {{DropShipToCustomerRegionViz}} {{DropShipToCustomerPostCodeViz}}</td>{{else}} <td\tcolspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyPostCity}} {{../ayServerMetaData.CompanyPostRegion}} {{../ayServerMetaData.CompanyPostCode}}</td> <!-- displays your company address as entered via in your Global Settings  -->\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"9\">{{VendorAddressViz}} {{VendorCityViz}} {{VendorRegionViz}}</td>\n\t\t\t\t\t{{#if DropShipToCustomerViz}}<td colspan=\"7\" class=\"centerlean\">{{DropShipToCustomerPhone1Viz}}</td>{{else}} <td\tcolspan=\"7\" class=\"centerlean\"></td>{{/if}}\n\t\t\t\t\t<td colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyPhone1}} {{../ayServerMetaData.CompanyEmailAddress}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"16\">{{VendorContactViz}} {{VendorPhone1Viz}} {{VendorEmailAddressViz}}</td>\n\t\t\t\t\t<th colspan=\"5\" class=\"rightlean\">{{ayT 'VendorAccountNumber'}}</th>\n\t\t\t\t\t<td colspan=\"3\" class=\"rightlean\">{{VendorAccountNumberViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"1\" class=\"leftlean\">Qty</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"leftlean\">UOM</th>\n\t\t\t\t\t<th colspan=\"5\">Our Part#</th>\n\t\t\t\t\t<th colspan=\"3\">MFG#</th>\n\t\t\t\t\t<th colspan=\"3\">Vendor#</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">Price Per</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">Net</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n\t\t\t\t\t<th colspan=\"2\" class=\"rightlean\">{{ayT 'PurchaseOrderItemLineTotal'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{#each Items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\" class=\"leftlean\">{{QuantityOrdered}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"leftlean\">{{PartUnitOfMeasureViz}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartNameViz}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{PartManufacturerNumberViz}} </td>\n\t\t\t\t\t<td colspan=\"3\">{{VendorPartNumber}} </td>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency PurchaseOrderCost}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency NetTotalViz}}</td>\n\t\t\t\t\t{{#if TaxAViz}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t\t{{#if TaxBViz}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\n\n\t\t\t<tfoot>\n\t\t\t\t<!--this footer will repeat for each page that a PO expands over. To have footer display at bottom of po and not repeat, place within its own table.  -->\n\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"16\"></th>\n\t\t\t\t\t<th colspan=\"6\" class=\"rightlean\">Total Qty of Parts Ordered</th>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ThisPOTotalQty}} </td>\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"18\"></td>\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean\">{{ayT 'PurchaseOrderItemNetTotal'}}</th>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPONet}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" class=\"leftlean\">{{ayT 'VendorAlertNotes'}}</th>\n\t\t\t\t\t<td colspan=\"15\">{{VendorAlertNotesViz}} </td>\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean\">{{ayT 'TaxCodeTaxA'}}</th>\n\t\t\t\t\t{{#if ThisPOTaxA}}<td colspan=\"2\" class=\"rightlean\">{{ ayCurrency ThisPOTaxA }}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"8\"></td>\n\t\t\t\t\t<th colspan=\"14\" class=\"rightlean\">{{ayT 'TaxCodeTaxB'}}</th>\n\t\t\t\t\t{{#if ThisPOTaxB}}<td colspan=\"2\" class=\"rightlean\">{{ ayCurrency ThisPOTaxB }}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">0.00</td>{{/if}}\n\t\t\t\t</tr>\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\n\t\t\t\t<tr> <!-- displays your company name from your license, displays your company email address as entered via in your Global Settings  -->\n\t\t\t\t\t<th colspan=\"16\" class=\"leftlean\">Direct all inquiries to {{../ayServerMetaData.CompanyName}} {{../ayServerMetaData.CompanyPhone1}} or {{../ayServerMetaData.CompanyEmailAddress}}</th>\n\t\t\t\t\t<th colspan=\"6\" class=\"rightlean\">Purchase Order Total</th>\n\t\t\t\t\t<td colspan=\"2\" class=\"rightlean\">{{ ayCurrency ThisPOTotalDollar}}</td>\n\t\t\t\t</tr>\n\n\t\t\t</tfoot>\n\n\t\t</table>\n\t\t{{/each}}\n\n\t</div>\n</body>\n\n</html>","Style":"\n.singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 10pt;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 25px; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 7px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n","JsPrerender":"async function ayPrepareData(ayData) {\n   //Example of both manipulating the ayData before rendering the report (by adding a running total field)\n   //and adding fields to the overall data such as calculating the total dollar amount for all records\n\n   await ayGetTranslations([\"PurchaseOrderPONumber\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderDropShipToCustomerID\", \"Vendor\", \"Part\", \"VendorAccountNumber\", \"PurchaseOrderItemNetTotal\",  \"VendorAlertNotes\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"PurchaseOrderItemLineTotal\" ]);\n\n\n    //Iterate through all the records in the ayData adding the dollar amount of each specified property to the appropriate declared variable\n\n    for (const EachPO of ayData.ayReportData) \n    {\n        EachPO.ThisPONet = 0; //Declare a temporary variable to hold the running net total for THIS po\n        EachPO.ThisPOTaxA = 0; //Declare a temporary variable to hold the running Tax A total for THIS po \n        EachPO.ThisPOTaxB = 0; //Declare a temporary variable to hold the running Tax B total for THIS po\n        EachPO.ThisPOTotalDollar = 0; //Declare a temporary variable  to hold the running total of THIS PO   \n        EachPO.ThisPOTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS po\n\n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPONet variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.NetTotalViz != null) \n                {\n                    EachPO.ThisPONet += Item.NetTotalViz;\n                }\n            }\n        \n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxA variable\n            {\n                //make sure it has a value before attempting to add it to the running total \n                if (Item.TaxAViz != null) \n                {\n                    EachPO.ThisPOTaxA += Item.TaxAViz;\n                }\n            }\n        \n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxB variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.TaxBViz != null) \n                {\n                    EachPO.ThisPOTaxB += Item.TaxBViz;\n                }\n            }\n\n\n            for (const Item of EachPO.Items)\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.LineTotalViz != null) \n                {\n                    EachPO.ThisPOTotalDollar += Item.LineTotalViz;\n                }\n            }\n     \n\n  \n  \n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the Qty amount of each item to the ThisPOTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.QuantityOrdered != null) \n                {\n                    EachPO.ThisPOTotalQty += Item.QuantityOrdered;\n                }\n            }\n\n    }\n\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"\n<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Summaries.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Summaries.ayrt
index 5d44e98b..2d3f8372 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Summaries.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Purchase Order Summaries.ayrt	
@@ -1 +1 @@
-{"Name":"Purchase Order Summaries","Active":true,"Notes":"custom Prepare - derived running totals for nets, taxes and totals for EACH PO on single line, and running total for all POs Nets, Taxes, Totals at bottom of report","Roles":49258,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div  >\t      \n\t\t<table  > \n     \t\t<thead>\n           <tr >\n\t\t\t          <th colspan=\"24\" class=\"reporttitle\">Purchase Order Summaries</th>\n\t\t      </tr>\n           <tr>\n           <td colspan=\"24\">&nbsp;</td>\n        </tr>\n            <tr>\n             <th colspan=\"2\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n             <th colspan=\"2\">{{ayT 'PurchaseOrderExpectedReceiveDate'}}</th>\n             <th colspan=\"4\">{{ayT 'PurchaseOrderItemUIOrderedFrom'}}</th>\n             <th colspan=\"4\">{{ayT 'PurchaseOrderStatus'}}</th>\n             <th colspan=\"2\">{{ayT 'PurchaseOrderReferenceNumber'}}</th>\n             <th colspan=\"2\">{{ayT 'PurchaseOrder'}}</th>\n                          \n             <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n             <th colspan=\"2\">{{ayT 'TaxCodeTaxAValue'}}</th>\n             <th colspan=\"2\">{{ayT 'TaxCodeTaxBValue'}}</th>\n             <th colspan=\"2\">{{ayT 'Total'}}</th>                    \n            </tr>\n            <tr>\n           <td colspan=\"24\">&nbsp;</td>\n        </tr>\n     \t\t</thead>\n          \n         <tbody>  \n            {{#each ayReportData}}<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n           <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n           <tr>\n            <td colspan=\"2\">{{ayDate OrderedDate}}</td>\n            <td colspan=\"2\">{{ayDate ExpectedReceiveDate}}</td> \n            <td colspan=\"4\">{{VendorViz}}</td>\n            <td colspan=\"4\">{{StatusViz}}</td>\n            <td colspan=\"2\">{{ReferenceNumber}}</td>\n            <td colspan=\"2\">{{Serial}}</td>\n                       \n            <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPONet}}</td>           \n            {{#if ThisPOTaxA}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPOTaxA}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">$0.00</td>{{/if}}          \n            {{#if ThisPOTaxB}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPOTaxB}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">$0.00</td>{{/if}}\n            <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPOTotalofLines}}</td>  \n           </tr>\n           \t {{/each}}\n         </tbody>\n      </table>\n\n      <table> <!-- this displays footer  ONLY on bottom of last page along with CSS commented out -->\n       <tfoot>\n         <tr> <!-- note no #each here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllPOTaxBRunning  -->\n             <th colspan=\"12\"></th>\n             <th colspan=\"3\">All {{ayT 'NetValue'}}</th>\n             <th colspan=\"3\">All {{ayT 'TaxCodeTaxAValue'}}</th>\n             <th colspan=\"3\">All {{ayT 'TaxCodeTaxBValue'}}</th>\n             <th colspan=\"3\">All {{ayT 'Total'}}</th>  \n            </tr>\n          <tr> <!-- note no #each here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllPOTaxBRunning  -->\n             <td colspan=\"12\"></td>\n             <td colspan=\"3\" class=\"rightlean\">{{ ayCurrency AllPONetRunning }}</td>\n             {{#if AllPOTaxARunning}}<td colspan=\"3\" class=\"rightlean\">{{ ayCurrency AllPOTaxARunning }}</td>{{else}} <td colspan=\"3\" class=\"rightlean\">$0.00</td>{{/if}}     \n             {{#if AllPOTaxBRunning}}<td colspan=\"3\" class=\"rightlean\">{{ ayCurrency AllPOTaxBRunning }}</td>{{else}} <td colspan=\"3\" class=\"rightlean\">$0.00</td>{{/if}}     \n             <td colspan=\"3\" class=\"rightlean\"> {{ ayCurrency AllPOTotal }}</td>  \n            </tr>\n       </tfoot>\n      </table>\n      \n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  font-size: 9pt; \n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 10pt; \n  color: #9e9e9e;\n}\n\ntfoot th{\n  border-top: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 10pt; \n  text-align: right;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n   //Example of both manipulating the reportData before rendering the report (by adding a running total field)\n   //and adding a field to the overall data calculating the total dollar amount for all records\n\n   await ayGetTranslations([\"PurchaseOrderItemUIOrderedFrom\", \"PurchaseOrderStatus\", \"PurchaseOrderReferenceNumber\", \"PurchaseOrder\", \"PurchaseOrderExpectedReceiveDate\", \"PurchaseOrderOrderedDate\", \"Total\", \"TaxCodeTaxAValue\", \"TaxCodeTaxBValue\", \"NetValue\" ]);\n\nlet AllPONet = 0; //Declare a temporary variable to hold the running net total for all POs in this list\n    //Iterate through all the records in the reportData adding the dollar amount of each item to the AllPONet variable\n    for (EachPO of reportData.ayReportData) \n    {\n         let ThisPONet = 0; //Declare a temporary variable to hold the running net total for THIS po\n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPONet variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.NetTotalViz != null) \n                {\n                    ThisPONet += Item.NetTotalViz;\n                }\n                Item.PONetRunning=ThisPONet;\n            }\n        EachPO.ThisPONet=ThisPONet;\n        AllPONet += ThisPONet; //Use ThisPONet to display the running Net total for THIS PO\n    }\n    //Add the AllPONet variable to the reportData so it can be accessed in the report template i.e. a final running total of ALL PO's Net\n    reportData.AllPONetRunning=AllPONet;\n   \nlet AllPOTaxA = 0; //Declare a temporary variable to hold the running Tax A total for all POs in the list\n    //Iterate through all the records in the reportData adding the Tax A dollar amount of each item to the AllPOTaxA variable\n    for (EachPO of reportData.ayReportData) \n    {\n         let ThisPOTaxA = 0; //Declare a temporary variable to hold the running Tax A total for THIS po\n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxA variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.TaxAViz != null) \n                {\n                    ThisPOTaxA += Item.TaxAViz;\n                }\n                Item.POTaxARunning=ThisPOTaxA;\n            }\n        EachPO.ThisPOTaxA=ThisPOTaxA;\n        AllPOTaxA += ThisPOTaxA; // Use ThisPOTaxA to display the running Tax A total for THIS PO\n    }\n    //Add the AllPONet variable to the reportData so it can be accessed in the report template i.e. a final running total of ALL PO's Tax A\n    reportData.AllPOTaxARunning=AllPOTaxA; \n   \nlet AllPOTaxB = 0; //Declare a temporary variable to hold the running Tax B total for all POs in the list\n    //Iterate through all the records in the reportData adding the Tax B dollar amount of each item to the AllPOTaxA variable\n    for (EachPO of reportData.ayReportData) \n    {\n         let ThisPOTaxB = 0; //Declare a temporary variable to hold the running Tax B total for THIS po\n            for (Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxB variable\n            {\n                //make sure it has a value before attempting to add it  to the running total\n                if (Item.TaxBViz != null) \n                {\n                    ThisPOTaxB += Item.TaxBViz;\n                }\n                Item.POTaxBRunning=ThisPOTaxB;\n            }\n        EachPO.ThisPOTaxB=ThisPOTaxB;\n        AllPOTaxB += ThisPOTaxB; // Use ThisPOTaxB to display the running Tax B total for THIS PO\n    }\n    //Add the AllPOTaxB variable to the reportData so it can be accessed in the report template i.e. a final running total of ALL PO's Tax B\n    reportData.AllPOTaxBRunning=AllPOTaxB; \n\nlet AllPODollarTotalRunning = 0; //Declare a temporary variable to hold the running total of all POs in this list\n//let ThisPOTotal = 0; //if declare this at this stage will NOT get correct EachPO.ThisPOTotalofLines\n    for (EachPO of reportData.ayReportData) \n    { \n      let ThisPOTotal = 0; \n        // need to declared  let ThisPOTotal = 0; at this stage so then it will reset ThisPOTotal back to 0 before being able to add to EachPO.POsRunningTotalSoFar\n        //BUT OH OH - now the entire AllPOTotal is off hmmmmmmmmmm      \n            for (Item of EachPO.Items)\n            {\n                //make sure it has a value before attempting  to add it to the running total\n                if (Item.LineTotalViz != null) \n                {\n                    ThisPOTotal += Item.LineTotalViz;\n                }\n                Item.ThisPORunningTotal=ThisPOTotal;\n            }        \n        EachPO.ThisPOTotalofLines =ThisPOTotal;   \n        //add a new key to each record in the reportData object named \"EachPO.POsRunningTotalSoFar\" with the running total so far\n        EachPO.POsRunningTotalSoFar=ThisPOTotal;  \n\n        AllPODollarTotalRunning += ThisPOTotal;       \n    }\n    //set the AllPODollarTotalRunning variable to the reportData so the reportData.AllPOTotal can be accessed in the report template outside of the #each \n    //- i.e. in a separate footer that displays once at end of report\n        reportData.AllPOTotal=AllPODollarTotalRunning; \n     \n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Purchase Order Summaries","Active":true,"Notes":"custom Prepare - derived running totals for nets, taxes and totals for EACH PO on single line, and running total for all POs Nets, Taxes, Totals at bottom of report","Roles":49258,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div  >\t      \n\t\t<table  > \n     \t\t<thead>\n           <tr >\n\t\t\t          <th colspan=\"24\" class=\"reporttitle\">Purchase Order Summaries</th>\n\t\t      </tr>\n           <tr>\n           <td colspan=\"24\">&nbsp;</td>\n        </tr>\n            <tr>\n             <th colspan=\"2\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n             <th colspan=\"2\">{{ayT 'PurchaseOrderExpectedReceiveDate'}}</th>\n             <th colspan=\"4\">{{ayT 'PurchaseOrderItemUIOrderedFrom'}}</th>\n             <th colspan=\"4\">{{ayT 'PurchaseOrderStatus'}}</th>\n             <th colspan=\"2\">{{ayT 'PurchaseOrderReferenceNumber'}}</th>\n             <th colspan=\"2\">{{ayT 'PurchaseOrder'}}</th>\n                          \n             <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n             <th colspan=\"2\">{{ayT 'TaxCodeTaxAValue'}}</th>\n             <th colspan=\"2\">{{ayT 'TaxCodeTaxBValue'}}</th>\n             <th colspan=\"2\">{{ayT 'Total'}}</th>                    \n            </tr>\n            <tr>\n           <td colspan=\"24\">&nbsp;</td>\n        </tr>\n     \t\t</thead>\n          \n         <tbody>  \n            {{#each ayReportData}}<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n           <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n           <tr>\n            <td colspan=\"2\">{{ayDate OrderedDate}}</td>\n            <td colspan=\"2\">{{ayDate ExpectedReceiveDate}}</td> \n            <td colspan=\"4\">{{VendorViz}}</td>\n            <td colspan=\"4\">{{StatusViz}}</td>\n            <td colspan=\"2\">{{ReferenceNumber}}</td>\n            <td colspan=\"2\">{{Serial}}</td>\n                       \n            <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPONet}}</td>           \n            {{#if ThisPOTaxA}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPOTaxA}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">$0.00</td>{{/if}}          \n            {{#if ThisPOTaxB}}<td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPOTaxB}}</td>{{else}} <td colspan=\"2\" class=\"rightlean\">$0.00</td>{{/if}}\n            <td colspan=\"2\" class=\"rightlean\">{{ayCurrency ThisPOTotalofLines}}</td>  \n           </tr>\n           \t {{/each}}\n         </tbody>\n      </table>\n\n      <table> <!-- as in its own table, this displays footer  ONLY on bottom of LAST page  -->\n       <tfoot>\n         <tr> <!-- note no #each here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllPOTaxBRunning  -->\n             <th colspan=\"12\"></th>\n             <th colspan=\"3\">All {{ayT 'NetValue'}}</th>\n             <th colspan=\"3\">All {{ayT 'TaxCodeTaxAValue'}}</th>\n             <th colspan=\"3\">All {{ayT 'TaxCodeTaxBValue'}}</th>\n             <th colspan=\"3\">All {{ayT 'Total'}}</th>  \n            </tr>\n          <tr> <!-- note no #each here - the data below is from Prepare's  reportData.xxxx as in  reportData.AllPOTaxBRunning  -->\n             <td colspan=\"12\"></td>\n             <td colspan=\"3\" class=\"rightlean\">{{ ayCurrency AllPONetRunning }}</td>\n             {{#if AllPOTaxARunning}}<td colspan=\"3\" class=\"rightlean\">{{ ayCurrency AllPOTaxARunning }}</td>{{else}} <td colspan=\"3\" class=\"rightlean\">$0.00</td>{{/if}}     \n             {{#if AllPOTaxBRunning}}<td colspan=\"3\" class=\"rightlean\">{{ ayCurrency AllPOTaxBRunning }}</td>{{else}} <td colspan=\"3\" class=\"rightlean\">$0.00</td>{{/if}}     \n             <td colspan=\"3\" class=\"rightlean\"> {{ ayCurrency AllPOTotal }}</td>  \n            </tr>\n       </tfoot>\n      </table>\n      \n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  font-size: 9pt; \n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 10pt; \n  color: #9e9e9e;\n}\n\ntfoot th{\n  border-top: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 10pt; \n  text-align: right;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n   //Example of both manipulating the reportData before rendering the report (by adding a running total field)\n   //and adding fields to the overall data such as calculating the total dollar amount for all records\n\n   await ayGetTranslations([\"PurchaseOrderItemUIOrderedFrom\", \"PurchaseOrderStatus\", \"PurchaseOrderReferenceNumber\", \"PurchaseOrder\", \"PurchaseOrderExpectedReceiveDate\", \"PurchaseOrderOrderedDate\", \"Total\", \"TaxCodeTaxAValue\", \"TaxCodeTaxBValue\", \"NetValue\" ]);\n\nlet AllPONet = 0; //Declare a temporary variable to hold the running net total for all POs in this list\n   \n    for (const EachPO of reportData.ayReportData)  //Iterate through all the records in the reportData adding the dollar amount of each item to the AllPONet variable\n    {\n         let ThisPONet = 0; //Declare a temporary variable to hold the running net total for THIS po\n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPONet variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.NetTotalViz != null) \n                {\n                    ThisPONet += Item.NetTotalViz;\n                }\n                Item.PONetRunning=ThisPONet;\n            }\n        EachPO.ThisPONet=ThisPONet;\n        AllPONet += ThisPONet; //Use ThisPONet to display the running Net total for THIS PO\n    }\n    //Add the AllPONet variable to the reportData so it can be accessed in the report template i.e. a final running total of ALL PO's Net\n    reportData.AllPONetRunning=AllPONet;\n   \nlet AllPOTaxA = 0; //Declare a temporary variable to hold the running Tax A total for all POs in the list\n    //Iterate through all the records in the reportData adding the Tax A dollar amount of each item to the AllPOTaxA variable\n    for (const EachPO of reportData.ayReportData) \n    {\n         let ThisPOTaxA = 0; //Declare a temporary variable to hold the running Tax A total for THIS po\n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxA variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.TaxAViz != null) \n                {\n                    ThisPOTaxA += Item.TaxAViz;\n                }\n                Item.POTaxARunning=ThisPOTaxA;\n            }\n        EachPO.ThisPOTaxA=ThisPOTaxA;\n        AllPOTaxA += ThisPOTaxA; // Use ThisPOTaxA to display the running Tax A total for THIS PO\n    }\n    //Add the AllPONet variable to the reportData so it can be accessed in the report template i.e. a final running total of ALL PO's Tax A\n    reportData.AllPOTaxARunning=AllPOTaxA; \n   \nlet AllPOTaxB = 0; //Declare a temporary variable to hold the running Tax B total for all POs in the list\n    //Iterate through all the records in the reportData adding the Tax B dollar amount of each item to the AllPOTaxA variable\n    for (const EachPO of reportData.ayReportData) \n    {\n         let ThisPOTaxB = 0; //Declare a temporary variable to hold the running Tax B total for THIS po\n            for (const Item of EachPO.Items)  //Iterate through all the poitems of THIS po adding the dollar amount of each item to the ThisPOTaxB variable\n            {\n                //make sure it has a value before attempting to add it  to the running total\n                if (Item.TaxBViz != null) \n                {\n                    ThisPOTaxB += Item.TaxBViz;\n                }\n                Item.POTaxBRunning=ThisPOTaxB;\n            }\n        EachPO.ThisPOTaxB=ThisPOTaxB;\n        AllPOTaxB += ThisPOTaxB; // Use ThisPOTaxB to display the running Tax B total for THIS PO\n    }\n    //Add the AllPOTaxB variable to the reportData so it can be accessed in the report template i.e. a final running total of ALL PO's Tax B\n    reportData.AllPOTaxBRunning=AllPOTaxB; \n\nlet AllPODollarTotalRunning = 0; //Declare a temporary variable to hold the running total of all POs in this list\n//let ThisPOTotal = 0; //if declare this at this stage will NOT get correct EachPO.ThisPOTotalofLines\n    for (const EachPO of reportData.ayReportData) \n    { \n      let ThisPOTotal = 0; \n        // need to declared  let ThisPOTotal = 0; at this stage so then it will reset ThisPOTotal back to 0 before being able to add to EachPO.POsRunningTotalSoFar  \n            for (const Item of EachPO.Items)\n            {\n                //make sure it has a value before attempting  to add it to the running total\n                if (Item.LineTotalViz != null) \n                {\n                    ThisPOTotal += Item.LineTotalViz;\n                }\n                Item.ThisPORunningTotal=ThisPOTotal;\n            }        \n        EachPO.ThisPOTotalofLines =ThisPOTotal;   \n        //add a new key to each record in the reportData object named \"EachPO.POsRunningTotalSoFar\" with the running total so far\n        EachPO.POsRunningTotalSoFar=ThisPOTotal;  \n\n        AllPODollarTotalRunning += ThisPOTotal;       \n    }\n    //set the AllPODollarTotalRunning variable to the reportData so the reportData.AllPOTotal can be accessed in the report template outside of the #each \n    //- i.e. in a separate footer that displays once at end of report\n        reportData.AllPOTotal=AllPODollarTotalRunning; \n     \n\n    return reportData;\n}","JsHelpers":"\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Summary.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Summary.ayrt
index 9bcba59e..9d347f33 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Summary.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Summary.ayrt	
@@ -1 +1 @@
-{"Name":"Quote Item Summary","Active":true,"Notes":"Custom Prepare to display each Quote Item total nets and totals for all workorder items in list","Roles":50538,"AType":28,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'Quote'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Quote'}} {{ayT 'Status'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'Quote'}}  {{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"2\">{{ayT 'Priority'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            <!--note the need for trailing zeros and backslash to reference values above Items -->\n            <tr>\n               <td colspan=\"2\">{{QuoteId}} - {{Sequence}}</td>\n               <td colspan=\"2\"   style=\"background-color:{{../LastStateColorViz}}\" >{{../LastStateNameViz}}</td>\n               <td colspan=\"2\">{{../CustomerViz}}</td>\n               <td colspan=\"1\">{{ayDate ../Requested}}</td>\n               <td colspan=\"1\">{{ayDate RequestDate}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemStatusColorViz}}\">{{WorkOrderItemStatusNameViz}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemPriorityColorViz}}\">{{WorkOrderItemPriorityNameViz}}</td>\n               <td colspan=\"3\">{{Notes}}</td>\n            </tr>\n            <tr>\n               <td colspan=\"15\">&nbsp;</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n         </tbody>\n         <tfoot>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":"\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 5px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"QuoteQuoteRequestDate\", \"Status\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"Priority\", \"WorkOrderItemRequestDate\"]);\n\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Quote Item Summary","Active":true,"Notes":"Custom Prepare to display each Quote Item total nets and totals for all workorder items in list","Roles":50538,"AType":28,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'Quote'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Quote'}} {{ayT 'Status'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'Quote'}}  {{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"2\">{{ayT 'Priority'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            <!--note the need for trailing zeros and backslash to reference values above Items -->\n            <tr>\n               <td colspan=\"2\">{{QuoteId}} - {{Sequence}}</td>\n               <td colspan=\"2\"   style=\"background-color:{{../LastStateColorViz}}\" >{{../LastStateNameViz}}</td>\n               <td colspan=\"2\">{{../CustomerViz}}</td>\n               <td colspan=\"1\">{{ayDate ../Requested}}</td>\n               <td colspan=\"1\">{{ayDate RequestDate}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemStatusColorViz}}\">{{WorkOrderItemStatusNameViz}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemPriorityColorViz}}\">{{WorkOrderItemPriorityNameViz}}</td>\n               <td colspan=\"3\">{{Notes}}</td>\n            </tr>\n            <tr>\n               <td colspan=\"15\">&nbsp;</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n         </tbody>\n         <tfoot>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":"\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 5px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"Quote\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"QuoteQuoteRequestDate\", \"Status\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"Priority\", \"WorkOrderItemRequestDate\"]);\n\n\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Tasks.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Tasks.ayrt
index f1568431..0cf73456 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Tasks.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Quote Item Tasks.ayrt	
@@ -1 +1 @@
-{"Name":"Quote Item Tasks","Active":true,"Notes":"","Roles":50538,"AType":46,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemList'}} {{ayT 'WorkOrderItemTasks'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'Quote'}}</th>\n          <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n\n\n\t\t\t\t\t<th colspan=\"2\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th> \n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemTasks'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each Tasks}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{ayDateTime ../../Requested}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"6\">{{Task}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemTasks\", \"Quote\", \"WorkOrderItemList\", \"QuoteQuoteRequestDate\", \"WorkOrderItemSummary\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\" ]);\n\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n\r\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\r\n//note that this HAS to be added here in Helpers, is NOT built in\r\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\r\n    if(a == b) // Or === depending on your needs\r\n        return opts.fn(this);\r\n    else\r\n        return opts.inverse(this);\r\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Quote Item Tasks","Active":true,"Notes":"","Roles":50538,"AType":46,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemList'}} {{ayT 'WorkOrderItemTasks'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'Quote'}}</th>\n          <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n\n\n\t\t\t\t\t<th colspan=\"2\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th> \n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemTasks'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each Tasks}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{ayDateTime ../../Requested}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"6\">{{Task}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemTasks\", \"Quote\", \"WorkOrderItemList\", \"QuoteQuoteRequestDate\", \"WorkOrderItemSummary\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\" ]);\n\n\n \n    return ayData;\n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\r\n\r\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\r\n    if(a == b) // Or === depending on your needs\r\n        return opts.fn(this);\r\n    else\r\n        return opts.inverse(this);\r\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Quote Parts Net Cost Summary.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Quote Parts Net Cost Summary.ayrt
index 6e451522..537b0054 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Quote Parts Net Cost Summary.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Quote Parts Net Cost Summary.ayrt	
@@ -1 +1 @@
-{"Name":"Quote Parts Net Cost Summary","Active":true,"Notes":"Custom Prepare used to obtain translations, to group by the woitempart, and to obtain derived amounts and running totals\nUse of background-color to display Quote Status's display color","Roles":49258,"AType":27,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"26\" class=\"reporttitle\">Grouped by {{ayT 'Quote'}} {{ayT 'WorkOrderItemParts'}} showing {{ayT 'NetValue'}} {{ayT 'PartCost'}} </th>\n            </tr>\n            <tr>\n               <td colspan=\"26\">&nbsp;</td>\n            </tr>\n            <tr>\n               <td colspan=\"26\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"3\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Status'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"3\">{{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">{{ayT 'PartRetail'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">Difference</th>               \n            </tr>\n            <tr>\n               <th colspan=\"26\">&nbsp;</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"26\" class=\"leftlean\">{{group}}</td>\n            </tr>\n            {{#each items}}\n            <tr>\n               <td colspan=\"3\">&nbsp;</td>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\" style=\"background-color:{{LastStateColorViz}}\" >{{LastStateNameViz}}</td>\n               {{#if Requested }}<td colspan=\"2\">{{ayDate Requested}}</td>{{else}} <td colspan=\"2\">no date specified</td>{{/if}}\n               <td colspan=\"1\" class=\"rightlean\">{{Quantity}}</td>\n               <td colspan=\"2\"  class=\"leftlean\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"2\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\">&nbsp;</td>               \n               {{#if NetCost }}<td colspan=\"3\">{{ayCurrency NetCost}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetViz }}<td colspan=\"3\">{{ayCurrency NetViz}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetDiff }}<td colspan=\"3\">{{ayCurrency NetDiff}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}               \n            </tr>\n            {{/each}}\n               <tr>\n                    <th colspan=\"26\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"17\" class=\"rightlean\">{{ayT 'Total'}} for {{ayT 'Part'}} {{group}}</th>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetCost}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsDiff}}</td>\n                </tr>\n                <tr>\n                    <th colspan=\"26\">&nbsp;</th>\n                </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>\n               <td colspan=\"26\">&nbsp;</td>\n            </tr>\n            <tr>               \n               <th colspan=\"17\" class=\"rightlean\">{{ayT 'Total'}} for all {{ayT 'WorkOrderItemParts'}} in this report</th>\n               <th colspan=\"3\">All Net Cost</th>\n               <th colspan=\"3\">All Net Charge</th>\n               <th colspan=\"3\">All Diff</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <td colspan=\"17\">&nbsp;</td>\n               {{#if AllWOPartsNetCost}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetCost}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}               \n               {{#if AllWOPartsDiff}} <td colspan=\"3\" class=\"centerlean\" >{{ayCurrency AllWOPartsDiff}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               \n            </tr>\n         </tfoot>\n      </table>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 20px;\n  font-size: 10pt; \n  color: #9e9e9e;\n  text-align: center;\n}\n\ntbody td {\n  padding: 2px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"Part\", \"Status\", \"QuoteQuoteRequestDate\", \"WorkOrderItemPartQuantity\", \"Quote\", \"NetValue\", \"PartCost\", \"PartRetail\", \"Total\" ]);\n\n\t//below is the code to group by the part - the PartNameViz\n\tlet ret = [];\n    //iterate quotes -> items -> quote item parts\n    reportData.ayReportData.forEach(quote => {\n        quote.Items.forEach(quoteitem => {\n            quoteitem.Parts.forEach(part => {\n                //new shape of data required for report \n                let record = {\n                    Serial: quote.Serial,\n\t\t\t\t\tRequested: quote.Requested,\n\t\t\t\t\tNetViz: part.NetViz,\n\t\t\t\t\tPriceOverride: part.PriceOverride,\n\t\t\t\t\tListPrice: part.ListPrice,\n                    UnitOfMeasureViz: part.UnitOfMeasureViz,\n                    PriceViz: part.PriceViz,\n                    Cost: part.Cost,\n                    SuggestedQuantity: part.SuggestedQuantity,\n                    Quantity: part.Quantity,\n                    PartWarehouseViz: part.PartWarehouseViz,\n                    UpcViz: part.UpcViz,\n                    Serials: part.Serials,\n                    PartDescriptionViz: part.PartDescriptionViz,  \n                    LastStateNameViz: quote.LastStateNameViz,\n                    LastStateColorViz: quote.LastStateColorViz,\n                };\n\n                //Find or create group and insert this record               \n                if (part.PartDescriptionViz) {   //if part description is not empty or null then will include\n                    let groupObject = ret.find(z => z.group == (part.PartNameViz + \" \" + part.PartDescriptionViz) ); \n                    if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                    } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                     ret.push({ group: (part.PartNameViz+ \" \" + part.PartDescriptionViz), items: [record], count: 1 });                    \n                    }\n                } else {   //else if part description is empty or null then will not include so doesn't show the text null              \n                    let groupObject = ret.find(z => z.group == (part.PartNameViz) ); \n                    if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                    } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                     ret.push({ group: (part.PartNameViz), items: [record], count: 1 });                    \n                }\n                }\n                \n                \n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//note that below references the new shaped format of data\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit (nets - costs), from all quotes so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsNetCost = 0;\nreportData.AllWOPartsDiff = 0;\n\n\nfor (EachGroup of reportData.ayReportData) \n\t{\n\n\n\t//below declares a key on the entire group to hold all Part Net, costs, profit/loss (nets - costs), for this group (this group is a single Part that has one or more wo item parts records)\n\tEachGroup.GroupPartsNetViz = 0;\n\tEachGroup.GroupPartsNetCost = 0;\n\tEachGroup.GroupPartsDiff = 0; \n\t\n\n\t//below is to Iterate through each woitempart record for this part - groupitem is a woitempart record\n\tfor (groupitem of EachGroup.items)\n\t\t{\n\t\t\t\t\t\n\t\t\tgroupitem.ThisItemPartNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartNetCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartDiff = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (groupitem.Quantity != 0) \n        \t        \t{\n\t\t\t\t\t\tEachGroup.GroupPartsNetViz += groupitem.NetViz;\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += groupitem.NetViz;\t\n\n\n\t\t\t\t\t\tgroupitem.NetCost = (groupitem.Cost * groupitem.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupPartsNetCost += groupitem.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsNetCost += groupitem.NetCost;\n\n\n\t\t\t\t\t\tif (groupitem.NetViz != 0) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tgroupitem.NetDiff = (groupitem.NetViz - groupitem.NetCost)\n\t\t\t\t\t\tEachGroup.GroupPartsDiff += groupitem.NetDiff; //\n\t\t\t\t\t\treportData.AllWOPartsDiff += groupitem.NetDiff;  //\n\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\n\n\t\t\t\n\t\t}\n\n    }\n\n    return reportData; \n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Quote Parts Net Cost Summary","Active":true,"Notes":"Custom Prepare used to obtain translations, to group by the woitempart, and to obtain derived amounts and running totals\nUse of background-color to display Quote Status's display color","Roles":49258,"AType":27,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n   <div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"26\" class=\"reporttitle\">Grouped by {{ayT 'Quote'}} {{ayT 'WorkOrderItemParts'}} showing {{ayT 'NetValue'}} {{ayT 'PartCost'}} </th>\n            </tr>\n            <tr>\n               <td colspan=\"26\">&nbsp;</td>\n            </tr>\n            <tr>\n               <td colspan=\"26\">&nbsp;</td>\n            </tr>\n            <tr>\n               <th colspan=\"3\" class=\"leftlean\">{{ayT 'Part'}}</th>\n               <th colspan=\"2\">{{ayT 'Quote'}}</th>\n               <th colspan=\"2\">{{ayT 'Status'}}</th>\n               <th colspan=\"2\">{{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n               <th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n               <th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n               <th colspan=\"1\">&nbsp;</th>\n               <th colspan=\"3\">{{ayT 'PartCost'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">{{ayT 'PartRetail'}} {{ayT 'NetValue'}}</th>\n               <th colspan=\"3\">Difference</th>               \n            </tr>\n            <tr>\n               <th colspan=\"26\">&nbsp;</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"26\" class=\"leftlean\">{{group}}</td>\n            </tr>\n            {{#each items}}\n            <tr>\n               <td colspan=\"3\">&nbsp;</td>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\" style=\"background-color:{{LastStateColorViz}}\" >{{LastStateNameViz}}</td>\n               {{#if Requested }}<td colspan=\"2\">{{ayDate Requested}}</td>{{else}} <td colspan=\"2\">no date specified</td>{{/if}}\n               <td colspan=\"1\" class=\"rightlean\">{{Quantity}}</td>\n               <td colspan=\"2\"  class=\"leftlean\">{{UnitOfMeasureViz}}</td>\n               <td colspan=\"2\">{{ayCurrency Cost}}</td>\n               <td colspan=\"2\">{{ayCurrency PriceViz}}</td>\n               <td colspan=\"1\">&nbsp;</td>               \n               {{#if NetCost }}<td colspan=\"3\">{{ayCurrency NetCost}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetViz }}<td colspan=\"3\">{{ayCurrency NetViz}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}\n               {{#if NetDiff }}<td colspan=\"3\">{{ayCurrency NetDiff}}</td> {{else}}<td colspan=\"3\">{{Quantity}}</td>{{/if}}               \n            </tr>\n            {{/each}}\n               <tr>\n                    <th colspan=\"26\">&nbsp;</th>\n                </tr>\n                <tr>\n                    <th colspan=\"17\" class=\"rightlean\">{{ayT 'Total'}} for {{ayT 'Part'}} {{group}}</th>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetCost}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsNetViz}}</td>\n                    <td colspan=\"3\">{{ayCurrency GroupPartsDiff}}</td>\n                </tr>\n                <tr>\n                    <th colspan=\"26\">&nbsp;</th>\n                </tr>\n            {{/each}}\n         </tbody>\n      </table>\n\n      <table>\n         <!-- tfoot in its own table so it ONLY shows on last page of report -->\n         <tfoot>\n            <tr>\n               <td colspan=\"26\">&nbsp;</td>\n            </tr>\n            <tr>               \n               <th colspan=\"17\" class=\"rightlean\">{{ayT 'Total'}} for all {{ayT 'WorkOrderItemParts'}} in this report</th>\n               <th colspan=\"3\">All Net Cost</th>\n               <th colspan=\"3\">All Net Charge</th>\n               <th colspan=\"3\">All Diff</th>\n            </tr>\n            <tr>\n               <!-- note no #each encompasses here - the data below is from this report template's Prepare  -->\n               <td colspan=\"17\">&nbsp;</td>\n               {{#if AllWOPartsNetCost}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetCost}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               {{#if AllWOPartsNetViz}} <td colspan=\"3\" class=\"centerlean\">{{ ayCurrency AllWOPartsNetViz}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}               \n               {{#if AllWOPartsDiff}} <td colspan=\"3\" class=\"centerlean\" >{{ayCurrency AllWOPartsDiff}}</td> {{else}} <td colspan=\"3\" class=\"centerlean\">$0.00</td> {{/if}}\n               \n            </tr>\n         </tfoot>\n      </table>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 14pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%; \n  table-layout: fixed; \n    }\n\nth {\n  height: 20px;\n  font-size: 10pt; \n  color: #9e9e9e;\n  text-align: center;\n}\n\ntbody td {\n  padding: 2px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n  font-weight: bold;\n}\n.fontpurple {\n  color: purple;\n}\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderItemParts\", \"Part\", \"Status\", \"QuoteQuoteRequestDate\", \"WorkOrderItemPartQuantity\", \"Quote\", \"NetValue\", \"PartCost\", \"PartRetail\", \"Total\" ]);\n\n\t//below is the code to group by the part - the PartNameViz\n\tlet ret = [];\n    //iterate quotes -> items -> quote item parts\n    reportData.ayReportData.forEach(quote => {\n        quote.Items.forEach(quoteitem => {\n            quoteitem.Parts.forEach(part => {\n                //new shape of data required for report \n                let record = {\n                    Serial: quote.Serial,\n\t\t\t\t\tRequested: quote.Requested,\n\t\t\t\t\tNetViz: part.NetViz,\n\t\t\t\t\tPriceOverride: part.PriceOverride,\n\t\t\t\t\tListPrice: part.ListPrice,\n                    UnitOfMeasureViz: part.UnitOfMeasureViz,\n                    PriceViz: part.PriceViz,\n                    Cost: part.Cost,\n                    SuggestedQuantity: part.SuggestedQuantity,\n                    Quantity: part.Quantity,\n                    PartWarehouseViz: part.PartWarehouseViz,\n                    UpcViz: part.UpcViz,\n                    Serials: part.Serials,\n                    PartDescriptionViz: part.PartDescriptionViz,  \n                    LastStateNameViz: quote.LastStateNameViz,\n                    LastStateColorViz: quote.LastStateColorViz,\n                };\n\n                //Find or create group and insert this record               \n                if (part.PartDescriptionViz) {   //if part description is not empty or null then will include\n                    let groupObject = ret.find(z => z.group == (part.PartNameViz + \" \" + part.PartDescriptionViz) ); \n                    if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                    } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                     ret.push({ group: (part.PartNameViz+ \" \" + part.PartDescriptionViz), items: [record], count: 1 });                    \n                    }\n                } else {   //else if part description is empty or null then will not include so doesn't show the text null              \n                    let groupObject = ret.find(z => z.group == (part.PartNameViz) ); \n                    if (groupObject != undefined) {\n                    //there is already a matching group in the return array so just push this record into it\n                    groupObject.items.push(record);\n                    //update the count for this group's items\n                    groupObject.count++;\n                    } else {\n                    //No group yet, so start a new one in the ret array and push this record into it\n                     ret.push({ group: (part.PartNameViz), items: [record], count: 1 });                    \n                }\n                }\n                \n                \n\n            })\n        })\n    });\n\n    //replace the ayReportData with our new shaped format of data\n    reportData.ayReportData = ret;\n\n \n//note that below references the new shaped format of data\n\n//below declares a key on the entire wo to hold all Part Net, costs, profit (nets - costs), from all quotes so it exists and a key to hold all Part Net Costs\nreportData.AllWOPartsNetViz = 0;\nreportData.AllWOPartsNetCost = 0;\nreportData.AllWOPartsDiff = 0;\n\n\nfor (const EachGroup of reportData.ayReportData) \n\t{\n\n\n\t//below declares a key on the entire group to hold all Part Net, costs, profit/loss (nets - costs), for this group (this group is a single Part that has one or more wo item parts records)\n\tEachGroup.GroupPartsNetViz = 0;\n\tEachGroup.GroupPartsNetCost = 0;\n\tEachGroup.GroupPartsDiff = 0; \n\t\n\n\t//below is to Iterate through each woitempart record for this part - groupitem is a woitempart record\n\tfor (const groupitem of EachGroup.items)\n\t\t{\n\t\t\t\t\t\n\t\t\tgroupitem.ThisItemPartNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartNetCost = 0; //declare a key on the Item to hold all of this item's parts costs and set it initially to 0 \n\t\t\tgroupitem.ThisItemPartDiff = 0; //declare a key on the Item to hold all of this item's part profit/loss (nets - costs) and set it initially to 0 \n\t\t\t\n\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (groupitem.Quantity != 0) \n        \t        \t{\n\t\t\t\t\t\tEachGroup.GroupPartsNetViz += groupitem.NetViz;\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\treportData.AllWOPartsNetViz += groupitem.NetViz;\t\n\n\n\t\t\t\t\t\tgroupitem.NetCost = (groupitem.Cost * groupitem.Quantity);\t\t\t\t\t\t\n\t\t\t\t\t\tEachGroup.GroupPartsNetCost += groupitem.NetCost;\n\t\t\t\t\t\treportData.AllWOPartsNetCost += groupitem.NetCost;\n\n\n\t\t\t\t\t\tif (groupitem.NetViz != 0) \n\t\t\t\t\t\t{\n\t\t\t\t\t\tgroupitem.NetDiff = (groupitem.NetViz - groupitem.NetCost)\n\t\t\t\t\t\tEachGroup.GroupPartsDiff += groupitem.NetDiff; //\n\t\t\t\t\t\treportData.AllWOPartsDiff += groupitem.NetDiff;  //\n\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\n\n          \t      \t\t}\t\t\t\t\n\t\t\t\n\n\t\t\t\n\t\t}\n\n    }\n\n    return reportData; \n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Quote Scheduled Users.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Quote Scheduled Users.ayrt
index d7040661..f81da28f 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Quote Scheduled Users.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Quote Scheduled Users.ayrt	
@@ -1 +1 @@
-{"Name":"Quote Scheduled Users","Active":true,"Notes":"","Roles":50538,"AType":45,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemScheduledUserList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'Quote'}}</th>\n          <th colspan=\"2\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUsers'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each ScheduledUsers}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{../../CustomerViz}}</td>\n          <td colspan=\"2\">{{../WorkOrderItemStatusNameViz}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n          <td colspan=\"2\">{{UserViz}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"1\">{{EstimatedQuantity}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Quote\", \"WorkOrderItemScheduledUsers\", \"WorkOrderItemScheduledUserList\", \"WorkOrder\", \"Customer\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserEstimatedQuantity\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Quote Scheduled Users","Active":true,"Notes":"","Roles":50538,"AType":45,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemScheduledUserList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'Quote'}}</th>\n          <th colspan=\"2\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUsers'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each ScheduledUsers}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{../../CustomerViz}}</td>\n          <td colspan=\"2\">{{../WorkOrderItemStatusNameViz}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n          <td colspan=\"2\">{{UserViz}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"1\">{{EstimatedQuantity}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Quote\", \"WorkOrderItemScheduledUsers\", \"WorkOrderItemScheduledUserList\", \"WorkOrder\", \"Customer\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserEstimatedQuantity\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Quote Units grouped by Customer.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Quote Units grouped by Customer.ayrt
index 4f13f463..897e1394 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Quote Units grouped by Customer.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Quote Units grouped by Customer.ayrt	
@@ -1 +1 @@
-{"Name":"Quote Units grouped by Customer","Active":true,"Notes":"","Roles":50538,"AType":77,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemUnitList'}} grouped by {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\" class=\"leftlean\" >{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"1\">{{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemUnit'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"10\">{{group}}</td>\n            </tr>\n           {{#each items}}\n               {{#each Items}}\n                     {{#each Units}}\n            <tr>               \n               <td  colspan=\"2\">&nbsp;</td>\n               <td  colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td> <!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"1\" class=\"centerlean\">{{ayDate ../../Requested}}</td><!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"2\" >{{UnitViz}} - {{UnitModelNameViz}}</td>\n               <td  colspan=\"1\" >{{../WorkOrderItemStatusNameViz}}</td><!--note the  ../ to go up level to get this data -->\n               <td  colspan=\"3\" >{{../Notes}}</td><!--note the  ../ to go up level to get this data -->        \n          </tr>\n                     {{/each}}\n               {{/each}}\n          {{/each}}\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>     \n   </div>\n\n   <!-- uncomment to see the raw data returned from the custom Prepare \n<div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> \n-->\n\n</body>\n</html>","Style":".minimum {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitList\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderSummary\" ]);\n\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Quote Units grouped by Customer","Active":true,"Notes":"","Roles":50538,"AType":77,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'Quote'}} {{ayT 'WorkOrderItemUnitList'}} grouped by {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\" class=\"leftlean\" >{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'Quote'}}</th>\n               <th colspan=\"1\">{{ayT 'QuoteQuoteRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemUnit'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"10\">{{group}}</td>\n            </tr>\n           {{#each items}}\n               {{#each Items}}\n                     {{#each Units}}\n            <tr>               \n               <td  colspan=\"2\">&nbsp;</td>\n               <td  colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td> <!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"1\" class=\"centerlean\">{{ayDate ../../Requested}}</td><!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"2\" >{{UnitViz}} - {{UnitModelNameViz}}</td>\n               <td  colspan=\"1\" >{{../WorkOrderItemStatusNameViz}}</td><!--note the  ../ to go up level to get this data -->\n               <td  colspan=\"3\" >{{../Notes}}</td><!--note the  ../ to go up level to get this data -->        \n          </tr>\n                     {{/each}}\n               {{/each}}\n          {{/each}}\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>     \n   </div>\n\n   <!-- uncomment to see the raw data returned from the custom Prepare \n<div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> \n-->\n\n</body>\n</html>","Style":".minimum {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"Quote\", \"Customer\", \"QuoteQuoteRequestDate\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitList\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderSummary\" ]);\n\n\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Reminders.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Reminders.ayrt
index 0594ad1f..a642bf03 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Reminders.ayrt
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Reminders.ayrt
@@ -1 +1 @@
-{"Name":"Reminders","Active":true,"Notes":"","Roles":124927,"AType":52,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'ReminderList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"3\">{{ayT 'ReminderName'}}</th>\n          <th colspan=\"2\">{{ayT 'ReminderStartDate'}}</th>\n          <th colspan=\"2\">{{ayT 'ReminderStopDate'}}</th>          \n          <th colspan=\"2\">{{ayT 'Tags'}}</th>\n          <th colspan=\"3\">{{ayT 'ReminderNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"3\">{{Name}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"2\">{{ayDateTime StopDate}}</td>\n          <td colspan=\"2\">{{Tags}}</td>\n          <td colspan=\"3\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Reminder\", \"ReminderName\", \"ReminderList\", \"Tags\", \"ReminderStartDate\", \"ReminderStopDate\", \"ReminderRecurrence\", \"ReminderNotes\", \"ReminderSourceType\", \"ReminderSourceID\", \"ReminderColor\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Reminders","Active":true,"Notes":"","Roles":124927,"AType":52,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'ReminderList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"3\">{{ayT 'ReminderName'}}</th>\n          <th colspan=\"2\">{{ayT 'ReminderStartDate'}}</th>\n          <th colspan=\"2\">{{ayT 'ReminderStopDate'}}</th>          \n          <th colspan=\"2\">{{ayT 'Tags'}}</th>\n          <th colspan=\"3\">{{ayT 'ReminderNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"3\">{{Name}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"2\">{{ayDateTime StopDate}}</td>\n          <td colspan=\"2\">{{Tags}}</td>\n          <td colspan=\"3\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Reminder\", \"ReminderName\", \"ReminderList\", \"Tags\", \"ReminderStartDate\", \"ReminderStopDate\", \"ReminderRecurrence\", \"ReminderNotes\", \"ReminderSourceType\", \"ReminderSourceID\", \"ReminderColor\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Restock List Grouped By Wholesaler.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Restock List Grouped By Wholesaler.ayrt
index 8c0edd02..1c8359db 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Restock List Grouped By Wholesaler.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Restock List Grouped By Wholesaler.ayrt	
@@ -1 +1 @@
-{"Name":"Restock List Grouped By Wholesaler","Active":true,"Notes":"Will only display parts that have ReOrderQty > 0","Roles":49514,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'PurchaseOrderUIRestockList'}} grouped by {{ayT 'PartWholesalerID'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\"></th>\n\t\t\t\t\t<th colspan=\"9\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'PartByWarehouseInventoryReorderQuantity'}}</th>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'PartWarehouseName'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" >{{ayT 'PartWholesalerID'}}:&nbsp;</th>\n\t\t\t\t\t<td colspan=\"21\">&nbsp;&nbsp;&nbsp;{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t{{#if ReOrderQty}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"4\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"9\" class=\"centerlean\">{{PartName}}</td>\n\t\t\t\t\t<td colspan=\"5\" class=\"centerlean\">{{ReOrderQty}}</td>\n\t\t\t\t\t<td colspan=\"6\" class=\"centerlean\">{{PartWarehouseName}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"22\" class=\"rightlean\">{{ayT 'PartByWarehouseInventoryReorderQuantity'}}  for all parts from {{ayT 'PartWholesalerID'}} {{group}}:&emsp;</th>\n\t\t\t\t\t<td colspan=\"2\">{{ThisGroupTotalQty}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 30px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'WholesalerName')\n\n    await ayGetTranslations([\"PurchaseOrderUIRestockList\", \"PartWholesalerID\", \"PartByWarehouseInventoryReorderQuantity\", \"PartWarehouseName\", \"Part\" ]);\n\n     //Iterate through all the records in the reportData obtaining a running total of ReOrderQty for each group\n    for (EachGroup of ayData.ayReportData) \n    {  \n         let ThisGroupTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS group\n            for (Item of EachGroup.items)  //Iterate through all the poitems of THIS po adding the Qty amount of each item to the ThisPOTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.ReOrderQty != null) \n                {\n                    ThisGroupTotalQty += Item.ReOrderQty;\n                }\n                Item.QuantityRunning=ThisGroupTotalQty;\n            }\n        EachGroup.ThisGroupTotalQty=ThisGroupTotalQty;\n\n\n    }\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Restock List Grouped By Wholesaler","Active":true,"Notes":"Will only display parts that have ReOrderQty > 0","Roles":49514,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'PurchaseOrderUIRestockList'}} grouped by {{ayT 'PartWholesalerID'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\"></th>\n\t\t\t\t\t<th colspan=\"9\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'PartByWarehouseInventoryReorderQuantity'}}</th>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'PartWarehouseName'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"3\" >{{ayT 'PartWholesalerID'}}:&nbsp;</th>\n\t\t\t\t\t<td colspan=\"21\">&nbsp;&nbsp;&nbsp;{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t{{#if ReOrderQty}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"4\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"9\" class=\"centerlean\">{{PartName}}</td>\n\t\t\t\t\t<td colspan=\"5\" class=\"centerlean\">{{ReOrderQty}}</td>\n\t\t\t\t\t<td colspan=\"6\" class=\"centerlean\">{{PartWarehouseName}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"22\" class=\"rightlean\">{{ayT 'PartByWarehouseInventoryReorderQuantity'}}  for all parts from {{ayT 'PartWholesalerID'}} {{group}}:&emsp;</th>\n\t\t\t\t\t<td colspan=\"2\">{{ThisGroupTotalQty}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 30px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'WholesalerName')\n\n    await ayGetTranslations([\"PurchaseOrderUIRestockList\", \"PartWholesalerID\", \"PartByWarehouseInventoryReorderQuantity\", \"PartWarehouseName\", \"Part\" ]);\n\n     //Iterate through all the records in the reportData obtaining a running total of ReOrderQty for each group\n    for (const EachGroup of ayData.ayReportData) \n    {  \n         let ThisGroupTotalQty = 0; //Declare a temporary variable to hold the running Qty total for THIS group\n            for (const Item of EachGroup.items)  //Iterate through all the poitems of THIS po adding the Qty amount of each item to the ThisPOTotalQty variable\n            {\n                //make sure it has a value before attempting to add it to the running total\n                if (Item.ReOrderQty != null) \n                {\n                    ThisGroupTotalQty += Item.ReOrderQty;\n                }\n                Item.QuantityRunning=ThisGroupTotalQty;\n            }\n        EachGroup.ThisGroupTotalQty=ThisGroupTotalQty;\n\n\n    }\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Retail & Cost Value of Inventory.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Retail & Cost Value of Inventory.ayrt
index da4c748b..ac96dc67 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Retail & Cost Value of Inventory.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Retail & Cost Value of Inventory.ayrt	
@@ -1 +1 @@
-{"Name":"Retail & Cost Value of Inventory","Active":true,"Notes":"","Roles":49514,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Retail & Cost Value of Inventory</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"6\" class=\"leftlean\"  >{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'PartWarehouseName'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartByWarehouseInventoryQuantityOnHand'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}} Value</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartCost'}} Value</th>\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"6\">{{PartName}} {{PartDescription}}</td>\n\t\t\t\t\t<td colspan=\"5\" class=\"centerlean\">{{PartWarehouseName}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{OnHandQty}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayCurrency PartRetail}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisPartsRetailValue}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayCurrency PartCost}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisPartsCostValue}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t\t<tfoot>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"9\">Total Retail Value for all Parts in this report</th>\n\t\t\t\t\t<td colspan=\"3\">{{ayCurrency AllPartsRetailValue}}</td>\n\t\t\t\t\t<th colspan=\"9\">Total Cost Value for all Parts in this report</th>\n\t\t\t\t\t<td colspan=\"3\">{{ayCurrency AllPartsCostValue}}</td>\n\t\t\t\t</tr>\n\t\t\t</tfoot>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 30px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntfoot tr{\r\n  border-top: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 10pt; \r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n\n    await ayGetTranslations([\"PartCost\", \"PartRetail\", \"PartByWarehouseInventoryQuantityOnHand\", \"PartWarehouseName\", \"Part\" ]);\n\n\n    ayData.AllPartsRetailValue = 0;\n    ayData.AllPartsCostValue = 0;\n\n    for (EachPart of ayData.ayReportData) {\n\n        EachPart.ThisPartsRetailValue = 0;\n        EachPart.ThisPartsCostValue = 0;\n        if (EachPart.PartCost != null) {\n            EachPart.ThisPartsCostValue = EachPart.PartCost * EachPart.OnHandQty;\n            ayData.AllPartsCostValue += EachPart.ThisPartsCostValue;\n        }\n        if (EachPart.PartRetail != null) {\n            EachPart.ThisPartsRetailValue = EachPart.PartRetail * EachPart.OnHandQty;\n            ayData.AllPartsRetailValue += EachPart.ThisPartsRetailValue;\n        }\n\n\n    }\n\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Retail & Cost Value of Inventory","Active":true,"Notes":"","Roles":49514,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Retail & Cost Value of Inventory</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"6\" class=\"leftlean\"  >{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'PartWarehouseName'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartByWarehouseInventoryQuantityOnHand'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartRetail'}} Per</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}} Value</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartCost'}} Per</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartCost'}} Value</th>\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"6\">{{PartName}} {{PartDescription}}</td>\n\t\t\t\t\t<td colspan=\"5\" class=\"centerlean\">{{PartWarehouseName}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{OnHandQty}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayCurrency PartRetail}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisPartsRetailValue}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayCurrency PartCost}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisPartsCostValue}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\"></td>\n\t\t\t\t</tr>\t\t\n\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"9\">Total Retail Value for all Parts in this report</th>\n\t\t\t\t\t<td colspan=\"3\">{{ayCurrency AllPartsRetailValue}}</td>\n\t\t\t\t\t<th colspan=\"9\">Total Cost Value for all Parts in this report</th>\n\t\t\t\t\t<td colspan=\"3\">{{ayCurrency AllPartsCostValue}}</td>\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 30px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntfoot tr{\r\n  border-top: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 10pt; \r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n\n    await ayGetTranslations([\"PartCost\", \"PartRetail\", \"PartByWarehouseInventoryQuantityOnHand\", \"PartWarehouseName\", \"Part\" ]);\n\n\n    ayData.AllPartsRetailValue = 0;\n    ayData.AllPartsCostValue = 0;\n\n    for (const EachPart of ayData.ayReportData) {\n\n        EachPart.ThisPartsRetailValue = 0;\n        EachPart.ThisPartsCostValue = 0;\n        if (EachPart.PartCost != null) {\n            EachPart.ThisPartsCostValue = EachPart.PartCost * EachPart.OnHandQty;\n            ayData.AllPartsCostValue += EachPart.ThisPartsCostValue;\n        }\n        if (EachPart.PartRetail != null) {\n            EachPart.ThisPartsRetailValue = EachPart.PartRetail * EachPart.OnHandQty;\n            ayData.AllPartsRetailValue += EachPart.ThisPartsRetailValue;\n        }\n\n\n    }\n\n\n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Reviews grouped by user.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Reviews grouped by user.ayrt
index 301ecba3..6adf3f15 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Reviews grouped by user.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Reviews grouped by user.ayrt	
@@ -1 +1 @@
-{"Name":"Reviews grouped by user","Active":true,"Notes":"Uses custom Prepare ayGroupByKey to group by the UserViz","Roles":124927,"AType":61,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <table>\n      {{#each ayReportData}}\n      <thead>        \n      </thead>\n\n      <tbody>\n        <tr>\n          <th colspan=\"16\" class=\"leftlean reporttitle\">{{count}} {{ayT 'ReviewList'}} {{ayT 'ReviewUserId'}} {{group}}</th>\n        </tr>\n        <tr>\n          <th colspan=\"16\">&nbsp;</th>\n        </tr>\n\n        {{#each items}}\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewDate'}}:</th>\n          <td colspan=\"4\">{{ReviewDate}}</td>\n          <th colspan=\"3\">{{ayT 'ReviewAssignedByUserId'}}:</th>\n          <td colspan=\"5\">{{AssignedByUserViz}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewName'}}:</th>\n          <td colspan=\"12\">{{Name}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewNotes'}}:</th>\n          <td colspan=\"12\">{{Notes}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewCompletedDate'}}:</th>\n          <td colspan=\"12\">{{ayDateTime CompletedDate}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewCompletionNotes'}}:</th>\n          <td colspan=\"12\">{{CompletionNotes}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'Tags'}}:</th>\n          <td colspan=\"12\">{{Tags}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">Wiki:</th>\n          <td colspan=\"12\">{{ayWiki Wiki}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"16\">&nbsp;</th>\n        </tr>\n          <tr>\n          <th colspan=\"16\">&nbsp;</th>\n        </tr>\n        {{/each}}\n\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n      {{/each}}\n    </table>\n\n    <!--  <p> uncomment to see the raw data returned from the custom Prepare </p>\n    <div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> -->\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n  text-align: right;\r\n\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"ReviewList\", \"User\", \"ReviewUserId\", \"ReviewName\",\"ReviewDate\", \"ReviewNotes\", \"Tags\", \"ReviewAssignedByUserId\", \"ReviewCompletedDate\", \"ReviewCompletionNotes\" ]);\n\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'UserViz')\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Reviews grouped by user","Active":true,"Notes":"Uses custom Prepare ayGroupByKey to group by the UserViz","Roles":124927,"AType":61,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <table>\n      {{#each ayReportData}}\n      <thead>        \n      </thead>\n\n      <tbody>\n        <tr>\n          <th colspan=\"16\" class=\"leftlean reporttitle\">{{count}} {{ayT 'ReviewList'}} {{ayT 'ReviewUserId'}} {{group}} </th>\n        </tr>\n        <tr>\n          <th colspan=\"16\">&nbsp;</th>\n        </tr>\n\n        {{#each items}}\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewDate'}}:</th>\n          <td colspan=\"4\">{{ReviewDate}}</td>\n          <th colspan=\"3\">{{ayT 'ReviewAssignedByUserId'}}:</th>\n          <td colspan=\"5\">{{AssignedByUserViz}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewName'}}:</th>\n          <td colspan=\"12\">{{Name}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewNotes'}}:</th>\n          <td colspan=\"12\">{{Notes}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewCompletedDate'}}:</th>\n          <td colspan=\"12\">{{ayDateTime CompletedDate}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'ReviewCompletionNotes'}}:</th>\n          <td colspan=\"12\">{{CompletionNotes}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">{{ayT 'Tags'}}:</th>\n          <td colspan=\"12\">{{Tags}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"1\">&nbsp;</th>\n          <th colspan=\"3\">Wiki:</th>\n          <td colspan=\"12\">{{ayWiki Wiki}}</td>\n        </tr>\n        <tr>\n          <th colspan=\"16\">&nbsp;</th>\n        </tr>\n          <tr>\n          <th colspan=\"16\">&nbsp;</th>\n        </tr>\n        {{/each}}\n\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n      {{/each}}\n    </table>\n\n    <!--  <p> uncomment to see the raw data returned from the custom Prepare </p>\n    <div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> -->\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n  text-align: right;\r\n\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"ReviewList\", \"User\", \"ReviewUserId\", \"ReviewName\",\"ReviewDate\", \"ReviewNotes\", \"Tags\", \"ReviewAssignedByUserId\", \"ReviewCompletedDate\", \"ReviewCompletionNotes\" ]);\n\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'UserViz')\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Service Dispatch.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Service Dispatch.ayrt
index 4ef123d7..3bc09da1 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Service Dispatch.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Service Dispatch.ayrt	
@@ -1 +1 @@
-{"Name":"Service Dispatch","Active":true,"Notes":"#if_eq custom Helper - if status is Completed show checkmark in checkbox; custom Prepare to replace carriage returns with spaces; display digital signatures if present","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t{{#each ayReportData}}\n\t\t<!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n\t\t<table class=\"singlePage\">\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" class=\"reporttitle\" >{{ayT 'Customer'}}</th>\n\t\t\t\t\t<td colspan=\"12\" class=\"reporttitle\">{{CustomerViz}}</td>\n\t\t\t\t\t<th colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyName}}</th>\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'AddressTypePhysical'}}</th>\n\t\t\t\t\t<td colspan=\"12\">{{Address}}, {{City}}</td>\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean \">{{ayT 'WorkOrderServiceNumber'}}</th>\n          \t\t\t<td colspan=\"4\" class=\"rightlean\">{{Serial}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderCustomerContactName'}}</th>\n\t\t\t\t\t{{#if CustomerContactName}}<td colspan=\"12\">{{CustomerContactName}} {{CustomerPhone1Viz}} {{CustomerEmailAddressViz}}</td>\n\t\t\t\t\t{{else}}<td colspan=\"12\">{{CustomerPhone1Viz}} {{CustomerEmailAddressViz}}</td>{{/if}}\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean \">{{ayT 'WorkOrderServiceDate'}}</th>\n          \t\t\t<td colspan=\"4\" class=\"rightlean\">{{myDate ServiceDate}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\t\t\t\t\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderSummary'}}</th>\n\t\t\t\t\t<td  colspan=\"20\">{{Notes}}</td>\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderCloseByDate'}}</th>\n\t\t\t\t\t<td colspan=\"18\">{{ayDateTime CompleteByDate}}</td>\n\t\t\t\t</tr>\t\t\t\t\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'CustomerTechNotes'}}</th>\n\t\t\t\t\t<td  colspan=\"18\">{{CustomerTechNotesViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t{{#each Items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\"></td>\n\t\t\t\t\t<th style=\"background-color:{{WorkOrderItemPriorityColorViz}};\" colspan=\"4\" class=\"centerlean\">{{ayT 'WorkOrderItemPriorityID'}}</th>\n\t\t\t\t\t<td style=\"background-color:{{WorkOrderItemPriorityColorViz}};\" colspan=\"4\" class=\"centerlean\">{{WorkOrderItemPriorityNameViz}}</td>\n\t\t\t\t\t<th colspan=\"3\" class=\"rightlean\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n\t\t\t\t\t<td colspan=\"4\" class=\"leftlean\">{{ayDateTime RequestDate}}</td>\n\t\t\t\t\t<th style=\"background-color:{{WorkOrderItemStatusColorViz}};\" colspan=\"4\" class=\"centerlean\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n\t\t\t\t\t<td style=\"background-color:{{WorkOrderItemStatusColorViz}};\" colspan=\"4\" class=\"centerlean\">{{WorkOrderItemStatusNameViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}} &#35;{{Sequence}}</th>\n\t\t\t\t\t<td colspan=\"19\">{{Notes}}</td>\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderItemTechNotes'}}</th>\n\t\t\t\t\t<td colspan=\"19\">{{TechNotes}}</td>\n\t\t\t\t\t\n\t\t\t\t</tr>\n\n\t\t\t\t{{#each Units}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'Unit'}}</th>\n\t\t\t\t\t<td colspan=\"18\">{{UnitViz}} {{UnitModelNameViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the Units -->\n\t\t\t\t\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each ScheduledUsers}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'NotifyEventScheduledOnWorkorder'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{UserViz}}</td>\n\t\t\t\t\t<th colspan=\"4\">As expected?</th>\n\t\t\t\t\t<th colspan=\"4\" class=\"centerlean\">Actual</th>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{ayDateTime StartDate}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\">  </label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserStopDate'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{ayDateTime StopDate}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\">  </label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserServiceRateID'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{ServiceRateViz}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\"></label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{EstimatedQuantity}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\"></label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the ScheduledUsers -->\n\n\t\t\t\t{{#if Tasks}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"6\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th>\n\t\t\t\t\t<th colspan=\"16\">{{ayT 'WorkOrderItemTasks'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\t\t\t\t{{#each Tasks}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<td colspan=\"3\">{{StatusViz}}</td>\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"3\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"3\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"16\">{{Task}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the Tasks -->\n\t\t\t\t{{#if Tasks}}<!--if there is Tasks then places a blank row after all tasks for this item  -->\t\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\n\t\t\t\t{{#if Parts}}\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\"></th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n\t\t\t\t\t<th colspan=\"4\" class=\"centerlean\">{{ayT 'WorkOrderItemPartPartWarehouseID'}}</th>\n\t\t\t\t\t<th colspan=\"13\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'WorkOrderItemPartUsed'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\t\t\t\t{{#each Parts}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\"></td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{PartWarehouseViz}}</td>\n\t\t\t\t\t<!--below if includes a label Seria#: and displays serial numbers IF they are present, else only shows the displayed Part -->\n\t\t\t\t\t{{#if Serials}} <td colspan=\"14\">{{PartNameViz}} {{PartDescriptionViz}} &nbsp; {{ayT 'WorkOrderItemPartPartSerialID'}}: {{Serials}} </td>\n\t\t\t\t\t{{else}} <td colspan=\"14\">{{PartNameViz}} {{PartDescriptionViz}}</td> {{/if}}\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\"><label for=\"manual1\"> </label></td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the Parts -->\n\t\t\t\t{{#if Parts}}<!--if there is Parts then places a blank row after all parts for this item  -->\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderItemLaborServiceDetails'}}</th>\n\t\t\t\t\t<td colspan=\"18\" class=\"centerlean\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<!--closes the Items -->\n\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'TechSignature'}}</th>\n\t\t\t\t\t{{#if TechSignature}} <td colspan=\"8\"><img src=\"{{{TechSignature}}}\" height=\"40px\"/></td>\n\t\t\t\t\t{{else}}<td colspan=\"8\"><hr></td>{{/if}}\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'CustomerSignature'}}</th>\n\t\t\t\t\t{{#if CustomerSignature}} <td colspan=\"7\"><img src=\"{{{CustomerSignature}}}\" height=\"40px\"/></td>\n\t\t\t\t\t{{else}}<td colspan=\"7\"><hr></td>{{/if}}\n\t\t\t\t</tr>\t\t\t\t\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"4\">Date</th>\n\t\t\t\t\t{{#if TechSignatureCaptured}} <td colspan=\"8\"> {{ayDateTime TechSignatureCaptured}} </td>\n\t\t\t\t\t{{else}}<td colspan=\"8\"><hr></td>{{/if}}\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"4\">Date</th>\n\t\t\t\t\t{{#if CustomerSignatureCaptured}} <td colspan=\"7\"> {{ayDateTime CustomerSignatureCaptured}}</td>\n\t\t\t\t\t{{else}}<td colspan=\"7\"><hr></td>{{/if}}\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t{{/each}}\n\t</div>\n</body>\n</html>","Style":"/* if not using a rule set or specific property it is recommended to comment out or delete fully for report performance*/\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\n\ntable { \n  table-layout: fixed; \n  font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;\n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 8pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 30px;\n  text-align: left;\n  color: #9e9e9e;\n}\n\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([ \"WorkOrderCloseByDate\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"Customer\", \"WorkOrderSummary\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"AddressTypePhysical\",  \"WorkOrderCustomerContactName\", \"CustomerTechNotes\", \"WorkOrderItemTechNotes\", \"Part\", \"WorkOrderItemPartUsed\", \"WorkOrderItemPartPartWarehouseID\", \"WorkOrderItemPartPartSerialID\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemScheduledUser\", \"NotifyEventScheduledOnWorkorder\", \"WorkOrderItemScheduledUserEstimatedQuantity\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserStopDate\", \"WorkOrderItemScheduledUserServiceRateID\", \"WorkOrderItemTasks\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\", \"CustomerSignature\", \"TechSignature\", \"WorkOrderItemPriorityID\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemRequestDate\" ]);\n\n    //below checks if any parts have Serials to remove carriage returns so parts serials display on same line\n    for (EachWO of reportData.ayReportData) {\n        for (Item of EachWO.Items) {\n            for (Part of Item.Parts) {\n                if (Part.Serials != null) {\n                    s = Part.Serials;                    \n                    Part.Serials = s.replace(/[\\n\\r]+/g, ' ');\n                }\n            }\n        }\n    }\n\n    return reportData; \n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})\n\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});\n\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Service Dispatch","Active":true,"Notes":"#if_eq custom Helper - if status is Completed show checkmark in checkbox; custom Prepare to replace carriage returns with spaces; display digital signatures if present","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t{{#each ayReportData}}\n\t\t<!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n\t\t<table class=\"singlePage\">\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" class=\"reporttitle\" >{{ayT 'Customer'}}</th>\n\t\t\t\t\t<td colspan=\"12\" class=\"reporttitle\">{{CustomerViz}}</td>\n\t\t\t\t\t<th colspan=\"8\" class=\"rightlean\">{{../ayServerMetaData.CompanyName}}</th>\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'AddressTypePhysical'}}</th>\n\t\t\t\t\t<td colspan=\"12\">{{Address}}, {{City}}</td>\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean \">{{ayT 'WorkOrderServiceNumber'}}</th>\n          \t\t\t<td colspan=\"4\" class=\"rightlean\">{{Serial}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderCustomerContactName'}}</th>\n\t\t\t\t\t{{#if CustomerContactName}}<td colspan=\"12\">{{CustomerContactName}} {{CustomerPhone1Viz}} {{CustomerEmailAddressViz}}</td>\n\t\t\t\t\t{{else}}<td colspan=\"12\">{{CustomerPhone1Viz}} {{CustomerEmailAddressViz}}</td>{{/if}}\n\t\t\t\t\t<th colspan=\"4\" class=\"rightlean \">{{ayT 'WorkOrderServiceDate'}}</th>\n          \t\t\t<td colspan=\"4\" class=\"rightlean\">{{ayDate ServiceDate}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\t\t\t\t\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderSummary'}}</th>\n\t\t\t\t\t<td  colspan=\"20\">{{Notes}}</td>\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderCloseByDate'}}</th>\n\t\t\t\t\t<td colspan=\"18\">{{ayDateTime CompleteByDate}}</td>\n\t\t\t\t</tr>\t\t\t\t\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'CustomerTechNotes'}}</th>\n\t\t\t\t\t<td  colspan=\"18\">{{CustomerTechNotesViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t{{#each Items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\"></td>\n\t\t\t\t\t<th style=\"background-color:{{WorkOrderItemPriorityColorViz}};\" colspan=\"4\" class=\"centerlean\">{{ayT 'WorkOrderItemPriorityID'}}</th>\n\t\t\t\t\t<td style=\"background-color:{{WorkOrderItemPriorityColorViz}};\" colspan=\"4\" class=\"centerlean\">{{WorkOrderItemPriorityNameViz}}</td>\n\t\t\t\t\t<th colspan=\"3\" class=\"rightlean\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n\t\t\t\t\t<td colspan=\"4\" class=\"leftlean\">{{ayDateTime RequestDate}}</td>\n\t\t\t\t\t<th style=\"background-color:{{WorkOrderItemStatusColorViz}};\" colspan=\"4\" class=\"centerlean\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n\t\t\t\t\t<td style=\"background-color:{{WorkOrderItemStatusColorViz}};\" colspan=\"4\" class=\"centerlean\">{{WorkOrderItemStatusNameViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}} &#35;{{Sequence}}</th>\n\t\t\t\t\t<td colspan=\"19\">{{Notes}}</td>\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"1\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderItemTechNotes'}}</th>\n\t\t\t\t\t<td colspan=\"19\">{{TechNotes}}</td>\n\t\t\t\t\t\n\t\t\t\t</tr>\n\n\t\t\t\t{{#each Units}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'Unit'}}</th>\n\t\t\t\t\t<td colspan=\"18\">{{UnitViz}} {{UnitModelNameViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the Units -->\n\t\t\t\t\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each ScheduledUsers}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'NotifyEventScheduledOnWorkorder'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{UserViz}}</td>\n\t\t\t\t\t<th colspan=\"4\">As expected?</th>\n\t\t\t\t\t<th colspan=\"4\" class=\"centerlean\">Actual</th>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{ayDateTime StartDate}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\">  </label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserStopDate'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{ayDateTime StopDate}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\">  </label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserServiceRateID'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{ServiceRateViz}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\"></label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n\t\t\t\t\t<td colspan=\"8\">{{EstimatedQuantity}}</td>\n\t\t\t\t\t<td colspan=\"3\"><input type=\"checkbox\" id=\"manual1\"> <label for=\"manual1\"></label></td>\n\t\t\t\t\t<td colspan=\"5\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the ScheduledUsers -->\n\n\t\t\t\t{{#if Tasks}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"6\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th>\n\t\t\t\t\t<th colspan=\"16\">{{ayT 'WorkOrderItemTasks'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\t\t\t\t{{#each Tasks}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<td colspan=\"3\">{{StatusViz}}</td>\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"3\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"3\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"16\">{{Task}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the Tasks -->\n\t\t\t\t{{#if Tasks}}<!--if there is Tasks then places a blank row after all tasks for this item  -->\t\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\n\t\t\t\t{{#if Parts}}\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\"></th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n\t\t\t\t\t<th colspan=\"4\" class=\"centerlean\">{{ayT 'WorkOrderItemPartPartWarehouseID'}}</th>\n\t\t\t\t\t<th colspan=\"13\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'WorkOrderItemPartUsed'}}</th>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\t\t\t\t{{#each Parts}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\"></td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{PartWarehouseViz}}</td>\n\t\t\t\t\t<!--below if includes a label Seria#: and displays serial numbers IF they are present, else only shows the displayed Part -->\n\t\t\t\t\t{{#if Serials}} <td colspan=\"14\">{{PartNameViz}} {{PartDescriptionViz}} &nbsp; {{ayT 'WorkOrderItemPartPartSerialID'}}: {{Serials}} </td>\n\t\t\t\t\t{{else}} <td colspan=\"14\">{{PartNameViz}} {{PartDescriptionViz}}</td> {{/if}}\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\"><label for=\"manual1\"> </label></td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}<!--closes the Parts -->\n\t\t\t\t{{#if Parts}}<!--if there is Parts then places a blank row after all parts for this item  -->\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/if}}\n\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'WorkOrderItemLaborServiceDetails'}}</th>\n\t\t\t\t\t<td colspan=\"18\" class=\"centerlean\"></td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<!--closes the Items -->\n\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'TechSignature'}}</th>\n\t\t\t\t\t{{#if TechSignature}} <td colspan=\"8\"><img src=\"{{{TechSignature}}}\" height=\"40px\"/></td>\n\t\t\t\t\t{{else}}<td colspan=\"8\"><hr></td>{{/if}}\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'CustomerSignature'}}</th>\n\t\t\t\t\t{{#if CustomerSignature}} <td colspan=\"7\"><img src=\"{{{CustomerSignature}}}\" height=\"40px\"/></td>\n\t\t\t\t\t{{else}}<td colspan=\"7\"><hr></td>{{/if}}\n\t\t\t\t</tr>\t\t\t\t\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr style=\"background-color:white\">\n\t\t\t\t\t<th colspan=\"4\">Date</th>\n\t\t\t\t\t{{#if TechSignatureCaptured}} <td colspan=\"8\"> {{ayDateTime TechSignatureCaptured}} </td>\n\t\t\t\t\t{{else}}<td colspan=\"8\"><hr></td>{{/if}}\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<th colspan=\"4\">Date</th>\n\t\t\t\t\t{{#if CustomerSignatureCaptured}} <td colspan=\"7\"> {{ayDateTime CustomerSignatureCaptured}}</td>\n\t\t\t\t\t{{else}}<td colspan=\"7\"><hr></td>{{/if}}\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t{{/each}}\n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\n\ntable { \n  table-layout: fixed; \n  font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;\n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 8pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 30px;\n  text-align: left;\n  color: #9e9e9e;\n}\n\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([ \"WorkOrderCloseByDate\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"Customer\", \"WorkOrderSummary\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"AddressTypePhysical\",  \"WorkOrderCustomerContactName\", \"CustomerTechNotes\", \"WorkOrderItemTechNotes\", \"Part\", \"WorkOrderItemPartUsed\", \"WorkOrderItemPartPartWarehouseID\", \"WorkOrderItemPartPartSerialID\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemScheduledUser\", \"NotifyEventScheduledOnWorkorder\", \"WorkOrderItemScheduledUserEstimatedQuantity\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserStopDate\", \"WorkOrderItemScheduledUserServiceRateID\", \"WorkOrderItemTasks\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\", \"CustomerSignature\", \"TechSignature\", \"WorkOrderItemPriorityID\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemRequestDate\" ]);\n\n    //below checks if any parts have Serials to remove carriage returns so parts serials display on same line\n    for (const EachWO of reportData.ayReportData) {\n        for (const Item of EachWO.Items) {\n            for (const Part of Item.Parts) {\n                if (Part.Serials != null) {\n                    let s = Part.Serials;                    \n                    Part.Serials = s.replace(/[\\n\\r]+/g, ' ');\n                }\n            }\n        }\n    }\n\n    return reportData; \n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Tax Codes List.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Tax Codes List.ayrt
index 2d4beb45..084d3c30 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Tax Codes List.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Tax Codes List.ayrt	
@@ -1 +1 @@
-{"Name":"Tax Codes List","Active":true,"Notes":"","Roles":124927,"AType":64,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>Tax Codes List</p>\n    </div>\n\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"6\" class=\"leftlean\" >{{ayT 'TaxCodeName'}}</th>\n          <th colspan=\"6\">{{ayT 'Tags'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxOnTax'}}</th>\n          <th colspan=\"6\">{{ayT 'TaxCodeNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n        <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed around the opening trand closing /tr -->\n        <tr>\n          <td colspan=\"6\">{{Name}}</td>\n          <td colspan=\"6\">{{Tags}}</td>\n          <td colspan=\"2\">{{TaxAPct}} &#37;</td>\n          <td colspan=\"2\">{{TaxBPct}} &#37;</td>\n          <!-- note that this if checks to see if TaxOnTax is true - if true, shows checkmark, else shows not checked -->\n\t\t    {{#if TaxOnTax }}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n\t\t <!-- note that this if checks to see if TaxOnTax is true - if true, shows checkmark, else shows not checked -->\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([\"TaxCodeName\", \"Tags\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"TaxCodeTaxOnTax\", \"TaxCodeNotes\" ]);\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Tax Codes List","Active":true,"Notes":"","Roles":124927,"AType":64,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>Tax Codes List</p>\n    </div>\n\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"6\" class=\"leftlean\" >{{ayT 'TaxCodeName'}}</th>\n          <th colspan=\"6\">{{ayT 'Tags'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxOnTax'}}</th>\n          <th colspan=\"6\">{{ayT 'TaxCodeNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n        <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed around the opening trand closing /tr -->\n        <tr>\n          <td colspan=\"6\">{{Name}}</td>\n          <td colspan=\"6\">{{Tags}}</td>\n          <td colspan=\"2\">{{TaxAPct}} &#37;</td>\n          <td colspan=\"2\">{{TaxBPct}} &#37;</td>\n          <!-- note that this if checks to see if TaxOnTax is true - if true, shows checkmark, else shows not checked -->\n\t\t    {{#if TaxOnTax }}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>{{else}}<td colspan=\"2\" class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if}}\n\t\t <!-- note that this if checks to see if TaxOnTax is true - if true, shows checkmark, else shows not checked -->\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([\"TaxCodeName\", \"Tags\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"TaxCodeTaxOnTax\", \"TaxCodeNotes\" ]);\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Unit Meter Reading.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Unit Meter Reading.ayrt
index df593523..3de2bbb1 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Unit Meter Reading.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Unit Meter Reading.ayrt	
@@ -1 +1 @@
-{"Name":"Unit Meter Reading","Active":true,"Notes":"","Roles":50538,"AType":53,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n  <div>\n    {{#each ayReportData}}\n    <div class=\"reporttitle\">\n      <p>{{ayT 'UnitMeterReadingList'}} for {{ayT 'Unit'}}: {{group}}</p> <!-- from custom Prepare's group by the UnitViz -->\n    </div>\n    <table>\n      <thead>\n        <tr>\n          <th colspan=\"2\">{{ayT 'UnitMeterReadingMeterDate'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitMeterReading'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitMeterReadingWorkOrderItemID'}}</th>\n          <th colspan=\"4\">{{ayT 'UnitMeterReadingDescription'}}</th>\n        </tr>\n      </thead>\n      <tbody>\n        {{#each items}}\n        <tr>\n          <td colspan=\"2\">{{ayDateTime MeterDate}}</td>\n          <td colspan=\"2\">{{Meter}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{WorkOrderViz}}</td>\n          <td colspan=\"4\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n      <tfoot>\n      </tfoot>\n    </table>\n  </div>\n  {{/each}}\n</body>\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n  text-align: center;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Unit\", \"UnitMeterReadingList\", \"UnitMeterReading\", \"UnitMeterReadingMeterDate\", \"UnitMeterReadingDescription\", \"UnitMeterReadingWorkOrderItemID\" ]);\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'UnitViz')\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Unit Meter Reading","Active":true,"Notes":"","Roles":50538,"AType":53,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n  <div>\n    {{#each ayReportData}}\n    <div class=\"reporttitle\">\n      <p>{{ayT 'UnitMeterReadingList'}} for {{ayT 'Unit'}}: {{group}}</p> <!-- from custom Prepare's group by the UnitViz -->\n    </div>\n    <table>\n      <thead>\n        <tr>\n          <th colspan=\"2\">{{ayT 'UnitMeterReadingMeterDate'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitMeterReading'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitMeterReadingWorkOrderItemID'}}</th>\n          <th colspan=\"4\">{{ayT 'UnitMeterReadingDescription'}}</th>\n        </tr>\n      </thead>\n      <tbody>\n        {{#each items}}\n        <tr>\n          <td colspan=\"2\">{{ayDateTime MeterDate}}</td>\n          <td colspan=\"2\">{{Meter}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{WorkOrderViz}}</td>\n          <td colspan=\"4\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n      <tfoot>\n      </tfoot>\n    </table>\n  </div>\n  {{/each}}\n</body>\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n  text-align: center;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"Unit\", \"UnitMeterReadingList\", \"UnitMeterReading\", \"UnitMeterReadingMeterDate\", \"UnitMeterReadingDescription\", \"UnitMeterReadingWorkOrderItemID\" ]);\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    ayData.ayReportData = ayGroupByKey(ayData.ayReportData, 'UnitViz')\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Unit Models list.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Unit Models list.ayrt
index 24243f1b..381dda19 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Unit Models list.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Unit Models list.ayrt	
@@ -1 +1 @@
-{"Name":"Unit Models list","Active":true,"Notes":"","Roles":50538,"AType":32,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'UnitModels'}} List</p>\n    </div>\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"5\" class=\"leftlean\">{{ayT 'UnitModel'}}</th>\n          <th colspan=\"3\">{{ayT 'UnitModelVendorID'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitModelIntroducedDate'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitModelLifeTimeWarranty'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitModelWarrantyLength'}}</th>\n          <th colspan=\"3\">{{ayT 'UnitModelWarrantyTerms'}}</th>\n          <th colspan=\"2\">{{ayT 'Tags'}}</th>\n          <th colspan=\"6\">{{ayT 'UnitModelNotes'}}</th>\n        </tr>\n      </thead>\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"5\">{{Name}}</td>\n          <td colspan=\"3\">{{VendorViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayDate IntroducedDate}}</td>\n          {{#if LifeTimeWarranty}}<td colspan=\"2\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>{{else}}<td colspan=\"2\">&nbsp;</td>{{/if}}\n          {{#if WarrantyLength}}<td colspan=\"2\">{{WarrantyLength}}</td>{{else}}<td colspan=\"2\">&nbsp;</td>{{/if}}\n          <td colspan=\"3\">{{WarrantyTerms}}</td>\n          <td colspan=\"3\">{{Tags}}</td>\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n      <tfoot>\n      </tfoot>\n    </table>\n  </div>\n</body>\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"UnitModels\", \"UnitModel\", \"UnitModelVendorID\", \"UnitModelIntroducedDate\", \"UnitModelWarrantyTerms\", \"UnitModelWarrantyLength\", \"UnitModelLifeTimeWarranty\", \"UnitModelNotes\", \"Tags\" ]);\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Unit Models list","Active":true,"Notes":"","Roles":50538,"AType":32,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'UnitModels'}} List</p>\n    </div>\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"5\" class=\"leftlean\">{{ayT 'UnitModel'}}</th>\n          <th colspan=\"3\">{{ayT 'UnitModelVendorID'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitModelIntroducedDate'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitModelLifeTimeWarranty'}}</th>\n          <th colspan=\"2\">{{ayT 'UnitModelWarrantyLength'}}</th>\n          <th colspan=\"3\">{{ayT 'UnitModelWarrantyTerms'}}</th>\n          <th colspan=\"2\">{{ayT 'Tags'}}</th>\n          <th colspan=\"6\">{{ayT 'UnitModelNotes'}}</th>\n        </tr>\n      </thead>\n      <tbody>\n        {{#each ayReportData}}\n        <tr>\n          <td colspan=\"5\">{{Name}}</td>\n          <td colspan=\"3\">{{VendorViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayDate IntroducedDate}}</td>\n          {{#if LifeTimeWarranty}}<td colspan=\"2\"  class=\"centerlean\"><input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>{{else}}<td colspan=\"2\">&nbsp;</td>{{/if}}\n          {{#if WarrantyLength}}<td colspan=\"2\" class=\"centerlean\">{{WarrantyLength}}</td>{{else}}<td colspan=\"2\">&nbsp;</td>{{/if}}\n          <td colspan=\"3\">{{WarrantyTerms}}</td>\n          <td colspan=\"3\">{{Tags}}</td>\n          <td colspan=\"6\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n      <tfoot>\n      </tfoot>\n    </table>\n  </div>\n</body>\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"UnitModels\", \"UnitModel\", \"UnitModelVendorID\", \"UnitModelIntroducedDate\", \"UnitModelWarrantyTerms\", \"UnitModelWarrantyLength\", \"UnitModelLifeTimeWarranty\", \"UnitModelNotes\", \"Tags\" ]);\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Units Per Customer .ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Units Per Customer .ayrt
index db2cda8a..8a0a7469 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Units Per Customer .ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Units Per Customer .ayrt	
@@ -1 +1 @@
-{"Name":"Units Per Customer ","Active":true,"Notes":"Use of ayGroupByKey in the custom Prepare to group units by the customer","Roles":50554,"AType":31,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div  >\t      \n\t\t<table  > \n     \t\t<thead>\n            <tr>\n\t\t\t\t<th colspan=\"3\"></th>\n\t\t\t\t<th colspan=\"3\">{{ayT 'UnitSerial'}}</th>\n\t\t\t\t<th colspan=\"4\">{{ayT 'UnitModel'}}</th>\n\t\t\t\t<th colspan=\"4\">{{ayT 'LastServiceWorkOrderServiceDate'}}</th>\n\t\t\t\t<th colspan=\"4\">{{ayT 'LastServiceWorkOrder'}}</th>\n\t\t\t\t<th colspan=\"6\">{{ayT 'UnitNotes'}}</th>             \n            </tr>\n     \t\t</thead>\n          \n         <tbody>  \n            {{#each ayReportData}}<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n           <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n           <tr>\n\t\t\t   <th colspan=\"24\"  class=\"leftlean\"># of {{ayT 'UnitList'}} for {{group}}:&emsp;{{count}}</th>\n           </tr>\n\t\t   {{#each items}}\n\t\t   <tr>\n\t\t\t   <td colspan=\"3\">&nbsp;</td>\n\t\t\t\t<td colspan=\"3\">{{Serial}}</td>\n\t\t\t\t<td colspan=\"4\">{{UnitModelNameViz}}</td>\n\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{ayDate LastServiceDateViz}}</td>\n\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{LastWorkOrderViz}}</td>\n\t\t\t\t<td colspan=\"6\">{{Notes}}</td> \n           </tr>\n\t\t\t{{/each}}\n\t\t\t<tr>\n\t\t\t   <td colspan=\"24\" class=\"rightlean\">&nbsp;</td>\n           </tr>\n           \t {{/each}}\n         </tbody>\n      </table>\n\n\n      \n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    reportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\n    await ayGetTranslations([ \"UnitList\", \"Customer\", \"UnitSerial\", \"LastServiceWorkOrder\", \"LastServiceWorkOrderServiceDate\", \"UnitNotes\", \"UnitModel\" ]);\n\n\n    //return the data into the pipeline to send to the report template\n    return reportData;\n}\n\n","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Units Per Customer ","Active":true,"Notes":"Use of ayGroupByKey in the custom Prepare to group units by the customer","Roles":50554,"AType":31,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t<div  >\t      \n\t\t<table  > \n     \t\t<thead>\n            <tr>\n\t\t\t\t<th colspan=\"3\"></th>\n\t\t\t\t<th colspan=\"3\">{{ayT 'UnitSerial'}}</th>\n\t\t\t\t<th colspan=\"4\">{{ayT 'UnitModel'}}</th>\n\t\t\t\t<th colspan=\"4\">{{ayT 'LastServiceWorkOrderServiceDate'}}</th>\n\t\t\t\t<th colspan=\"4\">{{ayT 'LastServiceWorkOrder'}}</th>\n\t\t\t\t<th colspan=\"6\">{{ayT 'UnitNotes'}}</th>             \n            </tr>\n     \t\t</thead>\n          \n         <tbody>  \n            {{#each ayReportData}}<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n           <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n           <tr>\n\t\t\t   <th colspan=\"24\"  class=\"leftlean\"># of {{ayT 'UnitList'}} for {{group}}:&emsp;{{count}}</th>\n           </tr>\n\t\t   {{#each items}}\n\t\t   <tr>\n\t\t\t   <td colspan=\"3\">&nbsp;</td>\n\t\t\t\t<td colspan=\"3\">{{Serial}}</td>\n\t\t\t\t<td colspan=\"4\">{{UnitModelNameViz}}</td>\n\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{ayDate LastServiceDateViz}}</td>\n\t\t\t\t<td colspan=\"4\" class=\"centerlean\">{{LastWorkOrderViz}}</td>\n\t\t\t\t<td colspan=\"6\">{{Notes}}</td> \n           </tr>\n\t\t\t{{/each}}\n\t\t\t<tr>\n\t\t\t   <td colspan=\"24\" class=\"rightlean\">&nbsp;</td>\n           </tr>\n           \t {{/each}}\n         </tbody>\n      </table>\n\n\n      \n\t</div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: left;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData) {\n\n    //send the raw report data to the groupByKey function which will return a new array grouped by the key name provided\n    reportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\n    await ayGetTranslations([ \"UnitList\", \"Customer\", \"UnitSerial\", \"LastServiceWorkOrder\", \"LastServiceWorkOrderServiceDate\", \"UnitNotes\", \"UnitModel\" ]);\n\n\n    //return the data into the pipeline to send to the report template\n    return reportData;\n}\n\n","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Vendor Contact Report.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Vendor Contact Report.ayrt
index 44ab8081..f9aca960 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Vendor Contact Report.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Vendor Contact Report.ayrt	
@@ -1 +1 @@
-{"Name":"Vendor Contact Report","Active":true,"Notes":"","Roles":49258,"AType":33,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>Vendor Contact List</p>\n    </div>\n\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"4\">{{ayT 'VendorName'}}</th>\n          <th colspan=\"3\">{{ayT 'Tags'}}</th>\n          <th colspan=\"3\">{{ayT 'VendorAccountNumber'}}</th>\n          <th colspan=\"3\">{{ayT 'VendorPhone1'}}</th>\n          <th colspan=\"3\">{{ayT 'VendorEmail'}}</th>\n          <th colspan=\"4\">{{ayT 'WebAddress'}}</th>\n          <th colspan=\"4\">{{ayT 'VendorNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n        <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n        <tr>\n          <td colspan=\"4\">{{Name}}</td>\n          <td colspan=\"3\">{{Tags}}</td>\n          <td colspan=\"3\">{{AccountNumber}}</td>\n          <td colspan=\"3\">{{Phone1}}</td>\n          <td colspan=\"3\">{{EmailAddress}}</td>\n          <td colspan=\"4\">{{WebAddress}}</td>\n          <td colspan=\"4\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([\"VendorName\", \"Tags\", \"VendorAccountNumber\", \"VendorPhone1\", \"VendorEmail\", \"VendorNotes\", \"WebAddress\" ]);\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>\n","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Vendor Contact Report","Active":true,"Notes":"","Roles":49258,"AType":33,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>Vendor Contact List</p>\n    </div>\n\n    <table>\n      <thead>\n        <tr>\n          <!-- to repeat column headers on every page, include in the thead -->\n          <th colspan=\"4\">{{ayT 'VendorName'}}</th>\n          <th colspan=\"3\">{{ayT 'Tags'}}</th>\n          <th colspan=\"3\">{{ayT 'VendorAccountNumber'}}</th>\n          <th colspan=\"3\">{{ayT 'VendorPhone1'}}</th>\n          <th colspan=\"3\">{{ayT 'VendorEmail'}}</th>\n          <th colspan=\"4\">{{ayT 'WebAddress'}}</th>\n          <th colspan=\"4\">{{ayT 'VendorNotes'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        <!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n        <!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n        <tr>\n          <td colspan=\"4\">{{Name}}</td>\n          <td colspan=\"3\">{{Tags}}</td>\n          <td colspan=\"3\">{{AccountNumber}}</td>\n          <td colspan=\"3\">{{Phone1}}</td>\n          <td colspan=\"3\">{{EmailAddress}}</td>\n          <td colspan=\"4\">{{WebAddress}}</td>\n          <td colspan=\"4\">{{Notes}}</td>\n        </tr>\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed;\n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n  font-size: 16pt;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([\"VendorName\", \"Tags\", \"VendorAccountNumber\", \"VendorPhone1\", \"VendorEmail\", \"VendorNotes\", \"WebAddress\" ]);\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>\n","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Summary.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Summary.ayrt
index 95b6d106..b791eb6e 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Summary.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Summary.ayrt	
@@ -1 +1 @@
-{"Name":"Work Order Item Summary","Active":true,"Notes":"Custom Prepare to display each WO Item total nets and totals for all workorder items in list","Roles":50538,"AType":35,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"2\">{{ayT 'Priority'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            <!--note the need for trailing zeros and backslash to reference values above Items -->\n            <tr>\n               <td colspan=\"2\">{{WorkOrderId}} - {{Sequence}}</td>\n               <td colspan=\"2\">{{../CustomerViz}}</td>\n               <td colspan=\"1\">{{ayDate ../ServiceDate}}</td>\n               <td colspan=\"1\">{{ayDate RequestDate}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemStatusColorViz}}\">{{WorkOrderItemStatusNameViz}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemPriorityColorViz}}\">{{WorkOrderItemPriorityNameViz}}</td>\n               <td colspan=\"3\">{{Notes}}</td>\n            </tr>\n            <tr>\n               <td colspan=\"14\">&nbsp;</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n         </tbody>\n         <tfoot>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":"\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 5px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"Priority\", \"WorkOrderItemRequestDate\"]);\n\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Work Order Item Summary","Active":true,"Notes":"Custom Prepare to display each WO Item total nets and totals for all workorder items in list","Roles":50538,"AType":35,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n         <p>{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</p>\n      </div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}} &#38; {{ayT 'WorkOrderItem'}} {{ayT 'Sequence'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"2\">{{ayT 'Priority'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            {{#each Items}}\n            <!--note the need for trailing zeros and backslash to reference values above Items -->\n            <tr>\n               <td colspan=\"2\">{{WorkOrderId}} - {{Sequence}}</td>\n               <td colspan=\"2\">{{../CustomerViz}}</td>\n               <td colspan=\"1\">{{ayDate ../ServiceDate}}</td>\n               <td colspan=\"1\">{{ayDate RequestDate}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemStatusColorViz}}\">{{WorkOrderItemStatusNameViz}}</td>\n               <td colspan=\"2\" style=\"background-color:{{WorkOrderItemPriorityColorViz}}\">{{WorkOrderItemPriorityNameViz}}</td>\n               <td colspan=\"3\">{{Notes}}</td>\n            </tr>\n            <tr>\n               <td colspan=\"14\">&nbsp;</td>\n            </tr>\n            {{/each}}\n            {{/each}}\n         </tbody>\n         <tfoot>\n         </tfoot>\n      </table>\n\n   </div>\n</body>\n\n</html>","Style":"\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 5px;\n  word-wrap: break-word;\n  font-size: 7pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"WorkOrderItem\", \"Sequence\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"Priority\", \"WorkOrderItemRequestDate\"]);\n\n\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Tasks.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Tasks.ayrt
index b39a06a5..75cea326 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Tasks.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Work Order Item Tasks.ayrt	
@@ -1 +1 @@
-{"Name":"Work Order Item Tasks","Active":true,"Notes":"","Roles":50538,"AType":42,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemList'}} {{ayT 'WorkOrderItemTasks'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n\n\n\t\t\t\t\t<th colspan=\"2\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th> \n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemTasks'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each Tasks}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{ayDateTime ../../ServiceDate}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"6\">{{Task}}</td>\n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemTasks\", \"WorkOrder\", \"WorkOrderItemList\", \"WorkOrderServiceDate\", \"WorkOrderItemSummary\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\" ]);\n\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n\r\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\r\n//note that this HAS to be added here in Helpers, is NOT built in\r\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\r\n    if(a == b) // Or === depending on your needs\r\n        return opts.fn(this);\r\n    else\r\n        return opts.inverse(this);\r\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Work Order Item Tasks","Active":true,"Notes":"","Roles":50538,"AType":42,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemList'}} {{ayT 'WorkOrderItemTasks'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n\n\n\t\t\t\t\t<th colspan=\"2\" class=\"centerlean\" >{{ayT 'WorkOrderItemTaskWorkOrderItemTaskCompletionType'}}</th> \n\t\t\t\t\t<th colspan=\"6\">{{ayT 'WorkOrderItemTasks'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each Tasks}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{ayDateTime ../../ServiceDate}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n\n\t\t\t\t\t<!-- note that this if_eq is from a custom Helper --><!--  IF status equals Completed (value is 2) then displays with a checkmark -->\n\t\t\t\t\t{{#if_eq Status 2}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" checked><label for=\"manual1\"> </label></td>\n\t\t\t\t\t{{else}}<td colspan=\"2\" class=\"centerlean\">{{StatusViz}} <input type=\"checkbox\" id=\"manual1\" ><label for=\"manual1\"> </label></td>{{/if_eq}}\n\t\t\t\t\t<td colspan=\"6\">{{Task}}</td>\n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemTasks\", \"WorkOrder\", \"WorkOrderItemList\", \"WorkOrderServiceDate\", \"WorkOrderItemSummary\", \"WorkOrderItemTaskWorkOrderItemTaskCompletionType\" ]);\n\n\n \n    return ayData;\n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\r\n\r\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\r\n    if(a == b) // Or === depending on your needs\r\n        return opts.fn(this);\r\n    else\r\n        return opts.inverse(this);\r\n});","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Work Order Scheduled Users.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Work Order Scheduled Users.ayrt
index 97eb0471..cb9dbbe5 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Work Order Scheduled Users.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Work Order Scheduled Users.ayrt	
@@ -1 +1 @@
-{"Name":"Work Order Scheduled Users","Active":true,"Notes":"","Roles":50538,"AType":41,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'WorkOrderItemScheduledUserList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n          <th colspan=\"2\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUsers'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each ScheduledUsers}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{../../CustomerViz}}</td>\n          <td colspan=\"2\" style=\"background-color:{{../WorkOrderItemStatusColorViz}}\" >{{../WorkOrderItemStatusNameViz}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n          <td colspan=\"2\">{{UserViz}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"1\">{{EstimatedQuantity}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemScheduledUsers\", \"WorkOrderItemScheduledUserList\", \"WorkOrder\", \"Customer\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserEstimatedQuantity\" ]);\n\n \n    return ayData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\r\n//https://handlebarsjs.com/guide/#custom-helpers\r\n","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Work Order Scheduled Users","Active":true,"Notes":"","Roles":50538,"AType":41,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n    <div class=\"reporttitle\">\n      <p>{{ayT 'WorkOrderItemScheduledUserList'}} List</p>\n    </div>\n\n    <table>\n      \n      <thead>\n        <tr>\n          <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n          <th colspan=\"2\">{{ayT 'Customer'}}</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemSummary'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUsers'}}</th>     \n          <th colspan=\"2\">{{ayT 'WorkOrderItemScheduledUserStartDate'}}</th>\n          <th colspan=\"1\">{{ayT 'WorkOrderItemScheduledUserEstimatedQuantity'}}</th>\n        </tr>\n      </thead>\n\n      <tbody>\n        {{#each ayReportData}}\n        {{#each Items}}\n         {{#each ScheduledUsers}}\n        <tr>\n          <td colspan=\"1\">{{../../Serial}}</td>\n          <td colspan=\"2\">{{../../CustomerViz}}</td>\n          <td colspan=\"2\" style=\"background-color:{{../WorkOrderItemStatusColorViz}}\" >{{../WorkOrderItemStatusNameViz}}</td>\n          <td colspan=\"4\">{{../Notes}}</td>\n          <td colspan=\"2\">{{UserViz}}</td>\n          <td colspan=\"2\">{{ayDateTime StartDate}}</td>\n          <td colspan=\"1\">{{EstimatedQuantity}}</td>\n          \n        </tr>\n        {{/each}}\n        {{/each}}\n        {{/each}}\n      </tbody>\n\n      <tfoot>\n      </tfoot>\n\n    </table>\n\n\n  </div>\n</body>\n\n</html>","Style":"body {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed;\r\n    }\r\n\r\nth {\r\n  height: 20px;\r\n  font-size: 10pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 8pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"       \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\nasync function ayPrepareData(ayData) {   \n\n    await ayGetTranslations([ \"WorkOrderItemScheduledUsers\", \"WorkOrderItemScheduledUserList\", \"WorkOrder\", \"Customer\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderItemScheduledUserStartDate\", \"WorkOrderItemScheduledUserEstimatedQuantity\" ]);\n\n \n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":0,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Work order Part Requests.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Work order Part Requests.ayrt
index c15569b7..c9b19e9a 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Work order Part Requests.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Work order Part Requests.ayrt	
@@ -1 +1 @@
-{"Name":"Work order Part Requests","Active":true,"Notes":"","Roles":124927,"AType":40,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'WorkOrderItemPartRequests'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'QuantityRequired'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'WorkOrderItemPartPartWarehouseID'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderExpectedReceiveDate'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\t\t\t\t\n\t\t\t\t{{#each Items}}\n\t\t\t\t{{#each PartRequests}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">{{../../Serial}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartNameViz}} {{PartDescriptionViz}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{PartWarehouseViz}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayDate RequestDate}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{PurchaseOrderItemId}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayDate PurchaseOrderDateViz}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayDate PurchaseOrderExpectedDateViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t{{/each}}\n\t\t\t\t{{/each}}\n\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    await ayGetTranslations([ \"WorkOrder\", \"WorkOrderItemPartRequests\", \"PartWholesalerID\", \"Part\", \"QuantityRequired\", \"WorkOrderItemPartPartWarehouseID\", \"WorkOrderItemRequestDate\", \"PurchaseOrderPONumber\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderItemUIOrderedFrom\", \"PurchaseOrderExpectedReceiveDate\", \"PartList\" ]);\n\n     \n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Work order Part Requests","Active":true,"Notes":"","Roles":116095,"AType":40,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'WorkOrderItemPartRequests'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'QuantityRequired'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'WorkOrderItemPartPartWarehouseID'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'WorkOrderItemRequestDate'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderPONumber'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderOrderedDate'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PurchaseOrderExpectedReceiveDate'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\t\t\t\t\n\t\t\t\t{{#each Items}}\n\t\t\t\t{{#each PartRequests}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">{{../../Serial}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartNameViz}} {{PartDescriptionViz}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n\t\t\t\t\t<td colspan=\"3\">{{PartWarehouseViz}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayDate RequestDate}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{PurchaseOrderItemId}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayDate PurchaseOrderDateViz}}</td>\n\t\t\t\t\t<td colspan=\"2\" class=\"centerlean\">{{ayDate PurchaseOrderExpectedDateViz}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t{{/each}}\n\t\t\t\t{{/each}}\n\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n\n</body>\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  /* border-bottom: solid 1pt #9e9e9e; */\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n    await ayGetTranslations([ \"WorkOrder\", \"WorkOrderItemPartRequests\", \"PartWholesalerID\", \"Part\", \"QuantityRequired\", \"WorkOrderItemPartPartWarehouseID\", \"WorkOrderItemRequestDate\", \"PurchaseOrderPONumber\", \"PurchaseOrderOrderedDate\", \"PurchaseOrderItemUIOrderedFrom\", \"PurchaseOrderExpectedReceiveDate\", \"PartList\" ]);\n\n     \n    //return the data into the pipeline to send to the report template\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/Workorder Units grouped by Customer.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/Workorder Units grouped by Customer.ayrt
index 4ffb83c4..3f9b1624 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/Workorder Units grouped by Customer.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/Workorder Units grouped by Customer.ayrt	
@@ -1 +1 @@
-{"Name":"Workorder Units grouped by Customer","Active":true,"Notes":"","Roles":50538,"AType":44,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemUnitList'}} grouped by {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\" class=\"leftlean\" >{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemUnit'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"10\">{{group}}</td>\n            </tr>\n           {{#each items}}\n               {{#each Items}}\n                     {{#each Units}}\n            <tr>               \n               <td  colspan=\"2\">&nbsp;</td>\n               <td  colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td> <!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"1\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td><!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"2\" >{{UnitViz}} - {{UnitModelNameViz}}</td>\n               <td  colspan=\"1\"  style=\"background-color:{{../WorkOrderItemStatusColorViz}}\" >{{../WorkOrderItemStatusNameViz}}</td><!--note the  ../ to go up level to get this data -->\n               <td  colspan=\"3\" >{{../Notes}}</td><!--note the  ../ to go up level to get this data -->        \n          </tr>\n                     {{/each}}\n               {{/each}}\n          {{/each}}\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>     \n   </div>\n\n   <!-- uncomment to see the raw data returned from the custom Prepare \n<div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> \n-->\n\n</body>\n</html>","Style":".minimum {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitList\", \"WorkOrderStatus\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderSummary\" ]);\n\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"Workorder Units grouped by Customer","Active":true,"Notes":"","Roles":50538,"AType":44,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n      <div class=\"reporttitle\">\n\t\t\t<p>{{ayT 'WorkOrder'}} {{ayT 'WorkOrderItemUnitList'}} grouped by {{ayT 'Customer'}}</p>\n\t\t</div>\n      <table>\n         <thead>\n            <tr>\n               <th colspan=\"2\" class=\"leftlean\" >{{ayT 'Customer'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderItemUnit'}}</th>\n               <th colspan=\"1\">{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n               <th colspan=\"3\">{{ayT 'WorkOrderItemSummary'}}</th>\n            </tr>\n         </thead>\n         <tbody>\n            {{#each ayReportData}}\n            <tr>\n               <td colspan=\"10\">{{group}}</td>\n            </tr>\n           {{#each items}}\n               {{#each Items}}\n                     {{#each Units}}\n            <tr>               \n               <td  colspan=\"2\">&nbsp;</td>\n               <td  colspan=\"1\" class=\"centerlean\">{{../../Serial}}</td> <!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"1\" class=\"centerlean\">{{ayDate ../../ServiceDate}}</td><!--note the two ../ to go up levels to get this data -->\n               <td  colspan=\"2\" >{{UnitViz}} - {{UnitModelNameViz}}</td>\n               <td  colspan=\"1\"  style=\"background-color:{{../WorkOrderItemStatusColorViz}}\" >{{../WorkOrderItemStatusNameViz}}</td><!--note the  ../ to go up level to get this data -->\n               <td  colspan=\"3\" >{{../Notes}}</td><!--note the  ../ to go up level to get this data -->        \n          </tr>\n                     {{/each}}\n               {{/each}}\n          {{/each}}\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n\n            <tr>\n               <td colspan=\"10\">&nbsp;</td>\n            </tr>\n            {{/each}}\n         </tbody>\n      </table>     \n   </div>\n\n   <!-- uncomment to see the raw data returned from the custom Prepare \n<div>\n   <p>{{ayJSON ayReportData}} </p>\n</div> \n-->\n\n</body>\n</html>","Style":".minimum {\n  font-size: 6pt;\n}\n\ntfoot {\n  border-top: 2px solid #9e9e9e;\n  font-size: 7pt;\n  text-align: center;\n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 7pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\treportData.ayReportData = ayGroupByKey(reportData.ayReportData, 'CustomerViz')\n\t\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitList\", \"WorkOrderStatus\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemSummary\", \"WorkOrderSummary\" ]);\n\n\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_PO custom Helper #if_eq if equal to.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_PO custom Helper #if_eq if equal to.ayrt
index f6d16ab6..d2d8f541 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_PO custom Helper #if_eq if equal to.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_PO custom Helper #if_eq if equal to.ayrt	
@@ -1 +1 @@
-{"Name":"z_PO custom Helper #if_eq if equal to","Active":true,"Notes":"example custom Helper if_eq to compare ordered to received, if equals will show in greenfont. if NOT equal, shows in redfont\nexample use of HTML if else /if - if serials present then show, else show preset text","Roles":50538,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t\n\t<table>\n        \n        <thead>\n            <tr>\n                <th>{{ayT 'PurchaseOrderPONumber'}}</th>\n                <th>{{ayT 'Part'}}</th>\n                <th>{{ayT 'PurchaseOrderItemQuantityOrdered'}}</th>\n                <th>{{ayT 'PurchaseOrderItemQuantityReceived'}}</th>\n                <th>{{ayT 'PurchaseOrderItemSerialNumbers'}}</th>\n            </tr>\n        </thead>\n        {{#each ayReportData}}\n        <tbody>    \n            {{#each Items}}        \n                <tr> \n                    <td>{{../Serial}}</td> <!-- reference the 'parent' scope by placing  ../ in front of the property name -->\n                    <td>{{PartNameViz}} </td>  <!-- whereas this is within 'Items' so no prefix of ../  -->\n                    <td>{{QuantityOrdered}}</td>\n                    <!--note the additional Helper created #if_eq with which to do a direct comparison -->\n                    <!-- if_eq else statements below basically does: if received equals ordered display in green, if not equal, displays in red -->\n                    {{#if_eq QuantityOrdered QuantityReceived}}<td class=\"fontgreen\">{{QuantityReceived}} (same as quantity ordered)</td> {{else}}<td class=\"fontred\">{{QuantityReceived}} (not the same as ordered)</td>{{/if_eq}}\n\t\t\t\t\t\n                    <!-- if else statements below basically does: if poitem has any serial numbers display, else if no serial display that preset text in red -->\n                    {{#if Serials}}<td>{{Serials}}</td>{{else}}<td class=\"fontblue\">no serials documented</td>{{/if}}\n                </tr>\n            {{/each}}\n            <tr>\n                <td colspan=\"5\">&nbsp;</td><!-- this causes an empty row to be displayed after every PO Item-->\n            </tr>\n        </tbody>\n        {{/each}}\n    </table>\n\t\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([ \"Part\", \"PurchaseOrderItemQuantityOrdered\", \"PurchaseOrderPONumber\", \"PurchaseOrderItemSerialNumbers\", \"PurchaseOrderItemQuantityReceived\" ]);\n\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})\n\n//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});\n","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_PO custom Helper #if_eq if equal to","Active":true,"Notes":"example custom Helper if_eq to compare ordered to received, if equals will show in greenfont. if NOT equal, shows in redfont\nexample use of HTML if else /if - if serials present then show, else show preset text","Roles":50538,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\n\t\n\t<table>\n        \n        <thead>\n            <tr>\n                <th>{{ayT 'PurchaseOrderPONumber'}}</th>\n                <th>{{ayT 'Part'}}</th>\n                <th>{{ayT 'PurchaseOrderItemQuantityOrdered'}}</th>\n                <th>{{ayT 'PurchaseOrderItemQuantityReceived'}}</th>\n                <th>{{ayT 'PurchaseOrderItemSerialNumbers'}}</th>\n            </tr>\n        </thead>\n        {{#each ayReportData}}\n        <tbody>    \n            {{#each Items}}        \n                <tr> \n                    <td>{{../Serial}}</td> <!-- reference the 'parent' scope by placing  ../ in front of the property name -->\n                    <td>{{PartNameViz}} </td>  <!-- whereas this is within 'Items' so no prefix of ../  -->\n                    <td>{{QuantityOrdered}}</td>\n                    <!--note the additional Helper created #if_eq with which to do a direct comparison -->\n                    <!-- if_eq else statements below basically does: if received equals ordered display in green, if not equal, displays in red -->\n                    {{#if_eq QuantityOrdered QuantityReceived}}<td class=\"fontgreen\">{{QuantityReceived}} (same as quantity ordered)</td> {{else}}<td class=\"fontred\">{{QuantityReceived}} (not the same as ordered)</td>{{/if_eq}}\n\t\t\t\t\t\n                    <!-- if else statements below basically does: if poitem has any serial numbers display, else if no serial display that preset text in red -->\n                    {{#if Serials}}<td>{{Serials}}</td>{{else}}<td class=\"fontblue\">no serials documented</td>{{/if}}\n                </tr>\n            {{/each}}\n            <tr>\n                <td colspan=\"5\">&nbsp;</td><!-- this causes an empty row to be displayed after every PO Item-->\n            </tr>\n        </tbody>\n        {{/each}}\n    </table>\n\t\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([ \"Part\", \"PurchaseOrderItemQuantityOrdered\", \"PurchaseOrderPONumber\", \"PurchaseOrderItemSerialNumbers\", \"PurchaseOrderItemQuantityReceived\" ]);\n\n\n    return reportData;\n}","JsHelpers":"//custom helper so can do a direct comparison - i.e. if value equals xxxx, then show, else show yyyyy\n//note that this HAS to be added here in Helpers, is NOT built in\nHandlebars.registerHelper('if_eq', function(a, b, opts) {\n    if(a == b) // Or === depending on your needs\n        return opts.fn(this);\n    else\n        return opts.inverse(this);\n});\n","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed PO.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed PO.ayrt
index 4a96e535..62f2858c 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed PO.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed PO.ayrt	
@@ -1 +1 @@
-{"Name":"z_Wiki displayed PO","Active":true,"Notes":"Example of how to display the Wiki that is associated with POs","Roles":124927,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\t<table>\n\n\t<thead>\n\t\t<tr>\n\t\t\t<th colspan=\"1\">column header 1</th>\n\t\t\t<th colspan=\"1\">column header 2</th>\n\t\t</tr>\n\t</thead>\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each PO) in your Sample Data -->\n\t<!-- if want the header repeated for every PO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td colspan=\"1\">{{ayT 'PurchaseOrder'}} {{Serial}}</td>\n\t\t\t\t<td colspan=\"1\">{{ayWiki Wiki}}</td> <!-- to display the Wiki, prefix ayWiki to the key encompass both in the mustache -->\n\t\t\t</tr>\n\t</tbody><!-- this indicates end of your table body section -->\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each PO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td colspan=\"2\">and some footer text</td><!-- this inline colspan spans multiple columns -->\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: pink;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 13pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"PurchaseOrder\" ]);\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_Wiki displayed PO","Active":true,"Notes":"Example of how to display the Wiki that is associated with POs","Roles":50538,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\t<table>\n\n\t<thead>\n\t\t<tr>\n\t\t\t<th colspan=\"1\">column header 1</th>\n\t\t\t<th colspan=\"1\">column header 2</th>\n\t\t</tr>\n\t</thead>\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each PO) in your Sample Data -->\n\t<!-- if want the header repeated for every PO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td colspan=\"1\">{{ayT 'PurchaseOrder'}} {{Serial}}</td>\n\t\t\t\t<td colspan=\"1\">{{ayWiki Wiki}}</td> <!-- to display the Wiki, prefix ayWiki to the key encompass both in the mustache -->\n\t\t\t</tr>\n\t</tbody><!-- this indicates end of your table body section -->\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each PO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td colspan=\"2\">and some footer text</td><!-- this inline colspan spans multiple columns -->\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: pink;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 13pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"PurchaseOrder\" ]);\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed.ayrt
index bf277662..db59c990 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_Wiki displayed.ayrt	
@@ -1 +1 @@
-{"Name":"z_Wiki displayed","Active":true,"Notes":"","Roles":124927,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\t<table><!-- beginning of your table-->\t\n\n\t<thead>\n\t\t<tr>\n\t\t\t<th colspan=\"1\">column header text repeats every page</th>\n\t\t\t<th colspan=\"1\">column header 2</th>\n\t\t</tr>\n\t</thead>\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each PO) in your Sample Data -->\n\t<!-- if want the header repeated for every PO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td colspan=\"1\">{{ayT 'WorkOrder'}} {{Serial}}</td>\n\t\t\t\t<td colspan=\"1\">{{ayWiki Wiki}}</td> <!-- to display the Wiki, prefix ayWiki to the key encompass both in the mustache -->\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t</tr>\n\t</tbody><!-- this indicates end of your table body section -->\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each PO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td colspan=\"2\">and some footer text that will be repeated every page</td><!-- this inline colspan spans multiple columns -->\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: lightsteelblue;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 13pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(odd) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"WorkOrder\" ]);\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_Wiki displayed","Active":true,"Notes":"","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\t<table><!-- beginning of your table-->\t\n\n\t<thead>\n\t\t<tr>\n\t\t\t<th colspan=\"1\">column header text repeats every page</th>\n\t\t\t<th colspan=\"1\">column header 2</th>\n\t\t</tr>\n\t</thead>\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each PO) in your Sample Data -->\n\t<!-- if want the header repeated for every PO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td colspan=\"1\">{{ayT 'WorkOrder'}} {{Serial}}</td>\n\t\t\t\t<td colspan=\"1\">{{ayWiki Wiki}}</td> <!-- to display the Wiki, prefix ayWiki to the key encompass both in the mustache -->\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t</tr>\n\t</tbody><!-- this indicates end of your table body section -->\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each PO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td colspan=\"2\">and some footer text that will be repeated every page</td><!-- this inline colspan spans multiple columns -->\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: lightsteelblue;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 13pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(odd) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"WorkOrder\" ]);\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by a specific Tag only.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by a specific Tag only.ayrt
index 9c6230d9..01a684b7 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by a specific Tag only.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by a specific Tag only.ayrt	
@@ -1 +1 @@
-{"Name":"z_ayGroupByTag group by a specific Tag only","Active":true,"Notes":"Example custom Prepare that groups by a specific Tag - i.e. black","Roles":49514,"AType":20,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Parts by Tag</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" class=\"leftlean\">{{ayT 'Tag'}}</th>\n\t\t\t\t\t<th colspan=\"10\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PartManufacturerID'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartCost'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"10\" class=\"centerlean\">{{Name}}</td>\n\t\t\t\t\t<td colspan=\"6\">{{ManufacturerViz}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Cost}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Retail}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\"># of parts for {{ayT 'Tag'}} {{group}}:&emsp;{{count}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\n\t<!-- uncomment this to see printout of data returned from the custom Prepare\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"24\">This is a printout of the data returned from the custom Prepare that this report now uses rather than the \"Sample Data\".</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"24\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n    </table>  -->\n\t\n</body>\n\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n     await ayGetTranslations([\"Part\", \"PartManufacturerID\", \"PartRetail\", \"PartCost\", \"PartSerialNumbersAvailable\", \"Tag\" ]);\n\n\n    //Example below is to group by each and every Tag\n    //ayData.ayReportData = ayGroupByTag(ayData.ayReportData);\n\n    //Example below of how to group by specific text of tags - below example only if contains Tag of  'black'\n    ayData.ayReportData = ayGroupByTag(ayData.ayReportData, 'black');\n\n    return ayData;\n}\n\nfunction ayGroupByTag(reportDataArray, tagContains) {\n    //array to hold grouped data\n    const ret = [];\n    const containsQuery = tagContains != null && tagContains != '';\n\n    //iterate through the raw reprot data    \n    for (let i = 0; i < reportDataArray.length; i++) {\n        //get a reference to each object to save typing\n        let o = reportDataArray[i];\n        //don't bother with any that don't have tags at all\n        if (o.Tags && o.Tags.length) {\n            //loop through all tags for this record\n            o.Tags.forEach(t => {//t=each tag\n                //if not a contains query just process it, if it is a contains query then only process if tag contains tagContains\n                if (!containsQuery || t.includes(tagContains)) {\n                    let groupObject = ret.find(z => z.group == t);\n                    if (groupObject != undefined) {\n                        //there is already a matching group in the return array so just push this raw report data record into it\n                        groupObject.items.push(o);\n                        //update the count for this group's items\n                        groupObject.count++;\n                    } else {\n                        //No group yet, so start a new one in the ret array and push this raw report data record\n                        ret.push({ group: t, items: [o], count: 1 });\n                    }\n                }\n            })\n        }\n    }\n\n    //Sort based on the group name in a locale aware manner\n    ret.sort(function (a, b) {\n        return a.group.localeCompare(b.group);\n    });\n    return ret;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_ayGroupByTag group by a specific Tag only","Active":true,"Notes":"Example custom Prepare that groups by a specific Tag such as black","Roles":49514,"AType":20,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Parts by Tag</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" class=\"leftlean\">{{ayT 'Tag'}}</th>\n\t\t\t\t\t<th colspan=\"10\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PartManufacturerID'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartCost'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"10\" class=\"centerlean\">{{Name}}</td>\n\t\t\t\t\t<td colspan=\"6\">{{ManufacturerViz}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Cost}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Retail}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">{{ayT 'PartList'}} with {{ayT 'Tag'}} {{group}}:&emsp;{{count}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\n\t<!-- uncomment this to see printout of data returned from the custom Prepare\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"24\">This is a printout of the data returned from the custom Prepare that this report now uses rather than the \"Sample Data\".</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"24\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n    </table>  -->\n\t\n</body>\n\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n     await ayGetTranslations([\"Part\", \"PartList\", \"PartManufacturerID\", \"PartRetail\", \"PartCost\", \"PartSerialNumbersAvailable\", \"Tag\" ]);\n\n\n    //Example below is to group by each and every Tag\n    //ayData.ayReportData = ayGroupByTag(ayData.ayReportData);\n\n    //Example below of how to group by specific text of tags - below example only if contains Tag of  'black'\n    ayData.ayReportData = ayGroupByTag(ayData.ayReportData, 'black');\n\n    return ayData;\n}\n\nfunction ayGroupByTag(reportDataArray, tagContains) {\n    //array to hold grouped data\n    const ret = [];\n    const containsQuery = tagContains != null && tagContains != '';\n\n    //iterate through the raw reprot data    \n    for (let i = 0; i < reportDataArray.length; i++) {\n        //get a reference to each object to save typing\n        let o = reportDataArray[i];\n        //don't bother with any that don't have tags at all\n        if (o.Tags && o.Tags.length) {\n            //loop through all tags for this record\n            o.Tags.forEach(t => {//t=each tag\n                //if not a contains query just process it, if it is a contains query then only process if tag contains tagContains\n                if (!containsQuery || t.includes(tagContains)) {\n                    let groupObject = ret.find(z => z.group == t);\n                    if (groupObject != undefined) {\n                        //there is already a matching group in the return array so just push this raw report data record into it\n                        groupObject.items.push(o);\n                        //update the count for this group's items\n                        groupObject.count++;\n                    } else {\n                        //No group yet, so start a new one in the ret array and push this raw report data record\n                        ret.push({ group: t, items: [o], count: 1 });\n                    }\n                }\n            })\n        }\n    }\n\n    //Sort based on the group name in a locale aware manner\n    ret.sort(function (a, b) {\n        return a.group.localeCompare(b.group);\n    });\n    return ret;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by each Tag.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by each Tag.ayrt
index 4715ab9e..a57cb4a8 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by each Tag.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group by each Tag.ayrt	
@@ -1 +1 @@
-{"Name":"z_ayGroupByTag group by each Tag","Active":true,"Notes":"Example custom Prepare that groups by the Tags - nothing shows if no tag(s) match","Roles":49514,"AType":20,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Parts by Tag</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" class=\"leftlean\">{{ayT 'Tag'}}</th>\n\t\t\t\t\t<th colspan=\"10\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PartManufacturerID'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartCost'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each MUST be placed BEFORE the tr /tr -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"10\" class=\"centerlean\">{{Name}}</td>\n\t\t\t\t\t<td colspan=\"6\">{{ManufacturerViz}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Cost}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Retail}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\"># of parts for {{ayT 'Tag'}} {{group}}:&emsp;{{count}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\n\t<!-- uncomment this to see printout of data returned from the custom Prepare\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"24\">This is a printout of the data returned from the custom Prepare that this report now uses rather than the \"Sample Data\".</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"24\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n    </table>  -->\n\n\n\t</div>\n</body>\n\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; /* the # of columns set in the first row of the thead will be fixed and applied throughout table and rows */\r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n     await ayGetTranslations([\"Part\", \"PartManufacturerID\", \"PartRetail\", \"PartCost\", \"PartSerialNumbersAvailable\", \"Tag\" ]);\n\n\n    //Group by all tags no filter using the function declared outside\n   ayData.ayReportData = ayGroupByTag(ayData.ayReportData);\n\n    //Example below of how to group by specific text of tags - below example only if contains the  'zone' - comment out above, and uncomment below\n    //ayData.ayReportData = ayGroupByTag(ayData.ayReportData, 'zone');\n\n    return ayData;\n}\n\nfunction ayGroupByTag(reportDataArray, tagContains) {\n    //array to hold grouped data\n    const ret = [];\n    const containsQuery = tagContains != null && tagContains != '';\n\n    //iterate through the raw reprot data    \n    for (let i = 0; i < reportDataArray.length; i++) {\n        //get a reference to each object to save typing\n        let o = reportDataArray[i];\n        //don't bother with any that don't have tags at all\n        if (o.Tags && o.Tags.length) {\n            //loop through all tags for this record\n            o.Tags.forEach(t => {//t=each tag\n                //if not a contains query just process it, if it is a contains query then only process if tag contains tagContains\n                if (!containsQuery || t.includes(tagContains)) {\n                    let groupObject = ret.find(z => z.group == t);\n                    if (groupObject != undefined) {\n                        //there is already a matching group in the return array so just push this raw report data record into it\n                        groupObject.items.push(o);\n                        //update the count for this group's items\n                        groupObject.count++;\n                    } else {\n                        //No group yet, so start a new one in the ret array and push this raw report data record\n                        ret.push({ group: t, items: [o], count: 1 });\n                    }\n                }\n            })\n        }\n    }\n\n    //Sort based on the group name in a locale aware manner\n    ret.sort(function (a, b) {\n        return a.group.localeCompare(b.group);\n    });\n    return ret;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_ayGroupByTag group by each Tag","Active":true,"Notes":"Example custom Prepare that groups by the Tags - nothing shows if no tag(s) match","Roles":49514,"AType":20,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Parts by Tag</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"4\" class=\"leftlean\">{{ayT 'Tag'}}</th>\n\t\t\t\t\t<th colspan=\"10\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"4\">{{ayT 'PartManufacturerID'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartCost'}}</th>\n\t\t\t\t\t<th colspan=\"3\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}<!--  the #each  for the Sample Data MUST encompass the section  where its gonna show - in this case the tbody, so needs to be placed within  -->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"leftlean\">{{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}<!--  to get alternating coloured rows when one PO per line, need CSS statements PLUS this # each items MUST be placed BEFORE the tr /tr to iteriate through the custom Prepare items-->\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"2\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"10\" class=\"centerlean\">{{Name}}</td>\n\t\t\t\t\t<td colspan=\"6\">{{ManufacturerViz}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Cost}}</td>\n\t\t\t\t\t<td colspan=\"3\" class=\"centerlean\">{{ayCurrency Retail}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">{{count}} {{ayT 'PartList'}} with {{ayT 'Tag'}} {{group}}:&emsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"rightlean\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\n\t<!-- uncomment this to see printout of data returned from the custom Prepare\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"24\">This is a printout of the data returned from the custom Prepare that this report now uses rather than the \"Sample Data\".</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"24\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n    </table>  -->\n\n\n\t</div>\n</body>\n\n</html>","Style":".singlePage\r\n{\r\npage-break-after: always;\r\n\r\n}\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  color: #9e9e9e;\r\n} \r\n\r\ntable { \r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  width: 100%;\r\n  table-layout: fixed; \r\n    }\r\n\r\nth {\r\n  border-bottom: solid 1pt #9e9e9e;\r\n  height: 50px;\r\n  font-size: 11pt; \r\n  color: #9e9e9e;\r\n}\r\n\r\ntbody td {\r\n  padding: 10px;\r\n  word-wrap: break-word;\r\n  font-size: 9pt;\r\n}\r\n\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n  font-size: 16pt;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n","JsPrerender":"async function ayPrepareData(ayData) {\n\n     await ayGetTranslations([\"Part\", \"PartList\", \"PartManufacturerID\", \"PartRetail\", \"PartCost\", \"PartSerialNumbersAvailable\", \"Tag\" ]);\n\n\n    //Group by all tags no filter using the function declared outside\n   ayData.ayReportData = ayGroupByTag(ayData.ayReportData, '');\n\n    //Example below of how to group by specific text of tags - below example only if contains the  'zone' - comment out above, and uncomment below\n    //ayData.ayReportData = ayGroupByTag(ayData.ayReportData, 'zone');\n\n    return ayData;\n}\n\nfunction ayGroupByTag(reportDataArray, tagContains) {\n    //array to hold grouped data\n    const ret = [];\n    const containsQuery = tagContains != null && tagContains != '';\n\n    //iterate through the raw reprot data    \n    for (let i = 0; i < reportDataArray.length; i++) {\n        //get a reference to each object to save typing\n        let o = reportDataArray[i];\n        //don't bother with any that don't have tags at all\n        if (o.Tags && o.Tags.length) {\n            //loop through all tags for this record\n            o.Tags.forEach(t => {//t=each tag\n                //if not a contains query just process it, if it is a contains query then only process if tag contains tagContains\n                if (!containsQuery || t.includes(tagContains)) {\n                    let groupObject = ret.find(z => z.group == t);\n                    if (groupObject != undefined) {\n                        //there is already a matching group in the return array so just push this raw report data record into it\n                        groupObject.items.push(o);\n                        //update the count for this group's items\n                        groupObject.count++;\n                    } else {\n                        //No group yet, so start a new one in the ret array and push this raw report data record\n                        ret.push({ group: t, items: [o], count: 1 });\n                    }\n                }\n            })\n        }\n    }\n\n    //Sort based on the group name in a locale aware manner\n    ret.sort(function (a, b) {\n        return a.group.localeCompare(b.group);\n    });\n    return ret;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"20mm","MarginOptionsRight":"20mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group inventory by Tag.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group inventory by Tag.ayrt
index d64467ef..2d83e44a 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group inventory by Tag.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_ayGroupByTag group inventory by Tag.ayrt	
@@ -1 +1 @@
-{"Name":"z_ayGroupByTag group inventory by Tag","Active":true,"Notes":"Example custom Prepare that groups by the Tags - nothing shows if no tag(s) match","Roles":49258,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr class=\"reporttitle\" >\n\t\t\t\t\t<td colspan=\"24\">{{ayServerMetaData.CompanyName}} {{ayT 'PartInventoryList'}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'PartWarehouse'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'Tags'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartByWarehouseInventoryQuantityOnHand'}}</th>\n\t\t\t\t\t<th colspan=\"2\">Actual Count</th>\n\t\t\t\t\t<th colspan=\"2\">Difference + / (-)</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"fontgreen\"># of {{ayT 'PartList'}} with {{ayT 'Tag'}} {{group}}:&emsp;{{count}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"6\">{{PartName}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartWarehouseName}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartTags}} </td>\n\t\t\t\t\t<td colspan=\"2\">{{ayCurrency PartRetail}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{OnHandQty}}</td>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\n\t\t\t<tfoot>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"3\">Count By:</td>\n\t\t\t\t\t<td colspan=\"9\">__________________________________________</td>\n\t\t\t\t\t<td colspan=\"3\">Count Date:</td>\n\t\t\t\t\t<td colspan=\"9\">__________________________________________</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"3\">Signature:</td>\n\t\t\t\t\t<td colspan=\"9\">__________________________________________</td>\n\t\t\t\t\t<td colspan=\"12\"></td>\n\t\t\t\t</tr>\n\t\t\t</tfoot>\n\t\t</table>\n\n\n<!-- uncomment below if you want to see output of all data returned from the custom Prepare\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"5\">This is a printout of the data returned from the custom Prepare that this report now uses. Compare against the data that shows in the \"Sample Data\" when editing this report template.</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"5\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n        </table>\n-->\n\n\n\t</div>\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n  font-size: 9pt;\n    }\n\nth {\n  height: 20px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  \n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}","JsPrerender":"async function ayPrepareData(ayData) {\n\n    await ayGetTranslations([\"Part\", \"PartList\", \"PartInventoryList\", \"PartRetail\", \"PartByWarehouseInventoryQuantityOnHand\", \"PartSerialNumbersAvailable\", \"Tag\", \"Tags\", \"PartWarehouse\" ]);\n\n    //Group by all tags no filter\n    ayData.ayReportData = ayGroupByTag(ayData.ayReportData);\n\n    //an example of ayGroupByTag to return records that contain 'zone' as a tag - comment out any others so only one ayGroupByTag \n    //ayData.ayReportData = ayGroupByTag(ayData.ayReportData, 'zone');\n\n    return ayData;\n}\n\nfunction ayGroupByTag(reportDataArray, tagContains) {\n    //array to hold grouped data\n    const ret = [];\n    const containsQuery = tagContains != null && tagContains != '';\n\n//NOTE that tags are referred to as PartTags so this custom Prepare must reference PartTags, not Tags\n\n    //iterate through the raw reprot data    \n    for (let i = 0; i < reportDataArray.length; i++) {\n        //get a reference to each object to save typing\n        let o = reportDataArray[i];\n        //don't bother with any that don't have tags at all\n        if (o.PartTags && o.PartTags.length) {\n            //loop through all tags for this record\n            o.PartTags.forEach(t => {//t=each tag\n                //if not a contains query just process it, if it is a contains query then only process if tag contains tagContains\n                if (!containsQuery || t.includes(tagContains)) {\n                    let groupObject = ret.find(z => z.group == t);\n                    if (groupObject != undefined) {\n                        //there is already a matching group in the return array so just push this raw report data record into it\n                        groupObject.items.push(o);\n                        //update the count for this group's items\n                        groupObject.count++;\n                    } else {\n                        //No group yet, so start a new one in the ret array and push this raw report data record\n                        ret.push({ group: t, items: [o], count: 1 });\n                    }\n                }\n            })\n        }\n    }\n\n    //Sort based on the group name in a locale aware manner\n    ret.sort(function (a, b) {\n        return a.group.localeCompare(b.group);\n    });\n    return ret;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_ayGroupByTag group inventory by Tag","Active":true,"Notes":"Example custom Prepare that groups by the Tags - nothing shows if no tag(s) match","Roles":49258,"AType":90,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr class=\"reporttitle\" >\n\t\t\t\t\t<td colspan=\"24\">{{ayServerMetaData.CompanyName}} {{ayT 'PartInventoryList'}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t\n\t\t\t\t\t<th colspan=\"6\">{{ayT 'Part'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'PartWarehouse'}}</th>\n\t\t\t\t\t<th colspan=\"5\">{{ayT 'Tags'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartRetail'}}</th>\n\t\t\t\t\t<th colspan=\"2\">{{ayT 'PartByWarehouseInventoryQuantityOnHand'}}</th>\n\t\t\t\t\t<th colspan=\"2\">Actual Count</th>\n\t\t\t\t\t<th colspan=\"2\">Difference + / (-)</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\" class=\"fontgreen\">{{count}} {{ayT 'PartList'}} with {{ayT 'Tag'}} {{group}}</td>\n\t\t\t\t</tr>\n\t\t\t\t{{#each items}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"6\">{{PartName}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartWarehouseName}}</td>\n\t\t\t\t\t<td colspan=\"5\">{{PartTags}} </td>\n\t\t\t\t\t<td colspan=\"2\">{{ayCurrency PartRetail}}</td>\n\t\t\t\t\t<td colspan=\"2\">{{OnHandQty}}</td>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t\t<td colspan=\"2\"></td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\n\t\t\t<tfoot>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"3\">Count By:</td>\n\t\t\t\t\t<td colspan=\"9\">__________________________________________</td>\n\t\t\t\t\t<td colspan=\"3\">Count Date:</td>\n\t\t\t\t\t<td colspan=\"9\">__________________________________________</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"3\">Signature:</td>\n\t\t\t\t\t<td colspan=\"9\">__________________________________________</td>\n\t\t\t\t\t<td colspan=\"12\"></td>\n\t\t\t\t</tr>\n\t\t\t</tfoot>\n\t\t</table>\n\n\n<!-- uncomment below if you want to see output of all data returned from the custom Prepare\n    <table>\n            {{#each ayReportData}}\n          <tbody>\n                <tr>\n                  <td colspan=\"5\">This is a printout of the data returned from the custom Prepare that this report now uses. Compare against the data that shows in the \"Sample Data\" when editing this report template.</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"5\" class=\"leftlean\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n        </table>\n-->\n\n\n\t</div>\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n  font-size: 9pt;\n    }\n\nth {\n  height: 20px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  \n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}","JsPrerender":"async function ayPrepareData(ayData) {\n\n    await ayGetTranslations([\"Part\", \"PartList\", \"PartInventoryList\", \"PartRetail\", \"PartByWarehouseInventoryQuantityOnHand\", \"PartSerialNumbersAvailable\", \"Tag\", \"Tags\", \"PartWarehouse\" ]);\n\n    //Group by all tags no filter\n    ayData.ayReportData = ayGroupByTag(ayData.ayReportData, '');\n\n    //an example of ayGroupByTag to return records that contain 'zone' as a tag - comment out any others so only one ayGroupByTag \n    //ayData.ayReportData = ayGroupByTag(ayData.ayReportData, 'zone');\n\n    return ayData;\n}\n\nfunction ayGroupByTag(reportDataArray, tagContains) {\n    //array to hold grouped data\n    const ret = [];\n    const containsQuery = tagContains != null && tagContains != '';\n\n//NOTE that tags are referred to as PartTags so this custom Prepare must reference PartTags, not Tags\n\n    //iterate through the raw reprot data    \n    for (let i = 0; i < reportDataArray.length; i++) {\n        //get a reference to each object to save typing\n        let o = reportDataArray[i];\n        //don't bother with any that don't have tags at all\n        if (o.PartTags && o.PartTags.length) {\n            //loop through all tags for this record\n            o.PartTags.forEach(t => {//t=each tag\n                //if not a contains query just process it, if it is a contains query then only process if tag contains tagContains\n                if (!containsQuery || t.includes(tagContains)) {\n                    let groupObject = ret.find(z => z.group == t);\n                    if (groupObject != undefined) {\n                        //there is already a matching group in the return array so just push this raw report data record into it\n                        groupObject.items.push(o);\n                        //update the count for this group's items\n                        groupObject.count++;\n                    } else {\n                        //No group yet, so start a new one in the ret array and push this raw report data record\n                        ret.push({ group: t, items: [o], count: 1 });\n                    }\n                }\n            })\n        }\n    }\n\n    //Sort based on the group name in a locale aware manner\n    ret.sort(function (a, b) {\n        return a.group.localeCompare(b.group);\n    });\n    return ret;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_barcode using built in ayBC.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_barcode using built in ayBC.ayrt
index e23fdba3..7cb9e9e0 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_barcode using built in ayBC.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_barcode using built in ayBC.ayrt	
@@ -1 +1 @@
-{"Name":"z_barcode using built in ayBC","Active":true,"Notes":"Example of displaying barcodes \n","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n\n    <h2>Example: Bar code helper </h2>\n    <p>See Report editor help documentation for additional details</p>\n\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table class=\"singlePage\">\n      <!-- the css to start a new page when a new object - i.e.  work order -->\n\n      <tbody>\n        <tr>\n          <td colspan=\"12\">{{ayT \"WorkOrder\" }} {{ayT \"WorkOrderServiceNumber\" }} {{Serial}} as \"CODE-128\" BarCode with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC Serial '{ \"bcid\": \"code128\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"12\">{{ayT \"WorkOrder\" }} {{ayT \"WorkOrderServiceNumber\" }} {{Serial}} as \"QR\" Code with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC Serial '{ \"bcid\": \"qrcode\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"12\">{{ayT \"WorkOrder\" }} {{ayT \"WorkOrderServiceNumber\" }} {{Serial}} as \"QR\" Code with scale 3:</td>\n          <td colspan=\"12\">{{ ayBC Serial '{ \"bcid\": \"qrcode\",\"includetext\":true, \"scale\":3}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"12\">Sample \"UPC-A\" Code using a hard coded number 712345678904 as example:</td>\n          <td colspan=\"12\">{{ ayBC \"712345678904\" '{ \"bcid\": \"upca\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        {{#each Units}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{ayT 'Unit'}} {{UnitViz}} displayed as as \"CODE-128\" BarCode with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC UnitViz '{ \"bcid\": \"code128\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"24\">&nbsp;</th>\n        </tr>\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} displayed as \"CODE-128\" BarCode with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC PartNameViz '{ \"bcid\": \"code128\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        {{/each}}\n\n      </tbody>\n      {{/each}}\n    </table>\n    {{/each}}\n\n  </div>\n\n</body>\n\n</html>","Style":"/* if not using a rule set or specific property it is recommended to comment out or delete fully for report performance*/\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntd {\n  padding: 10px;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([ \"WorkOrder\", \"WorkOrderServiceNumber\",  \"Unit\", \"WorkOrderItemPartPartID\" ]);\n\n\n\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_barcode using built in ayBC","Active":true,"Notes":"Example of displaying barcodes \n","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n\n    <h2>Example: Bar code helper </h2>\n    <p>See Report editor help documentation for additional details</p>\n\n    {{#each ayReportData}}\n    <!-- the #each aspect MUST encompass the section where the class is that forces page break -->\n    <table class=\"singlePage\">\n      <!-- the css to start a new page when a new object - i.e.  work order -->\n\n      <tbody>\n        <tr>\n          <td colspan=\"12\">{{ayT \"WorkOrder\" }} {{ayT \"WorkOrderServiceNumber\" }} {{Serial}} as \"CODE-128\" BarCode with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC Serial '{ \"bcid\": \"code128\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"12\">{{ayT \"WorkOrder\" }} {{ayT \"WorkOrderServiceNumber\" }} {{Serial}} as \"QR\" Code with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC Serial '{ \"bcid\": \"qrcode\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"12\">{{ayT \"WorkOrder\" }} {{ayT \"WorkOrderServiceNumber\" }} {{Serial}} as \"QR\" Code with scale 3:</td>\n          <td colspan=\"12\">{{ ayBC Serial '{ \"bcid\": \"qrcode\",\"includetext\":true, \"scale\":3}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"12\">Sample \"UPC-A\" Code using a hard coded number 712345678904 as example:</td>\n          <td colspan=\"12\">{{ ayBC \"712345678904\" '{ \"bcid\": \"upca\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        {{#each Units}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{ayT 'Unit'}} {{UnitViz}} displayed as as \"CODE-128\" BarCode with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC UnitViz '{ \"bcid\": \"code128\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"24\">&nbsp;</th>\n        </tr>\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} displayed as \"CODE-128\" BarCode with scale 1:</td>\n          <td colspan=\"12\">{{ ayBC PartNameViz '{ \"bcid\": \"code128\",\"includetext\":true, \"scale\":1}' }}</td>\n        </tr>\n        {{/each}}\n\n      </tbody>\n      {{/each}}\n    </table>\n    {{/each}}\n\n  </div>\n\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntd {\n  padding: 10px;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([ \"WorkOrder\", \"WorkOrderServiceNumber\",  \"Unit\", \"WorkOrderItemPartPartID\" ]);\n\n\n\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_company name address logo URL ayServerMetaData.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_company name address logo URL ayServerMetaData.ayrt
index 63d751c6..8e287f80 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_company name address logo URL ayServerMetaData.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_company name address logo URL ayServerMetaData.ayrt	
@@ -1 +1 @@
-{"Name":"z_company name address logo URL ayServerMetaData","Active":true,"Notes":"Examples of displaying ayServerMetaData data such as licensed company name, company logo, company contact information as entered via Global Settings","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays all of your ayServerMetaData:</th>\n               <td colspan=\"5\">{{ayJSON ../ayServerMetaData}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the small company logo IF uploaded via Global Settings:</th>\n               {{#if ../ayServerMetaData.HasSmallLogo}}<th colspan=\"5\">{{ayLogo 'small'}}</th>\n               {{else}}<th colspan=\"5\">No small logo has been uploaded via your Global Settings</th>{{/if}}\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your licensed Company Name as is - with the quotation marks:</th>\n               <td colspan=\"5\">{{ayJSON ../ayServerMetaData.CompanyName}}</td>\n            </tr>\n             <tr>\n               <th colspan=\"5\">Column to the right displays your licensed Company Name:</th>\n               <td colspan=\"5\">{{../ayServerMetaData.CompanyName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your company phone number as entered via Global Settings:</th>\n               {{#if ../ayServerMetaData.CompanyPhone1}}<td colspan=\"5\">{{../ayServerMetaData.CompanyPhone1}}</td>\n               {{else}}<td colspan=\"5\">Your company phone number has NOT been entered via your Global Settings</td>{{/if}}\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your company postal address as entered via Global Settings:</th>\n               {{#if ../ayServerMetaData.HasPostalAddress}}<td colspan=\"5\">{{ ../ayServerMetaData.CompanyPostAddress}} {{ ../ayServerMetaData.CompanyPostCity}}</td>\n               {{else}}<td colspan=\"5\">Your company postal address has NOT been entered via your Global Settings</td>{{/if}}\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">Licensed Company Name</th>\n               <th colspan=\"2\">Company Phone Entered via Global Settings</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>\n               {{else}}<td>no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../ayServerMetaData.CompanyName}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               {{#if ../ayServerMetaData.CompanyPhone1 }}<td colspan=\"2\">{{ ../ayServerMetaData.CompanyPhone1}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               {{else}}<td>no company phone number specified in Global Settings</td>{{/if}}\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":"\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\"  ]);\n\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_company name address logo URL ayServerMetaData","Active":true,"Notes":"Examples of displaying ayServerMetaData data such as licensed company name, company logo, company contact information as entered via Global Settings","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays all of your ayServerMetaData:</th>\n               <td colspan=\"5\">{{ayJSON ../ayServerMetaData}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the small company logo IF uploaded via Global Settings:</th>\n               {{#if ../ayServerMetaData.HasSmallLogo}}<th colspan=\"5\">{{ayLogo 'small'}}</th>\n               {{else}}<th colspan=\"5\">No small logo has been uploaded via your Global Settings</th>{{/if}}\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your licensed Company Name as is - with the quotation marks:</th>\n               <td colspan=\"5\">{{ayJSON ../ayServerMetaData.CompanyName}}</td>\n            </tr>\n             <tr>\n               <th colspan=\"5\">Column to the right displays your licensed Company Name:</th>\n               <td colspan=\"5\">{{../ayServerMetaData.CompanyName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your company phone number as entered via Global Settings:</th>\n               {{#if ../ayServerMetaData.CompanyPhone1}}<td colspan=\"5\">{{../ayServerMetaData.CompanyPhone1}}</td>\n               {{else}}<td colspan=\"5\">Your company phone number has NOT been entered via your Global Settings</td>{{/if}}\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your company postal address as entered via Global Settings:</th>\n               {{#if ../ayServerMetaData.HasPostalAddress}}<td colspan=\"5\">{{ ../ayServerMetaData.CompanyPostAddress}} {{ ../ayServerMetaData.CompanyPostCity}}</td>\n               {{else}}<td colspan=\"5\">Your company postal address has NOT been entered via your Global Settings</td>{{/if}}\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">Licensed Company Name</th>\n               <th colspan=\"2\">Company Phone Entered via Global Settings</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>\n               {{else}}<td colspan=\"2\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../ayServerMetaData.CompanyName}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               {{#if ../ayServerMetaData.CompanyPhone1 }}<td colspan=\"2\">{{ ../ayServerMetaData.CompanyPhone1}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               {{else}}<td colspan=\"2\">no company phone number specified in Global Settings</td>{{/if}}\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":"\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\"  ]);\n\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_custom fields.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_custom fields.ayrt
index fb5f915c..d01b4c36 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_custom fields.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_custom fields.ayrt	
@@ -1 +1 @@
-{"Name":"z_custom fields","Active":true,"Notes":"example of using AyaNova provided Helpers to format custom fields - requires the object to have custom fields enabled\n","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n        <p>Example assumes have used Customize... to make visible the Custom fields for the {{ayT 'WorkOrder'}}, {{ayT 'WorkOrderItem'}} and {{ayT 'WorkOrderItemUnit'}}</p>\n\n\n    {{#each ayReportData}}\n    <table class=\"singlePage\">\n      <tbody>\n        \n        <tr>\n          <th colspan=\"6\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"18\">{{ Serial }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderCustom1'}}  displayed with no additional formating</th>\n          <td colspan=\"12\">{{ CustomFields.c1 }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderCustom2'}} displayed with no additional formating</th>\n          <td colspan=\"12\">{{ CustomFields.c2 }}</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">If {{ayT 'WorkOrderCustom2'}} has {{ayT 'ObjectCustomFieldFieldType'}} of DateTime, shows with additional formating via ayDateTime</th>\n          <td colspan=\"12\">{{ ayDateTime CustomFields.c2 }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderCustom3'}} displayed with no additional formating</th>\n          <td colspan=\"12\">{{ CustomFields.c3 }}</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">If {{ayT 'WorkOrderCustom3'}} has {{ayT 'ObjectCustomFieldFieldType'}} of Money, shows with additional formating via ayCurrency</th>\n          <td colspan=\"12\">{{ayCurrency CustomFields.c3 }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n            {{#each Items}}\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</th>\n              <td colspan=\"14\">{{Notes}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemCustom1'}}  displayed with no additional formating</th>\n              <td colspan=\"14\">{{CustomFields.c1}}</td>\n            </tr>\n            <tr>\n              <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemCustom2'}}  displayed with no additional formating</th>\n              <td colspan=\"14\">{{CustomFields.c2}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">If {{ayT 'WorkOrderItemCustom2'}} has {{ayT 'ObjectCustomFieldFieldType'}} of DateTime, shows with additional formating via ayDateTime</th>\n              <td colspan=\"14\">{{ayDateTime CustomFields.c2}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemCustom3'}} displayed with no additional formating</th>\n              <td colspan=\"14\">{{CustomFields.c3}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">If {{ayT 'WorkOrderItemCustom3'}} has {{ayT 'ObjectCustomFieldFieldType'}} of Money, shows with additional formating via ayCurrency</th>\n              <td colspan=\"14\">{{ayCurrency CustomFields.c3}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"24\">&nbsp;</td>\n            </tr>\n              {{#each Units}}\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"10\">{{ayT 'WorkOrderItemUnit'}}</th>\n                <td colspan=\"10\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">{{ayT 'WorkOrderItemUnit'}} {{ayT 'WorkOrderItemUnitCustom1'}} displayed with no additional formating</th>\n                <td colspan=\"8\">{{CustomFields.c1}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"24\">&nbsp;</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">{{ayT 'WorkOrderItemUnit'}} {{ayT 'WorkOrderItemUnitCustom2'}}  displayed with no additional formating</th>\n                <td colspan=\"8\">{{CustomFields.c2}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">If {{ayT 'WorkOrderItemCustom2'}} has {{ayT 'ObjectCustomFieldFieldType'}} of DateTime, shows with additional formating via ayDateTime</th>\n                <td colspan=\"8\">{{ayDateTime CustomFields.c2}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"24\">&nbsp;</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">{{ayT 'WorkOrderItemUnit'}} {{ayT 'WorkOrderItemUnitCustom3'}}  displayed with no additional formating</th>\n                <td colspan=\"8\">{{CustomFields.c3}}</td>\n              </tr>\n              <tr>\n              <td colspan=\"4\">&nbsp;</td>\n              <th colspan=\"12\">If {{ayT 'WorkOrderItemUnit'}} has {{ayT 'ObjectCustomFieldFieldType'}} of Money, shows with additional formating via ayCurrency</th>\n              <td colspan=\"8\">{{ayCurrency CustomFields.c3}} </td>\n            </tr>\n            <tr>\n                <td colspan=\"24\">&nbsp;</td>\n              </tr>\n              {{/each}}\n            {{/each}}  \n      </tbody>\n    </table>\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":"/* if not using a rule set or specific property it is recommended to comment out or delete fully for report performance*/\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 8pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 5px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([ \"ObjectCustomFieldFieldType\", \"WorkOrder\", \"WorkOrderServiceNumber\", \"WorkOrderCustom1\", \"WorkOrderCustom2\",\"WorkOrderCustom3\", \"WorkOrderItemSummary\", \"WorkOrderItem\", \"WorkOrderItemCustom1\", \"WorkOrderItemCustom2\", \"WorkOrderItemCustom3\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitCustom1\", \"WorkOrderItemUnitCustom2\", \"WorkOrderItemUnitCustom3\"   ]);\n\n\n\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_custom fields","Active":true,"Notes":"example of using AyaNova provided Helpers to format custom fields - requires the object to have custom fields enabled\n","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n  <div>\n        <p>Example assumes have used Customize... to make visible the Custom fields for the {{ayT 'WorkOrder'}}, {{ayT 'WorkOrderItem'}} and {{ayT 'WorkOrderItemUnit'}}</p>\n\n\n    {{#each ayReportData}}\n    <table class=\"singlePage\">\n      <tbody>\n        \n        <tr>\n          <th colspan=\"6\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"18\">{{ Serial }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderCustom1'}}  displayed with no additional formating</th>\n          <td colspan=\"12\">{{ CustomFields.c1 }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderCustom2'}} displayed with no additional formating</th>\n          <td colspan=\"12\">{{ CustomFields.c2 }}</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">If {{ayT 'WorkOrderCustom2'}} has {{ayT 'ObjectCustomFieldFieldType'}} of DateTime, shows with additional formating via ayDateTime</th>\n          <td colspan=\"12\">{{ ayDateTime CustomFields.c2 }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">{{ayT 'WorkOrder'}} {{ayT 'WorkOrderCustom3'}} displayed with no additional formating</th>\n          <td colspan=\"12\">{{ CustomFields.c3 }}</td>\n        </tr>\n        <tr>\n          <th colspan=\"12\">If {{ayT 'WorkOrderCustom3'}} has {{ayT 'ObjectCustomFieldFieldType'}} of Money, shows with additional formating via ayCurrency</th>\n          <td colspan=\"12\">{{ayCurrency CustomFields.c3 }}</td>\n        </tr>\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n            {{#each Items}}\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemSummary'}}</th>\n              <td colspan=\"14\">{{Notes}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemCustom1'}}  displayed with no additional formating</th>\n              <td colspan=\"14\">{{CustomFields.c1}}</td>\n            </tr>\n            <tr>\n              <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemCustom2'}}  displayed with no additional formating</th>\n              <td colspan=\"14\">{{CustomFields.c2}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">If {{ayT 'WorkOrderItemCustom2'}} has {{ayT 'ObjectCustomFieldFieldType'}} of DateTime, shows with additional formating via ayDateTime</th>\n              <td colspan=\"14\">{{ayDateTime CustomFields.c2}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"24\">&nbsp;</td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">{{ayT 'WorkOrderItem'}} {{ayT 'WorkOrderItemCustom3'}} displayed with no additional formating</th>\n              <td colspan=\"14\">{{CustomFields.c3}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"2\">&nbsp;</td>\n              <th colspan=\"8\">If {{ayT 'WorkOrderItemCustom3'}} has {{ayT 'ObjectCustomFieldFieldType'}} of Money, shows with additional formating via ayCurrency</th>\n              <td colspan=\"14\">{{ayCurrency CustomFields.c3}} </td>\n            </tr>\n            <tr>\n              <td colspan=\"24\">&nbsp;</td>\n            </tr>\n              {{#each Units}}\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"10\">{{ayT 'WorkOrderItemUnit'}}</th>\n                <td colspan=\"10\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">{{ayT 'WorkOrderItemUnit'}} {{ayT 'WorkOrderItemUnitCustom1'}} displayed with no additional formating</th>\n                <td colspan=\"8\">{{CustomFields.c1}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"24\">&nbsp;</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">{{ayT 'WorkOrderItemUnit'}} {{ayT 'WorkOrderItemUnitCustom2'}}  displayed with no additional formating</th>\n                <td colspan=\"8\">{{CustomFields.c2}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">If {{ayT 'WorkOrderItemCustom2'}} has {{ayT 'ObjectCustomFieldFieldType'}} of DateTime, shows with additional formating via ayDateTime</th>\n                <td colspan=\"8\">{{ayDateTime CustomFields.c2}}</td>\n              </tr>\n              <tr>\n                <td colspan=\"24\">&nbsp;</td>\n              </tr>\n              <tr>\n                <td colspan=\"4\">&nbsp;</td>\n                <th colspan=\"12\">{{ayT 'WorkOrderItemUnit'}} {{ayT 'WorkOrderItemUnitCustom3'}}  displayed with no additional formating</th>\n                <td colspan=\"8\">{{CustomFields.c3}}</td>\n              </tr>\n              <tr>\n              <td colspan=\"4\">&nbsp;</td>\n              <th colspan=\"12\">If {{ayT 'WorkOrderItemUnit'}} has {{ayT 'ObjectCustomFieldFieldType'}} of Money, shows with additional formating via ayCurrency</th>\n              <td colspan=\"8\">{{ayCurrency CustomFields.c3}} </td>\n            </tr>\n            <tr>\n                <td colspan=\"24\">&nbsp;</td>\n              </tr>\n              {{/each}}\n            {{/each}}  \n      </tbody>\n    </table>\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 8pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 5px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([ \"ObjectCustomFieldFieldType\", \"WorkOrder\", \"WorkOrderServiceNumber\", \"WorkOrderCustom1\", \"WorkOrderCustom2\",\"WorkOrderCustom3\", \"WorkOrderItemSummary\", \"WorkOrderItem\", \"WorkOrderItemCustom1\", \"WorkOrderItemCustom2\", \"WorkOrderItemCustom3\", \"WorkOrderItemUnit\", \"WorkOrderItemUnitCustom1\", \"WorkOrderItemUnitCustom2\", \"WorkOrderItemUnitCustom3\"   ]);\n\n\n\n\n    return reportData;\n}","JsHelpers":"\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_footer forced to bottom of each page of multi-page work order.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_footer forced to bottom of each page of multi-page work order.ayrt
index 8c114765..d59b38a9 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_footer forced to bottom of each page of multi-page work order.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_footer forced to bottom of each page of multi-page work order.ayrt	
@@ -1 +1 @@
-{"Name":"z_footer forced to bottom of each page of multi-page work order","Active":true,"Notes":"NOTE: this is NOT compatible with printing multiple work orders at same time.\nExample of HTML and CSS code to force footer contents to bottom of the page regardless of body contents ","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n          \n<body>\n  <div>\n    {{#each ayReportData}}\n    \n    <table class=\"singlePage\">\n      <tbody>\n        <tr>\n          <th colspan=\"24\">NOTE: THIS EXAMPLE IS ONLY FOR USE WHEN PRINTING A SINGLE WORK ORDER AT A TIME, AS THE TOTALS IN THE FOOTER WILL ONLY REFER TO THE \"LAST\" WORK ORDER IN THE PRINT JOB</th>\n        </tr>\n        <tr>\n          <th colspan=\"24\">Refer to the HTML and CSS within this report template for requirements</th>\n        </tr>\n\n        <!-- if want these attributes such as the logo, customer, workorder number etc, to repeat on each page for mulitpage work orders, place within thead -->\n        {{#if ../ayServerMetaData.HasSmallLogo}}\n        <tr style=\"background-color:white\">\n          <td colspan=\"12\">{{ ayLogo \"small\" }}</td>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n        {{else}} \n        <tr style=\"background-color:white\">\n          <th colspan=\"12\"class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyPostAddress}} {{../ayServerMetaData.CompanyPostCity}}</th>\n          <td colspan=\"12\"></td>\n        </tr>\n        <tr style=\"background-color:white\">\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n        {{/if}}    \n\n        <tr style=\"background-color:white\">\n          <th colspan=\"5\">Service performed for</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean \">Printed Date</th>\n          <td colspan=\"4\" class=\"rightlean\">{{todaysMonthDDYYYYDate}}</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"1\"></th>\n          <td colspan=\"11\"class=\"reporttitle\">{{CustomerViz}}</td>\n          <th colspan=\"12\" class=\"rightlean\"></th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{Address}}, {{City}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{CustomerPhone1Viz}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n        <tr>\n          <th colspan=\"8\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"8\" class=\"centerlean\">{{myDate ServiceDate}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{CustomerReferenceNumber}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <!-- if want these attributes such as the logo, customer, workorder number etc above, to repeat on each page for mulitpage work orders, place within thead -->\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}}</th>\n          <td colspan=\"20\">{{Notes}} </td>\n        </tr>\n        {{#each Units}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"12\">&nbsp;</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Expenses}}\n        {{#if ChargeToCustomer}}\n        <tr>\n          <!-- note the encompassing #each statement which only does this IF ChargeToCustomer is true-->\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}}</td>\n          <!-- note too the custom Prepare function that WILL NOT include Expense charges in the Net Totals and Grand Total IF ChargeToCustomer is false -->\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency ChargeAmount}}</td>\n          <!--this is the \"net\" charge -->\n          <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\"> </td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n          <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n        </tr>{{else}} <tr>\n          <td colspan=\"24\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}} at no charge to customer </td>\n        </tr>{{/if}}\n        {{/each}}\n        {{#each Loans}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLoanList'}}: {{LoanUnitViz}} / {{UnitOfMeasureViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency 0.00}}</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLabors'}} performed {{ayDateTime ServiceStartDate}} with {{ayT 'WorkOrderItemLaborServiceRateID'}} of {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if ServiceDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemLaborServiceDetails'}}:</th>\n          <td colspan=\"19\">{{ServiceDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if Serials}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"23\">{{ayT 'WorkOrderItemPartPartID'}} {{ayT 'WorkOrderItemPartPartSerialID'}}: {{Serials}}</td>\n        </tr>\n          {{else}}{{/if}}\n        {{/each}}\n        {{#each Travels}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemTravels'}} performed {{ayDate TravelStartDate}} with {{ayT 'WorkOrderItemTravelServiceRateID'}} of {{TravelRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if TravelDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemTravelDetails'}}:</th>\n          <td colspan=\"19\">{{TravelDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each OutsideServices}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{ayT 'WorkOrderItemOutsideService'}} performed on Unit: {{UnitViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/each}}\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>      \n      </tbody>\n       \n       <tfoot><!--this tfoot and its tr are the place holder for the fixed-position footer so no data gets overlapped by the static footer that shows at bottom of page below-->\n\t\t\t<tr><!--the number of <tr> in this tfoot needs to equate to the same number in the 'footerdisplay' further below-->\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n\t\t</tfoot><!--closing for the tfoot place holder-->\n    </table>\n\n      <!--REQUIRES the footerdisplay CSS code  -->\n    <table class=\"footerdisplay\"> <!-- this is a separate table from above, which is forced to the bottom of the page. As a result of this forcing, can ONLY display the last object's running totals -->\n\t\t<tbody>\n    <tr style=\"background-color:white\"><!--as in, can only use this for printing off ONE work order at a time, otherwise these totals will be incorrect -->\n          <th colspan=\"13\" class=\"centerlean\"></th>\n          <th colspan=\"3\" class=\"centerlean\">Total Nets</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxA</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxB</th>\n          <th colspan=\"3\" class=\"rightlean \">Grand Total</th>\n        </tr>\n        <tr style=\"background-color:white\">\n           <td colspan=\"13\"></td>\n          <td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisWOTotalNets}}</td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\" >\n          <th colspan=\"12\" class=\"centerlean \">Thank you for your business!</th>\n          <th colspan=\"12\" class=\"centerlean \">Terms: Net 30 days</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"24\" class=\"centerlean \">I acknowledge the satisfactory provision and completion of the above for {{ayT 'WorkOrderServiceNumber'}} {{Serial}}</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          {{#if CustomerSignature}}<th colspan=\"3\">Digital {{ayT 'CustomerSignature'}}</th>{{else}} <th colspan=\"3\">{{ayT 'CustomerSignature'}}</th> {{/if}}\n          {{#if CustomerSignature}}<th colspan=\"5\"> <img src=\"{{CustomerSignature}}\" height=\"40px\"/> </th>{{else}} <th colspan=\"5\">___________________</th> {{/if}}\n\n          {{#if CustomerSignatureCaptured}}<th colspan=\"3\">Digital Signature Date</th>{{else}} <th colspan=\"3\">Signature Date</th> {{/if}}\n          {{#if CustomerSignatureCaptured}}<th colspan=\"5\">{{ayDateTime CustomerSignatureCaptured}}</th>{{else}}<th colspan=\"5\">____________________</th> {{/if}}\n\n          {{#if CustomerSignatureName}}<th colspan=\"3\">Digital Print of Name</th>{{else}} <th colspan=\"3\">Print of Name</th> {{/if}}\n          {{#if CustomerSignatureName}}<th colspan=\"5\">{{CustomerSignatureName}}</th>{{else}} <th colspan=\"5\">____________________</th> {{/if}}\n        </tr>\n\t\t</tbody>\n\t\t</table>\n\n\n\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":"/* this css required along with the HTML code to have footer FORCED to the bottom of the page regardless of body content and number of pages for the work order */\n.footerdisplay {  \n  position: fixed;  \n  font-size: 8pt;    \n  bottom: 0px;\n  width: 100%;\n  border-top: 1px solid #9e9e9e;;  \n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderInvoiceNumber\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"WorkOrderCustomerReferenceNumber\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"WorkOrderItemExpenses\", \"WorkOrderItemLoanList\", \"WorkOrderItemPartPartID\", \"WorkOrderItemPartPartSerialID\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemTravels\", \"WorkOrderItemTravelDetails\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemOutsideService\", \"CustomerSignature\" ]);\n\n\t//below checks if any parts have Serials to remove carriage returns so parts serials display on same line\n    for (EachWO of reportData.ayReportData) {\n        for (Item of EachWO.Items) {\n            for (Part of Item.Parts) {\n                if (Part.Serials != null) {\n                    s = Part.Serials;                    \n                    Part.Serials = s.replace(/[\\n\\r]+/g, ' ');\n                }\n            }\n        }\n    }\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\nfor (EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //is it a valid date?\n    if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {\n        return \"not valid\";\n    }\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_footer forced to bottom of each page of multi-page work order","Active":true,"Notes":"NOTE: this is NOT compatible with printing multiple work orders at same time.\nExample of HTML and CSS code to force footer contents to bottom of the page regardless of body contents ","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n          \n<body>\n  <div>\n    {{#each ayReportData}}\n    \n    <table class=\"singlePage\">\n      <tbody>\n        <tr>\n          <th colspan=\"24\">NOTE: THIS EXAMPLE IS ONLY FOR USE WHEN PRINTING A SINGLE WORK ORDER AT A TIME, AS THE TOTALS IN THE FOOTER WILL ONLY REFER TO THE \"LAST\" WORK ORDER IN THE PRINT JOB</th>\n        </tr>\n        <tr>\n          <th colspan=\"24\">Refer to the HTML and CSS within this report template for requirements</th>\n        </tr>\n\n        <!-- if want these attributes such as the logo, customer, workorder number etc, to repeat on each page for mulitpage work orders, place within thead -->\n        {{#if ../ayServerMetaData.HasSmallLogo}}\n        <tr style=\"background-color:white\">\n          <td colspan=\"12\">{{ ayLogo \"small\" }}</td>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n        {{else}} \n        <tr style=\"background-color:white\">\n          <th colspan=\"12\"class=\"leftlean\">{{../ayServerMetaData.CompanyName}}</th>\n          <th colspan=\"8\" class=\"rightlean reporttitle\">{{ayT 'WorkOrderServiceNumber'}}</th>\n          <td colspan=\"4\" class=\"rightlean reporttitle\">{{Serial}}</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"12\" class=\"leftlean\">{{../ayServerMetaData.CompanyPostAddress}} {{../ayServerMetaData.CompanyPostCity}}</th>\n          <td colspan=\"12\"></td>\n        </tr>\n        <tr style=\"background-color:white\">\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n        {{/if}}    \n\n        <tr style=\"background-color:white\">\n          <th colspan=\"5\">Service performed for</th>\n          <td colspan=\"11\"></td>\n          <th colspan=\"4\" class=\"rightlean \">Printed Date</th>\n          <td colspan=\"4\" class=\"rightlean\">{{todaysMonthDDYYYYDate}}</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <th colspan=\"1\"></th>\n          <td colspan=\"11\"class=\"reporttitle\">{{CustomerViz}}</td>\n          <th colspan=\"12\" class=\"rightlean\"></th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{Address}}, {{City}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\" class=\"leftlean\">{{CustomerPhone1Viz}}</td>\n          <td colspan=\"12\">&nbsp;</td>          \n        </tr>\n        <tr style=\"background-color:white\">\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n        <tr>\n          <th colspan=\"8\">{{ayT 'WorkOrderServiceDate'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderCustomerReferenceNumber'}}</th>\n          <th colspan=\"8\">{{ayT 'WorkOrderInvoiceNumber'}}</th>\n        </tr>\n        <tr>\n          <td colspan=\"8\" class=\"centerlean\">{{myDate ServiceDate}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{CustomerReferenceNumber}}</td>\n          <td colspan=\"8\" class=\"centerlean\">{{InvoiceNumber}}</td>\n        </tr>\n        <!-- if want these attributes such as the logo, customer, workorder number etc above, to repeat on each page for mulitpage work orders, place within thead -->\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{#each Items}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'WorkOrderItemSummary'}}</th>\n          <td colspan=\"20\">{{Notes}} </td>\n        </tr>\n        {{#each Units}}\n        <tr>\n          <th colspan=\"4\" class=\"leftlean\">{{ayT 'Unit'}}</th>\n          <td colspan=\"20\">{{UnitViz}} - {{UnitModelNameViz}}</td>\n        </tr>\n        {{/each}}\n\n        <tr>\n          <th colspan=\"12\">&nbsp;</th>\n          <th colspan=\"2\">{{ayT 'WorkOrderItemPartQuantity'}}</th>\n          <th colspan=\"2\">{{ayT 'Price'}}</th>\n          <th colspan=\"2\">{{ayT 'NetValue'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxA'}}</th>\n          <th colspan=\"2\">{{ayT 'TaxCodeTaxB'}}</th>\n          <th colspan=\"2\">{{ayT 'LineTotal'}}</th>\n        </tr>\n\n        {{#each Expenses}}\n        {{#if ChargeToCustomer}}\n        <tr>\n          <!-- note the encompassing #each statement which only does this IF ChargeToCustomer is true-->\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}}</td>\n          <!-- note too the custom Prepare function that WILL NOT include Expense charges in the Net Totals and Grand Total IF ChargeToCustomer is false -->\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\"></td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency ChargeAmount}}</td>\n          <!--this is the \"net\" charge -->\n          <!--NOTE for tax lines below, checks to see if TaxCode selected. If true, displays derived, otherwise displays TaxPaid -->\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxPaid}}</td>{{/if}}\n          {{#if ChargeTaxCodeId}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}} <td colspan=\"2\" class=\"centerlean\"> </td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n          <!-- NOTE LineTotalViz is derived\n                from  (\"ChargeAmount\" + \"TaxPaid\") OR if there is a TaxCode selected, then is auto figured out from  \"ChargeAmount\" + (TaxCodes% * ChargeAmount)-->\n        </tr>{{else}} <tr>\n          <td colspan=\"24\">{{ayT 'WorkOrderItemExpenses'}}: {{Name}} at no charge to customer </td>\n        </tr>{{/if}}\n        {{/each}}\n        {{#each Loans}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLoanList'}}: {{LoanUnitViz}} / {{UnitOfMeasureViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency 0.00}}</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        {{#each Labors}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemLabors'}} performed {{ayDateTime ServiceStartDate}} with {{ayT 'WorkOrderItemLaborServiceRateID'}} of {{ServiceRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ServiceRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if ServiceDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemLaborServiceDetails'}}:</th>\n          <td colspan=\"19\">{{ServiceDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each Parts}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemPartPartID'}}: {{PartNameViz}} {{PartDescriptionViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{Quantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if Serials}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"23\">{{ayT 'WorkOrderItemPartPartID'}} {{ayT 'WorkOrderItemPartPartSerialID'}}: {{Serials}}</td>\n        </tr>\n          {{else}}{{/if}}\n        {{/each}}\n        {{#each Travels}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"11\">{{ayT 'WorkOrderItemTravels'}} performed {{ayDate TravelStartDate}} with {{ayT 'WorkOrderItemTravelServiceRateID'}} of {{TravelRateViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{TravelRateQuantity}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency PriceViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{#if TravelDetails}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <th colspan=\"4\">{{ayT 'WorkOrderItemTravelDetails'}}:</th>\n          <td colspan=\"19\">{{TravelDetails}}</td>\n        </tr>\n        {{else}}{{/if}}\n        {{/each}}\n        {{#each OutsideServices}}\n        <tr>\n          <td colspan=\"1\">&nbsp;</td>\n          <td colspan=\"15\">{{ayT 'WorkOrderItemOutsideService'}} performed on Unit: {{UnitViz}}</td>\n          <td colspan=\"2\" class=\"centerlean\">{{ayCurrency NetViz}}</td>\n          {{#if TaxAViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxAViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if TaxBViz}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency TaxBViz}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"2\" class=\"rightlean\">{{ayCurrency LineTotalViz}}</td>\n        </tr>\n        {{/each}}\n        <tr>\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        {{/each}}\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>      \n      </tbody>\n       \n       <tfoot><!--this tfoot and its tr are the place holder for the fixed-position footer so no data gets overlapped by the static footer that shows at bottom of page below-->\n\t\t\t<tr><!--the number of <tr> in this tfoot needs to equate to the same number in the 'footerdisplay' further below-->\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n      <tr>\n\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t</tr>\n\t\t</tfoot><!--closing for the tfoot place holder-->\n    </table>\n\n      <!--REQUIRES the footerdisplay CSS code  -->\n    <table class=\"footerdisplay\"> <!-- this is a separate table from above, which is forced to the bottom of the page. As a result of this forcing, can ONLY display the last object's running totals -->\n\t\t<tbody>\n    <tr style=\"background-color:white\"><!--as in, can only use this for printing off ONE work order at a time, otherwise these totals will be incorrect -->\n          <th colspan=\"13\" class=\"centerlean\"></th>\n          <th colspan=\"3\" class=\"centerlean\">Total Nets</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxA</th>\n          <th colspan=\"2\" class=\"centerlean\">Total TaxB</th>\n          <th colspan=\"3\" class=\"rightlean \">Grand Total</th>\n        </tr>\n        <tr style=\"background-color:white\">\n           <td colspan=\"13\"></td>\n          <td colspan=\"3\" class=\"centerlean\">{{ayCurrency ThisWOTotalNets}}</td>\n          {{#if ThisWOTotalTaxAs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxAs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          {{#if ThisWOTotalTaxBs}}<td colspan=\"2\" class=\"centerlean\">{{ayCurrency ThisWOTotalTaxBs}}</td>{{else}}<td colspan=\"2\" class=\"centerlean\">$0.00</td>{{/if}}\n          <td colspan=\"3\" class=\"rightlean \">{{ayCurrency ThisWOTotalGrand}}</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\" >\n          <th colspan=\"12\" class=\"centerlean \">Thank you for your business!</th>\n          <th colspan=\"12\" class=\"centerlean \">Terms: Net 30 days</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n\n        <tr style=\"background-color:white\">\n          <th colspan=\"24\" class=\"centerlean \">I acknowledge the satisfactory provision and completion of the above for {{ayT 'WorkOrderServiceNumber'}} {{Serial}}</th>\n        </tr>\n        <tr style=\"background-color:white\">\n          <td colspan=\"24\">&nbsp;</td>\n        </tr>\n        <tr style=\"background-color:white\">\n          {{#if CustomerSignature}}<th colspan=\"3\">Digital {{ayT 'CustomerSignature'}}</th>{{else}} <th colspan=\"3\">{{ayT 'CustomerSignature'}}</th> {{/if}}\n          {{#if CustomerSignature}}<th colspan=\"5\"> <img src=\"{{CustomerSignature}}\" height=\"40px\"/> </th>{{else}} <th colspan=\"5\">___________________</th> {{/if}}\n\n          {{#if CustomerSignatureCaptured}}<th colspan=\"3\">Digital Signature Date</th>{{else}} <th colspan=\"3\">Signature Date</th> {{/if}}\n          {{#if CustomerSignatureCaptured}}<th colspan=\"5\">{{ayDateTime CustomerSignatureCaptured}}</th>{{else}}<th colspan=\"5\">____________________</th> {{/if}}\n\n          {{#if CustomerSignatureName}}<th colspan=\"3\">Digital Print of Name</th>{{else}} <th colspan=\"3\">Print of Name</th> {{/if}}\n          {{#if CustomerSignatureName}}<th colspan=\"5\">{{CustomerSignatureName}}</th>{{else}} <th colspan=\"5\">____________________</th> {{/if}}\n        </tr>\n\t\t</tbody>\n\t\t</table>\n\n\n\n    {{/each}}\n  </div>\n\n</body>\n\n</html>","Style":"/* this css required along with the HTML code to have footer FORCED to the bottom of the page regardless of body content and number of pages for the work order */\n.footerdisplay {  \n  position: fixed;  \n  font-size: 8pt;    \n  bottom: 0px;\n  width: 100%;\n  border-top: 1px solid #9e9e9e;;  \n}\n\n.singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n} \n\ntable { \n  table-layout: fixed; \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  font-size: 9pt;\n  width: 100%;\n    }\n\n\nth {\n  height: 20px;\n  color: #9e9e9e;\n}\n\ntbody tr {\n  height: 10px;\n  word-wrap: break-word;\n}\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrderInvoiceNumber\", \"WorkOrderServiceDate\", \"WorkOrderServiceNumber\", \"WorkOrderCustomerReferenceNumber\", \"Unit\", \"WorkOrderItemSummary\", \"WorkOrderItemPartQuantity\", \"Price\",  \"NetValue\", \"TaxCodeTaxA\", \"TaxCodeTaxB\", \"LineTotal\", \"WorkOrderItemExpenses\", \"WorkOrderItemLoanList\", \"WorkOrderItemPartPartID\", \"WorkOrderItemPartPartSerialID\", \"WorkOrderItemLabors\", \"WorkOrderItemLaborServiceRateID\", \"WorkOrderItemLaborServiceDetails\", \"WorkOrderItemTravels\", \"WorkOrderItemTravelDetails\", \"WorkOrderItemTravelServiceRateID\", \"WorkOrderItemOutsideService\", \"CustomerSignature\" ]);\n\n\t//below checks if any parts have Serials to remove carriage returns so parts serials display on same line\n    for (const EachWO of reportData.ayReportData) {\n        for (const Item of EachWO.Items) {\n            for (const Part of Item.Parts) {\n                if (Part.Serials != null) {\n                    s = Part.Serials;                    \n                    Part.Serials = s.replace(/[\\n\\r]+/g, ' ');\n                }\n            }\n        }\n    }\n\n\n//********************//NOTE if you customize this report template and do NOT need a function or key identified below, remove to increase report performance\n\n\nfor (const EachWO of reportData.ayReportData) \n\t{\n\t//below declares a key on the entire wo to hold all Labor Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLaborsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Part Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllPartsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Travel Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllTravelsNetViz = 0;\n\t//below declares a key on the entire wo to hold all Exp Net ChargeAmount from all Items in this wo so it exists\n\tEachWO.ThisWOAllExpsNetChargeAmount = 0;\n\t//below declares a key on the entire wo to hold all Loan Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllLoansNetViz = 0;\n\t//below declares a key on the entire wo to hold all Outside Net Viz from all Items in this wo so it exists\n\tEachWO.ThisWOAllOutsidesNetViz = 0;\t\n\n\t//below declares a key on the entire wo to hold ALL of THIS workorder's Nets so it exists\n\tEachWO.ThisWOTotalNets = 0;\n\n\t//below declares a key on the entire wo to hold THIS workorder's Tax A (for all items) so it exists  \n\tEachWO.ThisWOTotalTaxAs = 0;\n\t//below declares a key on the entire wo to hold THIS workorder's Tax B (for all items) so it exists\n\tEachWO.ThisWOTotalTaxBs = 0;\t\n\t//below declares a key on the entire wo to hold THIS workorder's Grand Total so it exists\n\tEachWO.ThisWOTotalGrand = 0;\n\n\t//below is to Iterate through each item of the wo's Items\n\tfor (const Item of EachWO.Items)\n\t\t{\n\t\t\tItem.ThisItemAllLaborsNetViz = 0; //declare a key on the Item to hold all of this item's labor nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each labor record of the wo's Item\n\t\t\tfor (const Labor of Item.Labors)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Labor.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to running total for this WOItem's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOAllLaborsNetViz += Labor.NetViz; //this IS where the actual adding to the running total for this entire WO's Net Labors\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Labor.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxAViz; //this IS where the actual adding of Labor's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Labor.TaxBViz; //this IS where the actual adding of Labor's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllPartsNetViz = 0; //declare a key on the Item to hold all of this item's parts nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Part record of the wo's Item\n\t\t\tfor (const Part of Item.Parts)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Part.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllPartsNetViz += Part.NetViz; //this IS where the actual adding to running total for this WOItem's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOAllPartsNetViz += Part.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Parts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Part.NetViz; //this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\t\t\t\t\t\t\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxAViz; //this IS where the actual adding of Part's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Part.TaxBViz; //this IS where the actual adding of Part's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllTravelsNetViz = 0; //declare a key on the Item to hold all of this item's travel nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Travel record of the wo's Item\n\t\t\tfor (const Travel of Item.Travels)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Travel.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to running total for this WOItem's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOAllTravelsNetViz += Travel.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Travels\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Travel.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxAViz; //this IS where the actual adding of Travel's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Travel.TaxBViz; //this IS where the actual adding of Travel's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\t//note additional statements for misc expense to ONLY add to running totals if ChargeToCustomer is true\n\t\t\t\n\t\t\tItem.ThisItemAllExpsNetChargeAmount = 0;  //declare a key on the Item to hold all of this item's misc nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Exp record of the wo's Item\n\t\t\tfor (const Exp of Item.Expenses)\n\t\t\t{\n\t\t\t//if this expense has a ChargeAmount value AND the ChargeToCustomer is true then adds the ChargeAmount to running totals\n                \tif (Exp.ChargeAmount != null && Exp.ChargeToCustomer == true) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to running total for this WOItem's Net Exps\n\t\t\t\t\t\tEachWO.ThisWOAllExpsNetChargeAmount += Exp.ChargeAmount;//this IS where the actual adding to the running total for this entire WO's Net ChargeAmounts\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Exp.ChargeAmount;//this IS where the actual adding to the running total for ALL NET ChargeAmountS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.ChargeAmount; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\n\t\t\t//if this expense the ChargeToCustomer is true AND  ChargeTaxCode has a value then adds the TaxAViz and TaxBViz to running totals\t\t\n\t\t\t\t\tif (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId != null ) \n        \t        \t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxAViz; //this IS where the actual adding of Exp's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxBViz; //this IS where the actual adding of Exp's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t\t\telse  if (Exp.ChargeToCustomer == true  && Exp.ChargeTaxCodeId == null )  //else if  ChargeToCustomer is true AND ChargeTaxCodeID is null, then add TaxPaid to TaxA running total and Grand Total\t\t\n\t\t\t\t\t\t{\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Exp.TaxPaid; //this IS where the actual adding of Exp's TaxPaid to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t\n\t\t\tItem.ThisItemAllLoansNetViz = 0;  //declare a key on the Item to hold all of this item's loans nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Loan record of the wo's Item\n\t\t\tfor (const Loan of Item.Loans)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Loan.NetViz != null) \n        \t        \t{\n          \t          \tItem.ThisItemAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to running total for this WOItem's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOAllLoansNetViz += Loan.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Loans\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Loan.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxAViz; //this IS where the actual adding of Loan's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Loan.TaxBViz; //this IS where the actual adding of Loan's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\n\t\t\tItem.ThisItemAllOutsidesNetViz = 0;  //declare a key on the Item to hold all of this item's Outsie nets and set it initially to 0 \n\t\t\t\n\t\t\t//below is to Iterate through each Outside record of the wo's Item\n\t\t\tfor (const Outside of Item.OutsideServices)\n\t\t\t{\n\t\t\t//make sure it has a value before attempting to add it to the running total\n                \tif (Outside.NetViz != null) \n        \t        \t{\n\t\t\t\t\t\t\n          \t          \tItem.ThisItemAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to running total for this WOItem's Net Outside\n\t\t\t\t\t\tEachWO.ThisWOAllOutsidesNetViz += Outside.NetViz;//this IS where the actual adding to the running total for this entire WO's Net Outsides\n\t\t\t\t\t\tEachWO.ThisWOTotalNets += Outside.NetViz;//this IS where the actual adding to the running total for ALL NETS for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.NetViz; //this IS where the actual adding to the running total for GrandTotal for THIS workorders in this report data\n\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxAs += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for ALL Tax A for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxAViz; //this IS where the actual adding of Outside's Tax A to the running total for GrandTotal for THIS workorders in this report data\n\t\t\t\t\t\t\n\t\t\t\t\t\tEachWO.ThisWOTotalTaxBs += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for ALL Tax B for THIS workorders in this report data\n\t\t\t\t\t\tEachWO.ThisWOTotalGrand += Outside.TaxBViz; //this IS where the actual adding of Outside's Tax B to the running total for GrandTotal for THIS workorders in this report data\n          \t      \t\t}\t\t\t\t//NOTE if you customize this report template and do NOT need a key above, remove it to increase report performance\t\n\t\t\t}\n\t\t}\n\t}\n\t\n\n    return reportData;\n}","JsHelpers":"Handlebars.registerHelper('todaysMonthDDYYYYDate', function() {\n    var dt3=new Date();\n    return dt3.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    ) ;\n});// today's date displayed in MONTH DD, YYYY format EXAMPLE SHOW: June 9, 2021\n\n/////////////////////////////////////////////////////////////////\n//\n// CUSTOM DATE HELPER\n//\nHandlebars.registerHelper('myDate', function (value) {\n    if (!value) {\n        return \"\";\n    }\n\n    //parse the date\n    let parsedDate = new Date(value);\n\n    //Use built in toLocaleDateString method to format the date\n    //there are many options that change the displayed format documented here\n    //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString\n    return parsedDate.toLocaleDateString(\n        AYMETA.ayClientMetaData.LanguageName,//use Client browser default Language, change this setting here to force an alternative language\n        {\n            timeZone: AYMETA.ayClientMetaData.TimeZoneName,//use Client browser's default TimeZone, change this setting here to force a specific time zone\n            dateStyle: \"long\"\n        }\n    );\n});\n\n","RenderType":0,"HeaderTemplate":"<span>&nbsp;</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 100%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Printed date:&nbsp;<span class=\"date\"></span></span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">&nbsp;&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":false,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"10mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_if key value X show Y via custom Helpers.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_if key value X show Y via custom Helpers.ayrt
index 7c096f0a..64378f4d 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_if key value X show Y via custom Helpers.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_if key value X show Y via custom Helpers.ayrt	
@@ -1 +1 @@
-{"Name":"z_if key value X show Y via custom Helpers","Active":true,"Notes":"example custom Helper if has tag X then show Y, else return something else like preset text\nexample custom Helper of how to correctly wrap output in a safestring as result of Helper if need to use CSS styling","Roles":50538,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div class=\"reporttitle\" >\n\t<p>Use of Custom Helpers to display specific aspects if {{ayT 'Tags'}} have a specific value</p>\n\t<!-- See the specific Helpers in this report template, and the help documentation for additional details -->\n\t</div>\n\t<table>\n\t\t{{#each ayReportData}}\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<th colspan=\"2\">For {{ayT 'PurchaseOrderPONumber'}} {{ Serial }}</th> <!--th  styles this as a heading column -->\n\t\t\t</tr>\t\t\t\n\t\t\t<tr>\n\t\t\t\t<td>Using HTML5 mustache to display all {{ayT 'Tags'}} for this {{ayT 'PurchaseOrder'}}</td>\n\t\t\t\t<td>{{ Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Using HTML5 mustache to display ONLY the 1st {{ayT 'Tag'}} for this {{ayT 'PurchaseOrder'}} {{ayT 'Tags'}}</td><!--td  styles this as a data column -->\n\t\t\t\t<td>{{ Tags.[0]}} </td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Custom Helper to display if has {{ayT 'Tag'}} 'gold':</td>\n\t\t\t\t<td>{{ isInTag Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Custom Helper to display if has {{ayT 'Tag'}} 'brown':</td>\n\t\t\t\t<td>{{ isInTag2 Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Custom Helper to display if has {{ayT 'Tag'}} 'green' will display using safestring call of the CSS styling fontgreen else displays safestring call of the CSS styling fontred:</td>\n\t\t\t\t<td>{{ isInTag3 Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>HTML5 use of #if to display PO's CustomFields.c1 value with CSS fontgreen applied to the text, else will display fontred if is is false, undefined, null, \"\", 0, or []</td>\n\t\t\t\t{{#if CustomFields.c1}} <td class='fontgreen' >{{CustomFields.c1}}</td> {{else}} <td class='fontred' >No value has been entered in Custom1 field for this PO</td> {{/if}}\n\t\t\t</tr>\n\t\t\t{{#each Items}}\n\t\t\t<tr>\n\t\t\t\t<td>HTML5 use of #each for each POitem -  #if to display text in fontred if QuantyReceived is false, undefined, null, \"\", 0, or [], else display in fontgreen</td>\n\t\t\t\t{{#if QuantityReceived}}<td class='fontgreen' >{{ayT 'Part'}} {{PartNameViz}} {{ayT 'PurchaseOrderItemQuantityOrdered'}} = {{QuantityOrdered}}<br>{{ayT \"PurchaseOrderItemQuantityReceived\"}} value is {{QuantityReceived}}</td> {{else}} <td class='fontred' >{{ayT 'Part'}} {{PartNameViz}} {{ayT 'PurchaseOrderItemQuantityOrdered'}} = {{QuantityOrdered}}<br>{{ayT 'Part'}} {{PartNameViz}} {{QuantityReceived}} value is {{ayT \"PurchaseOrderItemQuantityReceived\"}}!</td> {{/if}}\n\t\t\t</tr>\n\t\t\t{{/each}}\n\t\t</tbody>\n\t\t{{/each}}\n\t</table>\n \n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(ayData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"Part\", \"PurchaseOrderItemQuantityReceived\", \"PurchaseOrderItemQuantityOrdered\", \"Tag\", \"Tags\", \"PurchaseOrderPONumber\", \"PurchaseOrder\" ]);\n\n    return ayData;\n}","JsHelpers":"Handlebars.registerHelper('isInTag', function (Tags) \n{\n    for (var i=0; i<Tags.length; i++) \n\t{\n        if (Tags[i].match('gold'))\n\t\t{ \n           return 'gold';        \n\t\t}\n    }\n    return 'THERE IS NO gold TEXT FOUND IN THE TAGS ARRAY FOR THIS PO';\n});\n\nHandlebars.registerHelper('isInTag2', function (Tags) \n{\n    for (var i=0; i<Tags.length; i++) \n\t{\n        if (Tags[i].match('brown'))\n\t\t{ \n\t\t\treturn 'THE TEXT brown  IS FOUND IN THE TAGS ARRAY FOR THIS PO';\n\t\t}\n    }\n    return 'NOPE, THE TEXT \\'brown\\' is NOT FOUND IN THE TAGS ARRAY FOR THIS PO'; //note the use of \\ to be able to show special character '\n});\n\nHandlebars.registerHelper('isInTag3', function (Tags) \n{\n    for (var i=0; i<Tags.length; i++) \n\t{\n        if (Tags[i].match('green'))\n\t\t{ \n\t\t\treturn new Handlebars.SafeString(\"<p class='fontgreen' >\" + \"THE TEXT green IS IN FOUND IN THE TAGS ARRAY FOR THIS PO!! See how this shows in greenfont!\" +\"</p>\"); //if want to use CSS styling, be sure to wrap in a safestring\n\t\t}\n    }\n    return new Handlebars.SafeString(\"<p class='fontred' >\" + 'NOPE, THE TEXT green ISN\\'T IN THE TAGS ARRAY FOR THIS PO' +\"</p>\"); //if don't want to return any element at all, comment this else aspect out fully\n});\n","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_if key value X show Y via custom Helpers","Active":true,"Notes":"example custom Helper if has tag X then show Y, else return something else such as preset text\nexample custom Helper of how to correctly wrap output in a safestring as result of Helper if CSS styling required","Roles":50538,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div class=\"reporttitle\" >\n\t<p>Use of Custom Helpers to display specific aspects if {{ayT 'Tags'}} have a specific value</p>\n\t<!-- See the specific Helpers in this report template, and the help documentation for additional details -->\n\t</div>\n\t<table>\n\t\t{{#each ayReportData}}\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<th colspan=\"2\">For {{ayT 'PurchaseOrderPONumber'}} {{ Serial }}</th> <!--th  styles this as a heading column -->\n\t\t\t</tr>\t\t\t\n\t\t\t<tr>\n\t\t\t\t<td>Using HTML5 mustache to display all {{ayT 'Tags'}} for this {{ayT 'PurchaseOrder'}}</td>\n\t\t\t\t<td>{{ Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Using HTML5 mustache to display ONLY the 1st {{ayT 'Tag'}} for this {{ayT 'PurchaseOrder'}} {{ayT 'Tags'}}</td><!--td  styles this as a data column -->\n\t\t\t\t<td>{{ Tags.[0]}} </td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Custom Helper to display if has {{ayT 'Tag'}} 'gold':</td>\n\t\t\t\t<td>{{ isInTag Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Custom Helper to display if has {{ayT 'Tag'}} 'brown':</td>\n\t\t\t\t<td>{{ isInTag2 Tags}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>Custom Helper to display if has {{ayT 'Tag'}} 'green' will display using safestring call of the CSS styling fontgreen else displays safestring call of the CSS styling fontred:</td>\n\t\t\t\t<td>{{{ isInTag3 Tags}}}</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td>HTML5 use of #if to display PO's CustomFields.c1 value with CSS fontgreen applied to the text, else will display fontred if is is false, undefined, null, \"\", 0, or []</td>\n\t\t\t\t{{#if CustomFields.c1}} <td class='fontgreen' >{{CustomFields.c1}}</td> {{else}} <td class='fontred' >No value has been entered in Custom1 field for this PO</td> {{/if}}\n\t\t\t</tr>\n\t\t\t{{#each Items}}\n\t\t\t<tr>\n\t\t\t\t<td>HTML5 use of #each for each POitem -  #if to display text in fontred if QuantyReceived is false, undefined, null, \"\", 0, or [], else display in fontgreen</td>\n\t\t\t\t{{#if QuantityReceived}}<td class='fontgreen' >{{ayT 'PurchaseOrderItemQuantityOrdered'}} for {{ayT 'Part'}} {{PartNameViz}} is {{QuantityOrdered}} which EQUALS {{ayT \"PurchaseOrderItemQuantityReceived\"}} value of {{QuantityReceived}}</td> {{else}} <td class='fontred' >{{ayT 'PurchaseOrderItemQuantityOrdered'}} for {{ayT 'Part'}} {{PartNameViz}} is {{QuantityOrdered}} which is NOT EQUAL to the {{ayT \"PurchaseOrderItemQuantityReceived\"}} so far of {{QuantityReceived}}!</td> {{/if}}\n\t\t\t</tr>\n\t\t\t{{/each}}\n\t\t</tbody>\n\t\t{{/each}}\n\t</table>\n \n</body>\n\n</html>","Style":".singlePage\n{\npage-break-after: always;\n\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 11pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(ayData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"Part\", \"PurchaseOrderItemQuantityReceived\", \"PurchaseOrderItemQuantityOrdered\", \"Tag\", \"Tags\", \"PurchaseOrderPONumber\", \"PurchaseOrder\" ]);\n\n    return ayData;\n}","JsHelpers":"Handlebars.registerHelper('isInTag', function (Tags) //example of HELPER to show specific text IF a specific tag is found\n{\n    for (var i=0; i<Tags.length; i++) \n\t{\n        if (Tags[i].match('gold'))\n\t\t{ \n           return 'gold';        \n\t\t}\n    }\n    return 'THERE IS NO gold TEXT FOUND IN THE TAGS ARRAY FOR THIS PO';\n});\n\nHandlebars.registerHelper('isInTag2', function (Tags) //example of HELPER to show specific text if a specific tag is found, else shows some other specific text\n{\n    for (var i=0; i<Tags.length; i++) \n\t{\n        if (Tags[i].match('brown'))\n\t\t{ \n\t\t\treturn 'THE TEXT brown  IS FOUND IN THE TAGS ARRAY FOR THIS PO';\n\t\t}\n    }\n    return 'NOPE, THE TEXT \\'brown\\' is NOT FOUND IN THE TAGS ARRAY FOR THIS PO'; //note the use of \\ to be able to show special character '\n});\n\nHandlebars.registerHelper('isInTag3', function (Tags) //whereas if want to include css styling with the text such as setting font color, MUST do so using handlebars safestring\n{\n    for (var i=0; i<Tags.length; i++) \n\t{\n        if (Tags[i].match('green')) \n\t\t{          \n            return new Handlebars.SafeString(\"<p class='fontgreen' >\" + \"The tag \\'green\\' is found in this PO\\'s Tags array, so this text shows with green font color!\" +\"</p>\"); //note the use of \\ to be able to show special character '\n\t\t}\n    }\n    return new Handlebars.SafeString(\"<p class='fontred' >\" + 'Nope, the tag \\'green\\' is NOT found in this PO\\'s Tags array, so this text shows with red font color' +\"</p>\"); //note the use of \\ to be able to show special character '\n});\n","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_myData ServerInfo .ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_myData ServerInfo .ayrt
index 66926098..ed645fae 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_myData ServerInfo .ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_myData ServerInfo .ayrt	
@@ -1 +1 @@
-{"Name":"z_myData ServerInfo ","Active":true,"Notes":"Examples of obtaining ServerInfo  using custom Prepare such as server version, schema version, server's LocalTime, licensing information","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <div>\n         <p>Display of the ServerInfo obtained through the custom Prepare:</p>\n         <p>{{ayJSON ../myData.ServerInfo}}</p>\n      </div>\n      \n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n             <tr>\n               <th colspan=\"5\">Column to the right displays the myData.ServerInfo.data.serverVersion obtained:</th>\n               <td colspan=\"5\">{{../myData.ServerInfo.data.serverVersion}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the myData.ServerInfo.data.serverTimeZone obtained:</th>\n               <td colspan=\"5\">{{../myData.ServerInfo.data.serverTimeZone}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the myData.ServerInfo.data.license.license.licenseExpiration obtained:</th>\n               <td colspan=\"5\">{{../myData.ServerInfo.data.license.license.licenseExpiration}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">Licensed To</th>\n               <th colspan=\"2\">Server's Time Zone</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>\n               {{else}}<td>no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../myData.ServerInfo.data.license.license.licensedTo}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               <td colspan=\"2\">{{ ../myData.ServerInfo.data.serverTimeZone}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\np {\n  word-wrap: break-word;\n  font-size: 9pt;\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; /* the # of columns set in the first row of the thead will be fixed and applied throughout table and rows */\n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"ReportNotes\", \"ReportName\", \"Report\"  ]);\n\n    //Put the data into the main report data object so it's available to the template\n    reportData.myData={ServerInfo:await ayGetFromAPI(\"server-info\")};\n\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_myData ServerInfo ","Active":true,"Notes":"Examples of obtaining ServerInfo  using custom Prepare such as server version, schema version, server's LocalTime, licensing information","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <div>\n         <p>Display of the ServerInfo obtained through the custom Prepare:</p>\n         <p>{{ayJSON ../myData.ServerInfo}}</p>\n      </div>\n      \n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n             <tr>\n               <th colspan=\"5\">Column to the right displays the myData.ServerInfo.data.serverVersion obtained:</th>\n               <td colspan=\"5\">{{../myData.ServerInfo.data.serverVersion}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the myData.ServerInfo.data.serverTimeZone obtained:</th>\n               <td colspan=\"5\">{{../myData.ServerInfo.data.serverTimeZone}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the myData.ServerInfo.data.license.license.licenseExpiration obtained:</th>\n               <td colspan=\"5\">{{../myData.ServerInfo.data.license.license.licenseExpiration}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">Licensed To</th>\n               <th colspan=\"2\">Server's Time Zone</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}}<td colspan=\"2\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../myData.ServerInfo.data.license.license.licensedTo}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               <td colspan=\"2\">{{ ../myData.ServerInfo.data.serverTimeZone}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\np {\n  word-wrap: break-word;\n  font-size: 9pt;\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"ReportNotes\", \"ReportName\", \"Report\"  ]);\n\n    //Put the data into the main report data object so it's available to the template\n    reportData.myData={ServerInfo:await ayGetFromAPI(\"server-info\")};\n\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_myData search results.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_myData search results.ayrt
index 434ec7fc..0580e2e8 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_myData search results.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_myData search results.ayrt	
@@ -1 +1 @@
-{"Name":"z_myData search results","Active":true,"Notes":"Examples of obtaining custom search results using custom Prepare ","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n\n      <div>\n         <p>myData.SearchResults - Fetched dynamically from API route <strong>enum-list/list/AyaType</strong> using report template's Prepare</p>\n         <p>specifically, Prepare searches for the text \"Purple\" in any object in the database and returns....</p>\n         <p>{{ayJSON myData.SearchResults}}</p>\n      </div>\n      \n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the individual property myData.SearchResults.data.totalResultsFound obtained:</th>\n               <td colspan=\"5\">{{ayJSON myData.SearchResults.data.totalResultsFound}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the third array in the search results:</th>\n               <td colspan=\"5\">{{ayJSON myData.SearchResults.data.searchResults.[2]}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\">Below displays each record that has the search result</th>\n            </tr>\n            <tr>\n               <th colspan=\"6\">Name</th>\n               <th colspan=\"2\">Type</th>\n               <th colspan=\"2\">ID</th>\n            </tr>\n         </thead>\n\n        {{#each myData.SearchResults.data.searchResults}}<!--iterates through for each result -->\n         <tbody>           \n            <tr>\n               <td colspan=\"6\">{{name}}</td>\n               <td colspan=\"2\">{{type}}</td>\n               <td colspan=\"2\">{{id}}</td>\n            </tr>            \n         </tbody> \n         {{/each}}\n\n      </table>\n\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\np {\n  word-wrap: break-word;\n  font-size: 9pt;\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\n    //Put the data into the main report data object so it's available to the template\n    reportData.myData={ServerInfo:await ayGetFromAPI(\"server-info\")};\n    \n     //Example API POST method to fetch data from api server\n    let searchPostData={phrase: \"Purple\"};\n    reportData.myData.SearchResults=await ayPostToAPI(\"search\", searchPostData);\n\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_myData search results","Active":true,"Notes":"Examples of obtaining custom search results using custom Prepare ","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n\n      <div>\n         <p>myData.SearchResults - Fetched dynamically from API route <strong>enum-list/list/AyaType</strong> using report template's Prepare</p>\n         <p>specifically, Prepare searches for the text \"Purple\" in any object in the database and returns....</p>\n         <p>{{ayJSON myData.SearchResults}}</p>\n      </div>\n      \n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the individual property myData.SearchResults.data.totalResultsFound obtained:</th>\n               <td colspan=\"5\">{{ayJSON myData.SearchResults.data.totalResultsFound}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the third array in the search results:</th>\n               <td colspan=\"5\">{{ayJSON myData.SearchResults.data.searchResults.[2]}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"10\">Below displays each record that has the search result</th>\n            </tr>\n            <tr>\n               <th colspan=\"6\">Name</th>\n               <th colspan=\"2\">Type</th>\n               <th colspan=\"2\">ID</th>\n            </tr>\n         </thead>\n\n        {{#each myData.SearchResults.data.searchResults}}<!--iterates through for each result -->\n         <tbody>           \n            <tr>\n               <td colspan=\"6\">{{name}}</td>\n               <td colspan=\"2\">{{type}}</td>\n               <td colspan=\"2\">{{id}}</td>\n            </tr>            \n         </tbody> \n         {{/each}}\n\n      </table>\n\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\np {\n  word-wrap: break-word;\n  font-size: 9pt;\n}\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\n    //Put the data into the main report data object so it's available to the template\n    reportData.myData={ServerInfo:await ayGetFromAPI(\"server-info\")};\n    \n     //Example API POST method to fetch data from api server\n    let searchPostData={phrase: \"Purple\"};\n    reportData.myData.SearchResults=await ayPostToAPI(\"search\", searchPostData);\n\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_replace carriage return with space.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_replace carriage return with space.ayrt
index 757903e7..78cb9cb4 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_replace carriage return with space.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_replace carriage return with space.ayrt	
@@ -1 +1 @@
-{"Name":"z_replace carriage return with space","Active":true,"Notes":"Example custom Prepare to replace carriage return with space for a specific key of this object ","Roles":50538,"AType":8,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Custom Prepare to remove carriage returns in {{ayT 'CustomerNotes'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"7\" class=\"leftlean\">{{ayT 'Customer'}}</th>\n\t\t\t\t\t<th colspan=\"1\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"7\">{{ayT 'CustomerNotes'}}</th>\n\t\t\t\t\t<th colspan=\"1\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"8\">Carriage returns removed in {{ayT 'CustomerNotes'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"7\">{{Name}}</td>\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"7\">{{Notes}}</td>\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"8\">{{NotesNoCarriage}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\n\t\t<table><!-- remove or comment this out if no need to see printout of data returned from the custom Prepare -->\n            {{#each ayReportData}}\n          <tbody>\n\t\t\t  \t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n                <tr>\n                  <td colspan=\"24\">This is a printout of the data returned from the Custom Prepare that this report now uses, each \"group\" is an object instead of data from the \"Sample Data\".</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"24\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n        </table>\n\t</div>\n</body>\n</html>","Style":"\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  text-align: center;\r\n  color: #9e9e9e;\r\n} \r\n\r\n\r\ntable { \r\n  table-layout: fixed; //setting this to fixed causes columns to be evenly spaced for the entire table regardless of cell content, and then colspan then \"works\" as expected\r\n  font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;\r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  font-size: 8pt;\r\n  width: 100%;\r\n    }\r\n\r\n\r\nth {\r\n  height: 30px;\r\n  text-align: left;\r\n  color: #9e9e9e;\r\n}\r\n\r\n\r\ntbody tr {\r\n  height: 10px;\r\n  word-wrap: break-word;\r\n}\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}","JsPrerender":"async function ayPrepareData(ayData){  \n\n        await ayGetTranslations([ \"Customer\", \"CustomerNotes\" ]);\n\n    //for each Customer, if the General Notes field is NOT null, creates a new key NotesNoCarriage and puts into it the text from Notes replacing ANY carriage returns with a space, so all text is on same line(s)\n    for (EachCU of ayData.ayReportData) {\n        if (EachCU.Notes != null) {\n            n = EachCU.Notes;\n            EachCU.NotesNoCarriage = n.replace(/[\\n\\r]+/g, ' ');\n        }\n    }\n\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_replace carriage return with space","Active":true,"Notes":"Example custom Prepare to replace carriage return with space for a specific key of this object ","Roles":50538,"AType":8,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n\t<div>\n\t\t<div class=\"reporttitle\">\n\t\t\t<p>Custom Prepare to remove carriage returns in {{ayT 'CustomerNotes'}}</p>\n\t\t</div>\n\t\t<table>\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th colspan=\"7\" class=\"leftlean\">{{ayT 'Customer'}}</th>\n\t\t\t\t\t<th colspan=\"1\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"7\">{{ayT 'CustomerNotes'}}</th>\n\t\t\t\t\t<th colspan=\"1\">&nbsp;</th>\n\t\t\t\t\t<th colspan=\"8\">Carriage returns removed in {{ayT 'CustomerNotes'}}</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\n\t\t\t<tbody>\n\t\t\t\t{{#each ayReportData}}\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"7\">{{Name}}</td>\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"7\">{{Notes}}</td>\n\t\t\t\t\t<td colspan=\"1\">&nbsp;</td>\n\t\t\t\t\t<td colspan=\"8\">{{NotesNoCarriage}}</td>\n\t\t\t\t</tr>\n\t\t\t\t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n\t\t\t\t{{/each}}\n\t\t\t</tbody>\n\t\t</table>\n\n\t\t<table><!-- remove or comment this out if no need to see printout of data returned from the custom Prepare -->\n            {{#each ayReportData}}\n          <tbody>\n\t\t\t  \t<tr>\n\t\t\t\t\t<td colspan=\"24\">&nbsp;</td>\n\t\t\t\t</tr>\n                <tr>\n                  <td colspan=\"24\">This is a printout of the data returned from the Custom Prepare that this report now uses, each \"group\" is an object instead of data from the \"Sample Data\".</td>\n                </tr>\n                <tr>\n\t\t\t        <td colspan=\"24\">{{ayJSON this}}</td>\n                </tr>\n          </tbody>\n          {{/each}}\n        </table>\n\t</div>\n</body>\n</html>","Style":"\r\n.singlePage\r\n{\r\npage-break-after: always;\r\n}\r\n\r\nbody {\r\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \r\n}\r\n\r\n.reporttitle {  \r\n  margin-bottom: 20pt; \r\n  font-weight: bold; \r\n  font-size: 13pt; \r\n  text-align: center;\r\n  color: #9e9e9e;\r\n} \r\n\r\n\r\ntable { \r\n  table-layout: fixed; \r\n  font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;\r\n  border-collapse: collapse;\r\n  white-space: pre-wrap;\r\n  font-size: 8pt;\r\n  width: 100%;\r\n    }\r\n\r\n\r\nth {\r\n  height: 30px;\r\n  text-align: left;\r\n  color: #9e9e9e;\r\n}\r\n\r\n\r\ntbody tr {\r\n  height: 10px;\r\n  word-wrap: break-word;\r\n}\r\n\r\ntbody tr:nth-child(even) {\r\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\r\n}\r\n\r\n\r\n.fontgreen {\r\n  color: green;\r\n}\r\n.fontblue {\r\n  color: blue;\r\n}\r\n.fontred {\r\n  color:red;\r\n}\r\n\r\n\r\n.rightlean {\r\n    text-align: right;\r\n}\r\n.leftlean {\r\n  text-align: left;\r\n}\r\n.centerlean {\r\n  text-align: center;\r\n}","JsPrerender":"async function ayPrepareData(ayData){  \n\n        await ayGetTranslations([ \"Customer\", \"CustomerNotes\" ]);\n\n    //for each Customer, if the General Notes field is NOT null, creates a new key NotesNoCarriage and puts into it the text from Notes replacing ANY carriage returns with a space, so all text is on same line(s)\n    for (const EachCU of ayData.ayReportData) {\n        if (EachCU.Notes != null) {\n            const n = EachCU.Notes;\n            EachCU.NotesNoCarriage = n.replace(/[\\n\\r]+/g, '  ');\n        }\n    }\n\n    return ayData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","FooterTemplate":"<span>&nbsp; </span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"20mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_report template name notes ayReportMetaData.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_report template name notes ayReportMetaData.ayrt
index caf40309..45a1d61d 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_report template name notes ayReportMetaData.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_report template name notes ayReportMetaData.ayrt	
@@ -1 +1 @@
-{"Name":"z_report template name notes ayReportMetaData","Active":true,"Notes":"Examples of displaying ayReportMetaData data such as this report template's name, this report template's notes","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays all of your ayReportMetaData :</th>\n               <td colspan=\"5\">{{ayJSON ../ayReportMetaData }}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays this report template's name as is - with the quotation marks:</th>\n               <td colspan=\"5\">{{ayJSON ../ayReportMetaData.Name}}</td>\n            </tr>\n             <tr>\n               <th colspan=\"5\">Column to the right displays this report template's name:</th>\n               <td colspan=\"5\">{{../ayReportMetaData.Name}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the notes for this report template:</th>\n               <td colspan=\"5\">{{../ayReportMetaData.Notes}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays where this report template is accessed from:</th>\n               <td colspan=\"5\">{{../ayReportMetaData.AType}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'Report'}} {{ayT 'ReportName'}}</th>\n               <th colspan=\"2\">{{ayT 'ReportNotes'}}</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>\n               {{else}}<td>no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../ayReportMetaData.Name}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               <td colspan=\"2\">{{ ../ayReportMetaData.Notes}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"ReportNotes\", \"ReportName\", \"Report\"  ]);\n\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_report template name notes ayReportMetaData","Active":true,"Notes":"Examples of displaying ayReportMetaData data such as this report template's name, this report template's notes","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays all of your ayReportMetaData :</th>\n               <td colspan=\"5\">{{ayJSON ../ayReportMetaData }}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays this report template's name as is - with the quotation marks:</th>\n               <td colspan=\"5\">{{ayJSON ../ayReportMetaData.Name}}</td>\n            </tr>\n             <tr>\n               <th colspan=\"5\">Column to the right displays this report template's name:</th>\n               <td colspan=\"5\">{{../ayReportMetaData.Name}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays the notes for this report template:</th>\n               <td colspan=\"5\">{{../ayReportMetaData.Notes}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays where this report template is accessed from:</th>\n               <td colspan=\"5\">{{../ayReportMetaData.AType}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'Report'}} {{ayT 'ReportName'}}</th>\n               <th colspan=\"2\">{{ayT 'ReportNotes'}}</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}}<td colspan=\"2\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../ayReportMetaData.Name}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               <td colspan=\"2\">{{ ../ayReportMetaData.Notes}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"ReportNotes\", \"ReportName\", \"Report\"  ]);\n\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child grandchild.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child grandchild.ayrt
index 81197443..1b076a76 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child grandchild.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child grandchild.ayrt	
@@ -1 +1 @@
-{"Name":"z_table layout parent child grandchild","Active":true,"Notes":"","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\n\t<p>Examples within this report template of how to access showing parent (i.e. property of the Work Order) child (i.e. property of the Work Order Item) and grandchild (property of Labor) all on same row</p>\n\t<table><!--beginning of your table-->\n\n\t<thead><!-- this indicates start of your table header section -->\n\t\t<tr><!-- this indicates start of one row in your thead -->\n\t\t\t<th>{{ayT 'WorkOrder'}}</th> <!-- The text in <th> elements are bold and centered by default, can also override by setting specifics in your CSS  -->\n\t\t\t<th>{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n\t\t\t<th>{{ayT 'WorkOrderItemLaborServiceStartDate'}}</th>\n\t\t\t<th>{{ayT 'AuthorizationRoleTech'}}</th>\n\t\t</tr><!-- this indicates end of that one row in your thead -->\n\t</thead><!-- this indicates end of your table header section -->\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each WO) in your Sample Data -->\n\t<!-- if want the header repeated for every WO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t{{#each Items}} <!-- this #each encompasses the area that repeats for each Child object (i.e. each Work Order Item) in your Sample Data -->\n\t\t\t{{#each Labors}}\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td class=\"centerlean\">{{../../Serial}}</td> <!-- note the ../../ in front of the Property name in the mustache to display a value from a property two 'levels' up - in this case the Work Order Number-->\n\t\t\t\t<td>{{../WorkOrderItemStatusNameViz}}</td> <!--use a ../ in front of the Property name in the mustache to display a value from a property one 'level' up - in this case the WorkorderItem Status -->\n\t\t\t\t<td class=\"fontgreen\">{{ayDateTime ServiceStartDate}}</td><!-- where for a Labor property, just use the Property name within the mustaches-->\n\t\t\t\t<td>{{UserViz}}</td><!-- where for a Labor property, just use the Property name within the mustaches-->\n\t\t\t</tr>\n\t\t\t{{/each}}<!-- this closes the emcompassed area that repeats for the GrandChild object (i.e. each Labor) in your Sample Data -->\n\t\t{{/each}}<!-- this closes the emcompassed area that repeats for the Child object (i.e. each Work Order Item) in your Sample Data -->\t\t\n\t</tbody>\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each WO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td>footer stuff 1</td>\n\t\t\t<td colspan=\"2\">expands across two columns with or without having to have text</td><!-- this inline colspan spans multiple columns -->\n\t\t\t<td>footer stuff 3</td>\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: lightsteelblue;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; /* the # of columns set in the first row of the thead will be fixed and applied throughout table and rows */\n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  color: #9e9e9e;\n  font-size: 11pt;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"WorkOrder\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemLaborServiceStartDate\", \"AuthorizationRoleTech\" ]);\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_table layout parent child grandchild","Active":true,"Notes":"","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\n\t<p>Examples within this report template of how to access showing parent (i.e. property of the Work Order) child (i.e. property of the Work Order Item) and grandchild (property of Labor) all on same row</p>\n\t<table><!--beginning of your table-->\n\n\t<thead><!-- this indicates start of your table header section -->\n\t\t<tr><!-- this indicates start of one row in your thead -->\n\t\t\t<th>{{ayT 'WorkOrder'}}</th> <!-- The text in <th> elements are bold and centered by default, can also override by setting specifics in your CSS  -->\n\t\t\t<th>{{ayT 'WorkOrderItemWorkOrderStatusID'}}</th>\n\t\t\t<th>{{ayT 'WorkOrderItemLaborServiceStartDate'}}</th>\n\t\t\t<th>{{ayT 'AuthorizationRoleTech'}}</th>\n\t\t</tr><!-- this indicates end of that one row in your thead -->\n\t</thead><!-- this indicates end of your table header section -->\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each WO) in your Sample Data -->\n\t<!-- if want the header repeated for every WO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t{{#each Items}} <!-- this #each encompasses the area that repeats for each Child object (i.e. each Work Order Item) in your Sample Data -->\n\t\t\t{{#each Labors}}\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td class=\"centerlean\">{{../../Serial}}</td> <!-- note the ../../ in front of the Property name in the mustache to display a value from a property two 'levels' up - in this case the Work Order Number-->\n\t\t\t\t<td>{{../WorkOrderItemStatusNameViz}}</td> <!--use a ../ in front of the Property name in the mustache to display a value from a property one 'level' up - in this case the WorkorderItem Status -->\n\t\t\t\t<td class=\"fontgreen\">{{ayDateTime ServiceStartDate}}</td><!-- where for a Labor property, just use the Property name within the mustaches-->\n\t\t\t\t<td>{{UserViz}}</td><!-- where for a Labor property, just use the Property name within the mustaches-->\n\t\t\t</tr>\n\t\t\t{{/each}}<!-- this closes the emcompassed area that repeats for the GrandChild object (i.e. each Labor) in your Sample Data -->\n\t\t{{/each}}<!-- this closes the emcompassed area that repeats for the Child object (i.e. each Work Order Item) in your Sample Data -->\t\t\n\t</tbody>\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each WO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td>footer stuff 1</td>\n\t\t\t<td colspan=\"2\">expands across two columns with or without having to have text</td><!-- this inline colspan spans multiple columns -->\n\t\t\t<td>footer stuff 3</td>\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: lightsteelblue;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  color: #9e9e9e;\n  font-size: 11pt;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"WorkOrder\", \"WorkOrderItemWorkOrderStatusID\", \"WorkOrderItemLaborServiceStartDate\", \"AuthorizationRoleTech\" ]);\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child.ayrt
index 3220ff8a..35251928 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_table layout parent child.ayrt	
@@ -1 +1 @@
-{"Name":"z_table layout parent child","Active":true,"Notes":"Example of displaying a Parent value (i.e. PO record) when the #each references a Child (i.e. POItem record), use a ../ in front of the Property name in the mustaches","Roles":124927,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\t<table><!--beginning of your table-->\n\n\t<thead><!-- this indicates start of your table header section -->\n\t\t<tr><!-- this indicates start of one row in your thead -->\n\t\t\t<th>column header 1</th> <!-- The text in <th> elements are bold and centered by default, can also override by setting specifics in your CSS  -->\n\t\t\t<th>column header 2</th>\n\t\t\t<th>column header 3</th>\n\t\t\t<th>{{ayT 'PurchaseOrderItemSerialNumbers'}}</th>\n\t\t</tr><!-- this indicates end of that one row in your thead -->\n\t</thead><!-- this indicates end of your table header section -->\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each PO) in your Sample Data -->\n\t<!-- if want the header repeated for every PO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t{{#each Items}} <!-- this #each encompasses the area that repeats for each Child object (i.e. each PO Item) in your Sample Data -->\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td>{{ayT 'PurchaseOrder'}} {{../Serial}}</td> <!-- when the #each references a Child, use a ../ in front of the Property name in the mustaches to display a Parent value  -->\n\t\t\t\t<td class=\"fontgreen\">{{ayT 'PurchaseOrderItemPartNumber'}} {{PartNameViz}}</td> <!-- to display a value when the #each references a Child, encompass the Property name in mustaches -->\n\t\t\t\t<td>{{ayT 'PurchaseOrderItemQuantityOrdered'}} {{QuantityOrdered}}</td><!-- The text in <td> elements are regular and left-aligned by default, or  set specifics in your CSS -->\n\t\t\t\t<td>{{Serials}}</td><!-- in this specific instance, Serials with an S refers to the serials received for that PO Item -->\n\t\t\t</tr>\n\t\t{{/each}}<!-- this closes the emcompassed area that repeats for each Child object (i.e. each PO Item) in your Sample Data -->\t\t\n\t</tbody><!-- this indicates end of your table body section -->\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each PO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td>footer stuff 1</td>\n\t\t\t<td colspan=\"2\">expands across two columns with or without having to have text</td><!-- this inline colspan spans multiple columns -->\n\t\t\t<td>footer stuff 3</td>\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: pink;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; /* the # of columns set in the first row of the thead will be fixed and applied throughout table and rows */\n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 13pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"PurchaseOrder\", \"PurchaseOrderItemPartNumber\", \"PurchaseOrderItemQuantityOrdered\", \"PurchaseOrderItemSerialNumbers\" ]);\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_table layout parent child","Active":true,"Notes":"Example of displaying a Parent value (i.e. PO record) when the #each references a Child (i.e. POItem record), use a ../ in front of the Property name in the mustaches","Roles":124927,"AType":26,"IncludeWoItemDescendants":false,"Template":"<html>\n<body>\t\n\t<table><!--beginning of your table-->\n\n\t<thead><!-- this indicates start of your table header section -->\n\t\t<tr><!-- this indicates start of one row in your thead -->\n\t\t\t<th>column header 1</th> <!-- The text in <th> elements are bold and centered by default, can also override by setting specifics in your CSS  -->\n\t\t\t<th>column header 2</th>\n\t\t\t<th>column header 3</th>\n\t\t\t<th>{{ayT 'PurchaseOrderItemSerialNumbers'}}</th>\n\t\t</tr><!-- this indicates end of that one row in your thead -->\n\t</thead><!-- this indicates end of your table header section -->\n\n\t{{#each ayReportData}}<!-- this #each encompasses the area that repeats for each object (i.e. each PO) in your Sample Data -->\n\t<!-- if want the header repeated for every PO, the #each to encompass the thead area too, otherwise encompass the tbody  -->\t\n\t<tbody>\t<!-- this indicates start of your table body section -->\t\n\t\t{{#each Items}} <!-- this #each encompasses the area that repeats for each Child object (i.e. each PO Item) in your Sample Data -->\n\t\t\t<tr><!-- this indicates start of one row in your tbody -->\n\t\t\t\t<td>{{ayT 'PurchaseOrder'}} {{../Serial}}</td> <!-- when the #each references a Child, use a ../ in front of the Property name in the mustaches to display a Parent value  -->\n\t\t\t\t<td class=\"fontgreen\">{{ayT 'PurchaseOrderItemPartNumber'}} {{PartNameViz}}</td> <!-- to display a value when the #each references a Child, encompass the Property name in mustaches -->\n\t\t\t\t<td>{{ayT 'PurchaseOrderItemQuantityOrdered'}} {{QuantityOrdered}}</td><!-- The text in <td> elements are regular and left-aligned by default, or  set specifics in your CSS -->\n\t\t\t\t<td>{{Serials}}</td><!-- in this specific instance, Serials with an S refers to the serials received for that PO Item -->\n\t\t\t</tr>\n\t\t{{/each}}<!-- this closes the emcompassed area that repeats for each Child object (i.e. each PO Item) in your Sample Data -->\t\t\n\t</tbody><!-- this indicates end of your table body section -->\n\t{{/each}}<!-- this closes the emcompassed area that repeats for each object (i.e. each PO) in your Sample Data -->\n\n\t<tfoot class=\"footertext\"><!-- this applies specific CSS class attributes to all of tfoot and its td's -->\n\t\t<tr>\n\t\t\t<td>footer stuff 1</td>\n\t\t\t<td colspan=\"2\">expands across two columns with or without having to have text</td><!-- this inline colspan spans multiple columns -->\n\t\t\t<td>footer stuff 3</td>\n\t\t</tr>\n\t</tfoot><!-- this indicates end of your table footer section -->\t\n\n\t</table><!-- end of your table-->\t\n\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\n.footertext {\n  font-size: 14pt;\n  font-style: italic;\n  background-color: pink;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 13pt; \n  color: #9e9e9e;\n  text-align: center;\n} \n\ntable { \n  border-collapse: collapse;\n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  border-bottom: solid 1pt #9e9e9e;\n  height: 50px;\n  font-size: 13pt; \n  color: #9e9e9e;\n}\n\ntbody td {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n    await ayGetTranslations([\"PurchaseOrder\", \"PurchaseOrderItemPartNumber\", \"PurchaseOrderItemQuantityOrdered\", \"PurchaseOrderItemSerialNumbers\" ]);\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span style=\"font-size:6pt;width: 94%; text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;Todays date:&nbsp; <span class=\"date\"></span>&nbsp; set in PDF Options</span>","FooterTemplate":"<span style=\"font-size:6pt;width: 94%; text-align: right; \">&nbsp; set in PDF Options&nbsp;&nbsp;Page&nbsp;<span class=\"pageNumber\"></span>&nbsp;of&nbsp;<span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":false,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"10mm","MarginOptionsRight":"10mm","MarginOptionsTop":"15mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
diff --git a/server/AyaNova/resource/rpt/stock-report-templates/z_user logged in TimeZone Currency  ayClientMetaData.ayrt b/server/AyaNova/resource/rpt/stock-report-templates/z_user logged in TimeZone Currency  ayClientMetaData.ayrt
index 61dfa456..9706ea8e 100644
--- a/server/AyaNova/resource/rpt/stock-report-templates/z_user logged in TimeZone Currency  ayClientMetaData.ayrt	
+++ b/server/AyaNova/resource/rpt/stock-report-templates/z_user logged in TimeZone Currency  ayClientMetaData.ayrt	
@@ -1 +1 @@
-{"Name":"z_user logged in TimeZone Currency  ayClientMetaData","Active":true,"Notes":"Examples of displaying ayClientMetaData data such as logged in username, TimeZone name, Currency name, PDFDate, PDFTime","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays all of your ayClientMetaData :</th>\n               <td colspan=\"5\">{{ayJSON ../ayClientMetaData }}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your AyaNova logged in user name as is - with the quotation marks:</th>\n               <td colspan=\"5\">{{ayJSON ../ayClientMetaData.UserName}}</td>\n            </tr>\n             <tr>\n               <th colspan=\"5\">Column to the right displays your AyaNova logged in user name:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.UserName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your TimeZone:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.TimeZoneName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your logged in currency:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.CurrencyName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your date and time:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.PDFDate}} {{../ayClientMetaData.PDFTime}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'User'}}</th>\n               <th colspan=\"2\">{{ayT 'DefaultLanguage'}}</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>\n               {{else}}<td>no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../ayClientMetaData.UserName}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               <td colspan=\"2\">{{ ../ayClientMetaData.LanguageName}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"User\", \"DefaultLanguage\"  ]);\n\n\t\n\n    return reportData;\n}","JsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file
+{"Name":"z_user logged in TimeZone Currency  ayClientMetaData","Active":true,"Notes":"Examples of displaying ayClientMetaData data such as logged in username, TimeZone name, Currency name, PDFDate, PDFTime","Roles":50538,"AType":34,"IncludeWoItemDescendants":false,"Template":"<html>\n\n<body>\n   <div>\n{{#each ayReportData}}\n      <table class=\"singlePage\">  <!--this class causes a page break for each object - for each work order -->\n         <thead>\n            <tr>\n               <th colspan=\"5\">Column to the right displays all of your ayClientMetaData :</th>\n               <td colspan=\"5\">{{ayJSON ../ayClientMetaData }}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your AyaNova logged in user name as is - with the quotation marks:</th>\n               <td colspan=\"5\">{{ayJSON ../ayClientMetaData.UserName}}</td>\n            </tr>\n             <tr>\n               <th colspan=\"5\">Column to the right displays your AyaNova logged in user name:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.UserName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your TimeZone:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.TimeZoneName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your logged in currency:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.CurrencyName}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"5\">Column to the right displays your date and time:</th>\n               <td colspan=\"5\">{{../ayClientMetaData.PDFDate}} {{../ayClientMetaData.PDFTime}}</td>\n            </tr>\n            <tr>\n               <th colspan=\"10\">&nbsp;</th>\n            </tr>\n            <tr>\n               <th colspan=\"2\">{{ayT 'WorkOrder'}}</th>\n               <th colspan=\"2\">{{ayT 'Customer'}}</th>\n               <th colspan=\"2\">{{ayT 'WorkOrderServiceDate'}}</th>\n               <th colspan=\"2\">{{ayT 'User'}}</th>\n               <th colspan=\"2\">{{ayT 'DefaultLanguage'}}</th>\n            </tr>\n         </thead>\n\n        \n         <tbody>           \n            <tr>\n               <td colspan=\"2\">{{Serial}}</td>\n               <td colspan=\"2\">{{CustomerViz}}</td>\n               {{#if ServiceDate }}<td colspan=\"2\">{{ayDate ServiceDate}}</td>{{else}}<td colspan=\"2\">no Service Date specified</td>{{/if}}\n               <td colspan=\"2\">{{../ayClientMetaData.UserName}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n               <td colspan=\"2\">{{ ../ayClientMetaData.LanguageName}}</td><!-- note the use of prefixing two periods and a slash if wish to display with the 'each' -->\n            </tr>            \n         </tbody> \n         \n\n      </table>\n{{/each}}\n   </div>\n</body>\n</html>","Style":".singlePage\n{\npage-break-after: always;\n}\n\nbody {\n  font-family: 'Helvetica',  'Helvetica Neue',  Arial,  sans-serif; \n}\n\n.reporttitle {  \n  margin-bottom: 20pt; \n  font-weight: bold; \n  font-size: 11pt; \n  color: #9e9e9e;\n} \n\ntable, td, th {\n  border: 1px solid black;\n}\n\ntable { \n  white-space: pre-wrap;\n  width: 100%;\n  table-layout: fixed; \n    }\n\nth {\n  /* border-bottom: solid 1pt #9e9e9e; */\n  height: 30px;\n  font-size: 9pt; \n  color: #9e9e9e;\n}\n\ntd {\n  padding: 10px;\n  word-wrap: break-word;\n  font-size: 9pt;\n  text-align: center;\n}\n\n\ntbody tr:nth-child(even) {\n        background-color: #f8f8f8; /* MUST checkmark Print background in PDF Options for this to show */\n}\n\n\n.rightlean {\n    text-align: right;\n}\n.leftlean {\n  text-align: left;\n}\n.centerlean {\n  text-align: center;\n}\n\n\n.fontgreen {\n  color: green;\n}\n.fontblue {\n  color: blue;\n}\n.fontred {\n  color:red;\n}\n\n","JsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n\n\tawait ayGetTranslations([\"WorkOrder\", \"Customer\", \"WorkOrderServiceDate\", \"User\", \"DefaultLanguage\"  ]);\n\n\t\n\n    return reportData;\n}","JsHelpers":"","RenderType":0,"HeaderTemplate":"<span>&nbsp; </span>","FooterTemplate":"<span style=\"font-size:6pt; width: 96%;text-align:left; \">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; Printed date: PDFDate</span>\n<span style=\"font-size:6pt;width: 96%; text-align: right; \">Page <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;</span>","DisplayHeaderFooter":true,"PaperFormat":10,"Landscape":true,"MarginOptionsBottom":"15mm","MarginOptionsLeft":"15mm","MarginOptionsRight":"15mm","MarginOptionsTop":"10mm","PageRanges":null,"PreferCSSPageSize":false,"PrintBackground":true,"Scale":1.00000}
\ No newline at end of file