commit 60ef1985621c71452eabcc222e51e67cde56d8d9
Merge: 76c119a7e c9523dfd4
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Oct 16 08:08:06 2025 -0400

    Merge pull request #3107 from trackabout/df/0357/new-manifest-line-items
    
    AB#5986 / AB#5990 - Truck Manifest - Roll up line items

commit 76c119a7ebc00cd9467202388afe0d627c64b565
Merge: 2c05bc3bc 51447e7dc
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Oct 15 16:56:40 2025 -0500

    Merge pull request #3106 from trackabout/df/0357/new-manifest-line-items
    
    AB#5986 - Fallback from "full" product code tags.

commit 2c05bc3bc70142bd355cb30c4a7a7af9dc0fafcf
Merge: c52c92fcc 1036f1534
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Oct 15 16:33:38 2025 -0500

    Merge pull request #3102 from trackabout/df/0357/new-manifest-line-items
    
    AB#5986 - Truck Manifest - Adds Full Product Code Line Items

commit c52c92fccde6b1d419d2a3275f00cdb973409070
Merge: cf7bb34a3 a461382bf
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Oct 15 15:58:32 2025 -0500

    Merge pull request #3104 from trackabout/js/357/fix-html-formatted-text
    
    AB-3445, fix 1: remove javascript from HTML print documents that are saved to the server

commit cf7bb34a3e95ec46885de938c553bff7bb77fb91
Merge: 981066bd1 0588ed9c0
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Oct 15 10:50:51 2025 -0400

    Merge pull request #3099 from trackabout/js/357/ignore-EOL-warnings
    
    Temporarily ignore end-of-life errors for .NET 8 builds

commit 981066bd14358eaaf6703d16dde75e8e82f78a3c
Merge: 6de858709 7c5630f4a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Oct 14 08:57:29 2025 -0500

    Merge pull request #3075 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit 6de858709c6ef7def7ec86af0cbb5b4a6df5d85b
Merge: ad6c3b152 d90123736
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 13 19:06:01 2025 -0400

    Merge pull request #3089 from trackabout/js/357/ab-3445-6-reorganize-resource-folders
    
    AB-3445, part 6: reorganize print document resource folders

commit ad6c3b15266beba4f82c2f80623ed2f6a72a7d66
Merge: fe156dbb6 bf432160a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Oct 13 16:56:35 2025 -0500

    Merge pull request #3088 from trackabout/js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts
    
    AB-3445, part 5: bonus fix - add proper shipping name (TAM7)

commit fe156dbb696055730a50bb11a43638cb6680aae2
Merge: 9886bdf20 6bbe12e5c
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Oct 13 16:48:10 2025 -0500

    Merge pull request #3087 from trackabout/js/357/ab-3445-4-add-generic-action-printing
    
    AB-3445, Printing for generic actions, part 4: add generic action printing (TAM7)

commit 9886bdf207656fc16021ef1fef2290f24d24a211
Merge: 0c30c3a28 39b2e5fee
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Oct 13 14:55:34 2025 -0500

    Merge pull request #3086 from trackabout/js/357/ab-3445-3-refactor-printing-code
    
    AB-3445, Printing for generic actions, Part 3: refactor printing code (TAM7)

commit 0c30c3a2821b65ffb56ba35cd33c605ae2254e2c
Merge: 781b6fc17 b58e714e3
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Oct 13 13:36:10 2025 -0500

    Merge pull request #3085 from trackabout/js/357/ab-3445-2-rename-and-reorganize-printing-code
    
    AB-3445, Printing for generic actions, Part 2: rename and reorganize printing code (TAM7)

commit 781b6fc17bc548d35c619a5dd894b371eac4a004
Merge: 5eac6ec35 9c1c0377b
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Oct 13 13:27:36 2025 -0500

    Merge pull request #3084 from trackabout/js/357/ab-3445-1-add-print-document-regression-tests
    
    AB-3445, Printing for generic actions, Part 1: add print document regression tests (TAM7)

commit 5e8fe3203b1ddb630422697f658ea60e80be85b0
Merge: 9c2733281 bf432160a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 13 09:23:37 2025 -0400

    Merge branch 'js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts' into js/357/ab-3445-6-reorganize-resource-folders

commit bf432160a20fd352f63e9d8364cd3d30b72bf0da
Merge: b4e534e2a 6bbe12e5c
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 13 09:23:01 2025 -0400

    Merge branch 'js/357/ab-3445-4-add-generic-action-printing' into js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts

commit 5eac6ec35ec20f7b90a7c0d2936e4de8cae685a2
Merge: f76af2d7e e465b7bb0
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Oct 13 08:21:33 2025 -0400

    Merge pull request #3083 from trackabout/df/0357/ab-5304-pod-show-line-item-comments
    
    AB#5904 / AB#5972 - Line Item Comment Clean Up

commit 9c2733281fb66c96f5a63e43e56382d08e4f6f55
Merge: 86b076a83 b4e534e2a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 17:00:54 2025 -0400

    Merge branch 'js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts' into js/357/ab-3445-6-reorganize-resource-folders

commit b4e534e2aebd24ac937de468ad210fd0ebbfdaf2
Merge: 11df6934d 1a88d02a8
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 17:00:01 2025 -0400

    Merge branch 'js/357/ab-3445-4-add-generic-action-printing' into js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts

commit 11df6934d532f044fcee92aeca81ca636646bff0
Merge: 69f478f2d 8d92dd6a8
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 16:30:35 2025 -0400

    Merge branch 'js/357/ab-3445-4-add-generic-action-printing' into js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts

commit 8d92dd6a8301510b7e5f95efd6cdadf4efb32bc4
Merge: 81fb62964 39b2e5fee
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 16:29:23 2025 -0400

    Merge branch 'js/357/ab-3445-3-refactor-printing-code' into js/357/ab-3445-4-add-generic-action-printing
    
    # Conflicts:
    #       TrackAbout.Mobile.Test.Integration/Resources/HtmlPrinting/RecentPayments/ExpectedResults/reference_results.html
    #       TrackAbout.Mobile.Test.Integration/Resources/HtmlPrinting/RecentPayments/Templates/reference_template.txt

commit b58e714e3805d2db84233ac582caeabc170dc66d
Merge: 4951eed85 9c1c0377b
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 16:18:46 2025 -0400

    Merge branch 'js/357/ab-3445-1-add-print-document-regression-tests' into js/357/ab-3445-2-rename-and-reorganize-printing-code
    
    # Conflicts:
    #       TrackAbout.Mobile.Test.Integration/Infrastructure/HtmlPrinting/RecentPayments/RecentPaymentsHtmlPopulatorRegressionSpecs.cs

commit 86b076a836a37c783621ad75eb479ec24e986aca
Merge: 26170d39a 69f478f2d
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 11:05:28 2025 -0400

    Merge branch 'js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts' into js/357/ab-3445-6-reorganize-resource-folders

commit 26170d39a0b5fd1a5b32d7958f819ffa75265c9b
Merge: 2011a75b4 7cf47aab7
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 11:00:43 2025 -0400

    Merge branch 'js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts' into js/357/ab-3445-6-reorganize-resource-folders

commit 7cf47aab7a69d469320925a462cead14f119fa1c
Merge: 390a98bf6 81fb62964
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 12 11:00:26 2025 -0400

    Merge branch 'js/357/ab-3445-4-add-generic-action-printing' into js/357/ab-3445-5-add-proper-shipping-tag-to-delivery-receipts

commit 365aa7c7ee3986eb112375c505e9d92c9235c0fe
Merge: cf7d61d7e 4951eed85
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Oct 10 13:31:03 2025 -0400

    Merge branch 'js/357/ab-3445-2-rename-and-reorganize-printing-code' into js/357/ab-3445-3-refactor-printing-code
    
    # Conflicts:
    #       TrackAbout.Mobile.Test.Unit/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTemplateParserSpecs.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNoteReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNotesTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/DynamicFormFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/DynamicFormSignatureFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/IReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/IReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/ReceiptService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateTagFactory.cs
    #       TrackAbout.Mobile/UI/Controllers/ConfigureReceiptPrinterController.cs

commit c5334e8b06bd8962be9d9a0a3f34bda6676935f6
Merge: cf7d61d7e 542db01aa
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Oct 8 21:08:54 2025 -0400

    Merge branch 'js/357/ab-3445-5-generic-action-printing' into js/357/X-ab-3445-3-generic-action-printing

commit cf7d61d7e46e073c0a24738792e67d54b019d8fe
Merge: 44a5cebea b61bb445a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Oct 8 21:06:23 2025 -0400

    Merge branch 'js/357/ab-3445-4-html-populator-refactoring' into js/357/X-ab-3445-2-refactoring
    
    # Conflicts:
    #       TrackAbout.Mobile.Test.Integration/Infrastructure/Printing/ReceiptPrinting/TemplateDocumentServiceRegressionSpecs.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTemplateDocumentPopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/ITemplateDocumentPopulator.cs
    #       TrackAbout.Mobile/UI/Actions/CustomerAuditAction.cs
    #       TrackAbout.Mobile/UI/Actions/TruckLoadInventoryAction.cs

commit 44a5cebeac3420029029ccb76e4e2b570f62f58d
Merge: 34e1e5d67 4bad36aa9
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Oct 8 17:38:56 2025 -0400

    Merge branch 'js/357/ab-3445-3-common-tag-retrieval' into js/357/X-ab-3445-2-refactoring
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTagValueRetriever.cs

commit 34e1e5d678ffc389be8e5e8a8488e9fec8d52e25
Merge: b55529af1 770cfc12b
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Oct 8 17:32:10 2025 -0400

    Merge branch 'js/357/ab-3445-2-renaming' into js/357/X-ab-3445-2-refactoring
    
    # Conflicts:
    #       TrackAbout.Mobile.Test.Integration/Infrastructure/ThermalPrinting/Delivery/TemplateDocumentServiceRegressionSpecs.cs
    #       TrackAbout.Mobile.Test.Unit/Infrastructure/Printing/ReceiptPrinting/TemplateEngine/TemplateParserSpecs.cs
    #       TrackAbout.Mobile.Test.Unit/Infrastructure/Printing/ReceiptPrinting/TemplateEngine/TruckManifestTemplateParserSpecs.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/CustomerAuditReceipts/CustomerAuditTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/CustomerAuditReceipts/CustomerAuditTemplateTagContextRepository.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/DeliveryReceipts/IDynamicFormFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/DeliveryReceipts/TemplateEngine/DeliveryReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/DeliveryReceipts/TemplateEngine/DeliveryReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptTemplateTagContextRepository.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditTemplateTagContextRepository.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/ConditionalTagProcessor.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTemplateDocumentFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTemplateDocumentPopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/IDynamicFormFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNoteReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNotesTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNotesTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/LotLabels/LabelTemplateDocumentPopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/LotLabels/LabelTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsHtmlTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsTemplateTagContextRepository.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTemplateDocumentFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTemplateOverrideProcessor.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/LotLabels/LabelTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/PrintDocument.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/PrintDocumentFormat.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/PrinterWriterFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/ReceiptPrinting/IReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Html/DynamicFormFieldHtmlTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/ITemplateDocumentPopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/ITemplateTagContextRepository.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/DynamicFormFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/DynamicFormSignatureFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/IDynamicFormFieldTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/IReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/IReceiptTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/ImageTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/ListOfPrintableLineExtensions.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/LogoTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/PrintLayoutEngine.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/PrintableBarcode.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/PrintableImage.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/PrintableLine.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/ReceiptService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/SignatureTemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/StandardAssetFormatter.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateDetails.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateDocument.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateOverrideProcessor.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateParser.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateTag.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateTagFactory.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateTagTypesExtensions.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Thermal/TemplateTagWithDelimiter.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/TruckManifest/TemplateEngine/TruckManifestReceiptTemplateFactory.cs
    #       TrackAbout.Mobile/IoC.cs
    #       TrackAbout.Mobile/UI/Actions/BaseDeliveryAction.cs
    #       TrackAbout.Mobile/UI/Actions/CustomerAuditAction.cs
    #       TrackAbout.Mobile/UI/Actions/DeliveryAction.cs
    #       TrackAbout.Mobile/UI/Controllers/BaseController.cs
    #       TrackAbout.Mobile/UI/Controllers/ConfigureReceiptPrinterController.cs
    #       TrackAbout.Mobile/UI/Controllers/PrintMultipleReceiptsController.cs
    #       TrackAbout.Mobile/UI/Services/DatabaseSyncService.cs

commit 542db01aafe96378ba65644afc6bfdef68fc6a72
Merge: 0a4cc169f b61bb445a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Oct 7 15:34:22 2025 -0400

    Merge branch 'js/357/ab-3445-4-html-populator-refactoring' into js/357/ab-3445-5-generic-action-printing
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/BaseDeliveryHtmlDocumentService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptTemplateDocumentPopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNotesTemplateDocumentPopulator.cs

commit 55d3601fd0b658246ffbca4de836f3322b9f7b5a
Merge: e922817ad e29ec474a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Oct 7 12:15:28 2025 -0400

    Merge branch 'js/357/ab-3445-4-html-populator-refactoring' into js/357/ab-3445-5-generic-action-printing

commit 69ad4b9d55e4e1107ff551910420af09ba8a185e
Merge: 2d8310626 6d1c35d39
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 6 19:11:38 2025 -0400

    Merge branch 'js/357/ab-3445-4-html-populator-refactoring' into js/357/ab-3445-5-generic-action-printing

commit 6d1c35d394c2911fd1b52f78b840544cf2e2d871
Merge: d69cd25bb 4bad36aa9
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 6 19:11:02 2025 -0400

    Merge branch 'js/357/ab-3445-3-common-tag-retrieval' into js/357/ab-3445-4-html-populator-refactoring
    
    # Conflicts:
    #       TrackAbout.Mobile/Core/Services/ActionsService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/CustomerAudit/CustomerAuditReceiptPrintDocumentService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryActionHtmlTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptHtmlTemplatePopulator.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/DeliveryReceiptPrintDocumentService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/Delivery/PaymentNotesPrintDocumentService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/RecentPayments/RecentPaymentsReceiptPrintDocumentService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Documents/TruckLoadInventory/TruckManifestPrintDocumentService.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Actions/Delivery/DeliveryReceiptHtmlTemplatePopulator.cs
    #       TrackAbout.Mobile/UI/Actions/BaseDeliveryAction.cs
    #       TrackAbout.Mobile/UI/Actions/CustomerAuditAction.cs
    #       TrackAbout.Mobile/UI/Actions/DeliveryAction.cs
    #       TrackAbout.Mobile/UI/Actions/TruckLoadInventoryAction.cs

commit 4bad36aa9b70ac17fc4569aa226de800f385a356
Merge: a6a62203f 770cfc12b
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 6 18:57:01 2025 -0400

    Merge branch 'js/357/ab-3445-2-renaming' into js/357/ab-3445-3-common-tag-retrieval

commit 00fa650ed6bdfbe2999cf42ab098727b7d8be815
Merge: f03e487f0 d69cd25bb
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 6 18:32:28 2025 -0400

    Merge branch 'js/357/ab-3445-4-html-populator-refactoring' into js/357/ab-3445-5-generic-action-printing

commit f03e487f0cf91d057a9f37f2cb30d3fd40027e46
Merge: 49892a2b9 8a8e81864
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Oct 6 13:12:36 2025 -0400

    Merge branch 'js/357/ab-3445-4-html-populator-refactoring' into js/357/ab-3445-5-generic-action-printing
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/Actions/CustomerAudit/CustomerAuditReceiptTagValueRetriever.cs
    #       TrackAbout.Mobile/Infrastructure/Printing/Templates/CommonTagValueSource.cs

commit c8c8752b6609d56986c83fdda58839132fa8e739
Merge: 3542b8637 1a82d09f5
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Sun Oct 5 10:52:28 2025 -0400

    Merge branch 'js/357/ab-3445-3-common-tag-retrieval' into js/357/ab-3445-4-generic-action-printing

commit 3542b86377064c63508e69e65b610bf33a11a673
Merge: 8c1346afc 9a5fa28de
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Oct 3 12:05:35 2025 -0400

    Merge branch 'js/357/ab-3445-2-renaming' into js/357/ab-3445-3-new-feature

commit f76af2d7ed7953dce019ae6bcc0ee38146f8c969
Merge: 03d5da38e f93e2275a
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Oct 3 09:16:03 2025 -0400

    Merge pull request #3074 from trackabout/df/0357/ab-5304-pod-show-line-item-comments
    
    AB#5904 - Enables line-item comments on various pages.

commit 7c5630f4af21ea810975cab8dbe85afb7dbbee3e
Merge: 0491d612e 03d5da38e
Author: Simon Digon <93137946+SimonDigon@users.noreply.github.com>
Date:   Thu Oct 2 14:10:43 2025 -0400

    Merge pull request #3073 from trackabout/client-test
    
    Update Production with Latest Client Test after 357 Release

commit 846b9619846f22ae91c41a956332c9b08b41e7a3
Merge: 21c94f604 03d5da38e
Author: Simon Digon <93137946+SimonDigon@users.noreply.github.com>
Date:   Wed Sep 24 13:09:33 2025 -0400

    Merge pull request #3070 from trackabout/client-test
    
    Update QA with Latest Client Test for 357.1 Release

commit 03d5da38ef2f5d8d9aaf4a4bd04104fe3d4d9ed3
Merge: e0416df7b c412aea47
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Mon Sep 22 13:44:04 2025 -0500

    Merge pull request #3068 from trackabout/mk/ab-5810
    
    AB#5810 Printed Manifest Retention

commit 21c94f60408826ad702da379c165597ed71d5337
Merge: ece7f7a9e e0416df7b
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Sep 18 09:09:27 2025 -0500

    Merge pull request #3067 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit e0416df7b78d72f7c2c2ebb1810fb4807cd6b8c8
Merge: 43df95a13 ece7f7a9e
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Sep 17 15:54:45 2025 -0400

    Merge pull request #3066 from trackabout/qa
    
    Update CT with Latest QA for 357 Release

commit 43df95a1374ed003d6a1bc0016456bc6be64a8cf
Merge: 148e1d7ed 0491d612e
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Sep 17 13:50:03 2025 -0500

    Merge pull request #3056 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit 0491d612e6f7839c19f4cc90ee6b7818aee95559
Merge: 5bb3d583e cd4b5dc74
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Sep 17 10:14:57 2025 -0500

    Merge pull request #3065 from trackabout/st/AB-5712-Fix
    
    AB 5712, AB 5589 - Fixes for Load and Unload Truck Updates

commit 5bb3d583e9596e9c763047fec1181394cc934d93
Merge: 5c913c9cb e3056f110
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Sep 16 13:57:51 2025 -0500

    Merge pull request #3062 from trackabout/st/AB-5712-2
    
    AB#5712 - Fixes for Load and Unload Truck Updates

commit ece7f7a9e02e74caccb160dada39ba867529c414
Merge: ba547cf42 98733362e
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Sep 12 14:51:28 2025 -0400

    Merge pull request #3064 from trackabout/js/357/ab-5392-fix-enter-text-async
    
    AB-5392, fix Android enter text async

commit ba547cf42b64481d2bcdbae2690013fe8db520b1
Merge: 6c09e0391 52f7c0903
Author: Simon Digon <93137946+SimonDigon@users.noreply.github.com>
Date:   Fri Sep 5 14:23:20 2025 -0400

    Merge pull request #3060 from trackabout/sd/AB-5495-Serial-Number-Crashes
    
    AB#5495 - Reduce Serial Number Errors

commit 6c09e0391b4da0fbafa37d1a77e598c5d2aea649
Merge: 35f3e3f9b 84ed84356
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Sep 5 12:46:15 2025 -0500

    Merge pull request #2932 from trackabout/js/projects/make-notification-preferences-async
    
    AB-5392, make Azure Notification preferences async

commit 84ed84356ade2f081e30f47fe4bb21e46e4f3d27
Merge: 1bdc09be7 35f3e3f9b
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Sep 5 13:44:17 2025 -0400

    Merge branch 'qa' of https://github.com/trackabout/smartphone into js/projects/make-notification-preferences-async
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/BasePreferencesManager.cs
    #       TrackAbout.Mobile/UI/Controllers/SortTripEnterAssetsController.cs

commit 35f3e3f9bada4135833577b2a74a0f74639a3176
Merge: 94a7fd15e ad38ade8a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Sep 5 12:42:25 2025 -0500

    Merge pull request #3037 from trackabout/df/0358/fix-ranged-track-num-nre
    
    AB#5495 - Add NRE check to action on RangedTrackNumRuleSpecification.GetAssetFa…

commit 1bdc09be7d88615dc40078eb526ee6f15de56c94
Merge: 6d397dc71 657a78dd9
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Sep 5 12:38:44 2025 -0500

    Merge pull request #2933 from trackabout/js/projects/make-notification-preferences-async-part-2
    
    AB-5392: make mobile preferences async, part 2

commit 94a7fd15efa29fc12e76a2520270ffaf6286bce5
Merge: e55e48a23 b59a855f0
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Aug 29 16:28:23 2025 -0500

    Merge pull request #3055 from trackabout/development
    
    Merging development to qa after AWS0357 code freeze

commit 5c913c9cbfdc660a5dde65ab9eda3df43a0240ca
Merge: 3d0648638 148e1d7ed
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Aug 29 15:35:57 2025 -0400

    Merge pull request #3053 from trackabout/client-test
    
    Update Prod with  Latest CT for 356 Release

commit b59a855f00337a8b6b93cc6c459c3f892f79fb07
Merge: faed69386 c75f9b410
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Aug 29 10:21:58 2025 -0500

    Merge pull request #3054 from trackabout/l10n_crowdin_translations
    
    New Crowdin translations

commit faed6938668acd6095c284b12bf015831a180e53
Merge: 5974e9254 e55e48a23
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Aug 29 09:49:15 2025 -0500

    Merge pull request #3045 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit e55e48a23bb61e14dfd2cf490655d11a88158fd7
Merge: b62c1d8ac 148e1d7ed
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Aug 26 17:41:20 2025 -0400

    Merge pull request #3046 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 148e1d7edfa7fd15b608d582a12293e127184958
Merge: 0a3cca428 eafd4ab55
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Aug 26 13:14:59 2025 -0400

    Merge pull request #3051 from trackabout/df/0356/ab-5583-load-unload-truck-enhancements
    
    AB#5583 - Load / Unload Truck Fixes

commit 0a3cca428c1f27a38503505fbe2557e52589f4a7
Merge: deffc68ed 7aee7f582
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Aug 22 11:42:38 2025 -0400

    Merge pull request #3048 from trackabout/df/0356/ab-5583-load-unload-truck-enhancements
    
    AB#5583 - Load / Unload Truck Enhancements

commit deffc68ed1bf5872a06b7308a27a260838610576
Merge: 67e9e37e2 9c6715f8e
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Aug 22 11:42:29 2025 -0400

    Merge pull request #3050 from trackabout/df/0356/ab-5649-hour-glass-obscured
    
    AB#5649 -  Fixes an issue with the in-progress icon blocking the customer on Android

commit 5974e9254df7983e1f99c41910684971893deec1
Merge: 21280d7ca d299320bf
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Aug 21 15:08:51 2025 -0400

    Merge pull request #3022 from trackabout/df/ab-5294/dynamic-form-lot-pattern
    
    AB#5294 - Adds support for parsing scanned values on TextBoxFormFields (dynamic forms)

commit 67e9e37e23a0ca9f4526adbc27806acf28e41b60
Merge: 512f7aa3c 8cbd534de
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Aug 20 11:11:32 2025 -0400

    Merge pull request #3043 from trackabout/js/356/ab-4033-patch
    
    AB-4033, Arena: Handle merging of Auto-Split records (TAM7, 356.2 Patch)

commit b62c1d8acb7b9f5dea0f36a010a9ddc4d5cc57a5
Merge: 73b05fb22 512f7aa3c
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Aug 20 09:10:34 2025 -0500

    Merge pull request #3036 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 512f7aa3cf509d154b0ada6959f3c9c27c29d812
Merge: b537f1289 73b05fb22
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Fri Aug 15 16:04:35 2025 -0500

    Merge pull request #3042 from trackabout/qa
    
    QA->Client-Test

commit 21280d7ca1693b6a385b3cc60d65fab0c34a7cb6
Merge: 0577e679a 73b05fb22
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Aug 14 22:45:08 2025 -0500

    Merge pull request #3041 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 73b05fb220eefb7fcbb7460070d89813376b5aea
Merge: f4c83f1d0 01b6f6193
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Wed Aug 13 16:41:37 2025 -0500

    Merge pull request #3039 from trackabout/mk/ab-4244
    
    AB#4244 Typo - use asset when setting CAI in a rack

commit 0577e679a9e1527e570e67693899d83dec4ebb41
Merge: 78cb69257 f4c83f1d0
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Wed Aug 13 10:30:58 2025 -0500

    Merge pull request #3032 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit f4c83f1d02df92b6a57f07462eb7ed57d22cf986
Merge: 11772acb8 52ba47f6e
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Wed Aug 13 08:51:09 2025 -0500

    Merge pull request #3038 from trackabout/mk/ab-4244
    
    AB#4244 Fill CAI

commit 8474cbf0012157c2327e39b890f7a3ad642d2d44
Merge: b6aa6e2aa 11772acb8
Author: Michael Kent <mkent@trackabout.com>
Date:   Tue Aug 12 14:08:17 2025 -0500

    Merge branch 'qa' into mk/ab-4244

commit b537f1289d577a19364e4973d7120c5b40b6af53
Merge: d04447a82 3d0648638
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Aug 11 13:33:46 2025 -0500

    Merge pull request #3034 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit d04447a82a888f01fd737bc891c643ae39ed0a0a
Merge: bc2c06dcc 11772acb8
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Thu Aug 7 20:00:13 2025 -0400

    Merge pull request #3035 from trackabout/qa
    
    Merge release 7.356.0 code from qa into client-test

commit 3d0648638eee20c49b52c5e57de11e275e9e0c16
Merge: f2578a804 bc2c06dcc
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Thu Aug 7 19:17:59 2025 -0400

    Merge pull request #3033 from trackabout/client-test
    
    Merge 355.3 code from client test to production (in advance of the patch deployment)

commit 11772acb8c1cef1e37f6bcf3ba7a5eb210cf831e
Merge: 5d478d468 bc2c06dcc
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Aug 7 14:44:56 2025 -0400

    Merge pull request #3031 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit bc2c06dccff357446357cf1193941fc520981038
Merge: 0e9d69dd9 2341ad217
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Aug 7 12:33:56 2025 -0400

    Merge pull request #3030 from trackabout/df/0355/ab-883-fot-crash-fix
    
    AB-883 - Fix crash on record volume.

commit 78cb69257a1260dfd131185c3a1a81135cca8b24
Merge: e06869759 5d478d468
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Aug 5 09:57:03 2025 -0500

    Merge pull request #3029 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 5d478d468f0be4925f3fd868031c523b0b777816
Merge: ed30ddca1 1ede75b0f
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Aug 4 11:38:07 2025 -0500

    Merge pull request #3028 from trackabout/st/AB-4614-2
    
    AB-4614 - Support for Voice Phase 2

commit e068697596726bf2f4a30581df6b54194d4e6fdc
Merge: 8e557e3c3 ed30ddca1
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Fri Aug 1 16:59:54 2025 -0500

    Merge pull request #3027 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit ed30ddca17b846907c11985a75a9258d43c32507
Merge: c41a7da7c 21ddba3b7
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Aug 1 16:09:46 2025 -0400

    Merge pull request #3026 from trackabout/df/0355/ct-into-qa
    
    355 Release - CT into QA

commit 21ddba3b70ae983e7599aff5467d4e8d8ff0a621
Merge: c41a7da7c 0e9d69dd9
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Aug 1 16:05:38 2025 -0400

    Release 355 - Merge ct into qa

commit 0e9d69dd9bee6fd4471846b668906665ecf43155
Merge: 062fbd25e 185e80a1b
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Fri Aug 1 10:14:07 2025 -0600

    Merge pull request #3025 from trackabout/rv/ab-883-cherry-pick
    
    AB#883 Clear background if asset doesn't match with the department

commit 062fbd25ee3683ce369ebe9a079b124eba59454b
Merge: ec6073593 24f7a867a
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Thu Jul 31 16:34:17 2025 -0600

    Merge pull request #3024 from trackabout/rv/ab-883-cherry-pick
    
    AB#883 UI changes and added icons

commit ec60735931fd4ec6de38769041aa775aad560448
Merge: 7357a053f 4db8f29db
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Wed Jul 30 08:34:28 2025 -0600

    Merge pull request #3023 from trackabout/rv/ab-883-cherry-pick
    
    AB#883 QA changes

commit 7357a053f35ba3f0b0ede2070a1a36e89998d4ae
Merge: 71f20c7bf 14d8932ad
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Thu Jul 24 16:51:51 2025 -0600

    Merge pull request #3018 from trackabout/rv/ab-883-cherry-pick
    
    AB#883 FOT Asset Department Lookup functionality

commit 8e557e3c37d6a91f18bf28078b600d0610dae5c5
Merge: 388b49b68 c41a7da7c
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Jul 24 16:51:25 2025 -0500

    Merge pull request #3015 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit c41a7da7c1817ed85d4c862bd06115e7928c1dd1
Merge: f1f32e628 71f20c7bf
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Jul 24 15:51:57 2025 -0500

    Merge pull request #3020 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 71f20c7bf159f9edb2eb9fd681b6347f2b4e7ddf
Merge: 8fdcd8e5d f2578a804
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Jul 24 15:45:54 2025 -0500

    Merge pull request #3017 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit f2578a804002f08a8fbd5fcf72ba87cde84a5d23
Merge: c178303fe 92b2170f3
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Jul 24 15:15:09 2025 -0500

    Merge pull request #3019 from trackabout/mk/ab-5422
    
    AB#5422 Remove pre-existing text that shows up while loading

commit 92b2170f3b27cb4969b45bb1995a77546c6f86bf
Merge: 7a98126eb c178303fe
Author: Michael Kent <mkent@trackabout.com>
Date:   Thu Jul 24 14:53:56 2025 -0500

    Merge remote-tracking branch 'origin/production' into mk/ab-5422

commit c178303feda879fcf29db3ee294ce7788c94edd9
Merge: f8ffdbf5e 75b50afc7
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Jul 24 09:28:33 2025 -0500

    Merge pull request #3014 from trackabout/mk/ab-5422
    
    AB 5422 Add new allow multiple assets with same serial number

commit 45acba14004a80dbe2363d05a8de25651750703e
Merge: 75b50afc7 f8ffdbf5e
Author: Michael Kent <mkent@trackabout.com>
Date:   Thu Jul 24 08:53:37 2025 -0500

    Merge branch 'production' into mk/ab-5422

commit f8ffdbf5e5688cbefe79878685555e12b2c0606f
Merge: 9e80fb2e2 75d8ddad8
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jul 22 14:10:18 2025 -0500

    Merge pull request #3004 from trackabout/mk/ab-5410
    
    AB#5410 Fix for replace barcode not requiring known asset and tests

commit f1f32e62824f84c9c1268d647601596e21c3548f
Merge: 20d3fd433 906ca6545
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Jul 21 15:26:34 2025 -0400

    Merge pull request #3008 from trackabout/df/0356/ab-5449-fix-select-hardgoods
    
    AB#5449 / AB#5450 - Fixes issues - Hardgoods long press - Save action before saving Complete Maintenance Record

commit 388b49b6832cc71163683a0476919afca49c736b
Merge: a05f8e5ac f9367810f
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jul 18 16:29:50 2025 -0600

    Merge pull request #3016 from trackabout/st/UpdatePipeline-357
    
    Updating pipiline for 357 sprint

commit 20d3fd433f7203266fbc331994e2bb681b323fcb
Merge: 738c9621d a05f8e5ac
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jul 18 15:34:52 2025 -0600

    Merge pull request #3013 from trackabout/development
    
    Merging development to qa after AWS0356 code freeze

commit a05f8e5ac65d013583c689878a564d175659dec0
Merge: 167601cad c0c6b7356
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jul 18 14:00:09 2025 -0600

    Merge pull request #3012 from trackabout/l10n_crowdin_translations
    
    New Crowdin translations

commit 167601cad29b2c362a1fdc0d5288b02f3e8e3989
Merge: 85c537a93 8a907c7fe
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jul 18 15:18:18 2025 -0400

    Merge pull request #3011 from trackabout/js/356/ab-5010-fix-text
    
    AB-5010: fix casing on confirm dialog text

commit 85c537a937aedb821eb7ec518abd85fd20cd791f
Merge: a76f42e58 573353a32
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jul 18 13:16:31 2025 -0600

    Merge pull request #3000 from trackabout/st/AB-4614-VoicePhase-2
    
    AB-4614 - Support for Voice Phase 2

commit a76f42e58f0f07281361ac2e307d9a51ee3c3bf0
Merge: 3610aca64 41e0c218e
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Fri Jul 18 11:38:07 2025 -0600

    Merge pull request #2986 from trackabout/cq/AB-2870
    
    AB#2870 Add support to CoPilot GPS address format.

commit 3610aca64c4542d31157230d6693d632ab6dc8f8
Merge: d4b0b374c 738c9621d
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jul 18 11:17:34 2025 -0600

    Merge pull request #3005 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit d4b0b374cdde58bfc07e2e32fbebfa7fd0a37849
Merge: 39c676621 c198fd138
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jul 18 10:09:29 2025 -0600

    Merge pull request #3001 from trackabout/st/AB-4492
    
    AB-4492 - Product Codes in Integration Messages sometimes do not match for Returned Assets

commit 39c676621af9d3c9f080f9755691911b63d969c7
Merge: c4c6f1a05 421c588dd
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Fri Jul 18 09:53:07 2025 -0600

    Merge pull request #3009 from trackabout/cq/AB-5458
    
    AB#5458 Fix es and mx resources with wrong id.

commit c4c6f1a0584379593b2f6339347f9190272c1bc3
Merge: b784b8af6 8a93637df
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Thu Jul 17 10:28:18 2025 -0600

    Merge pull request #2972 from trackabout/cq/AB-5011
    
    AB#5011 Add confirmation message when Load Truck already saved.

commit 8a93637dfbfe261793fbfabf60701872aa1ce7c9
Merge: cb9d44460 b784b8af6
Author: ChristianQuesada <cquesada@trackabout.com>
Date:   Thu Jul 17 08:43:51 2025 -0600

    Merge branch 'development' into cq/AB-5011

commit b784b8af61d28d53c8cb68bd6539b8e3606530a0
Merge: 5d0c72c2b efe6231ea
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Jul 15 17:55:07 2025 -0400

    Merge pull request #3006 from trackabout/df/0356/truck-manifest-tag-val-ret-spec-cleanup

commit 738c9621d41abc87020d88ef526a0f73b969ffa6
Merge: c28d9461f 8fdcd8e5d
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jul 15 10:09:24 2025 -0500

    Merge pull request #2975 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 8fdcd8e5d52999817a428549004e18c39bfb26d6
Merge: 626b3cbdd 9e80fb2e2
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jul 15 09:40:13 2025 -0500

    Merge pull request #2997 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit 41e0c218e8116f08243ad4d8e998db7a525c2ee0
Merge: 7c8ad76a6 5d0c72c2b
Author: ChristianQuesada <cquesada@trackabout.com>
Date:   Fri Jul 11 10:15:41 2025 -0600

    Merge branch 'development' into cq/AB-2870

commit 7c8ad76a63f3f493e26238b168205f22b98eadb2
Merge: e1cbb6750 ce9b604dd
Author: ChristianQuesada <cquesada@trackabout.com>
Date:   Fri Jul 11 10:09:47 2025 -0600

    Merge branch 'cq/AB-2870' of https://github.com/trackabout/smartphone into cq/AB-2870

commit 5d0c72c2bd0208fffb2e2c1c33b8df0a31d4ee37
Merge: 4a3831c39 89cc3050f
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Thu Jul 10 10:06:35 2025 -0600

    Merge pull request #2941 from trackabout/rv/ab-5133-remove-featuretoggle
    
    AB5133 Remove feature toggle DisableDynamicFormLocaleConversion

commit 4a3831c39ae6f1b112b70bf1d199f2a3ff8a05ee
Merge: 277094345 3123d6cdd
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Jul 8 16:27:43 2025 -0400

    Merge pull request #2999 from trackabout/df/0356/ab-5305-maintenance-work-order-fixes-3
    
    AB#5305 - Part 3 - Fix Maintenance Work Order Notes and Line-Item Descriptions

commit 2770943450f1816a3827cf17544e6b9ad1437ed5
Merge: c0f84b42e 83ad85633
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Jul 8 16:13:25 2025 -0400

    Merge pull request #3002 from trackabout/df/0356/ab-4238-add-unit-test
    
    AB#4238 - Adds unit tests for TruckManifestTagValueRetriever

commit 657a78dd924f6b76d969e142357641833bb285a3
Merge: 3d575e4f8 6d397dc71
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Jul 8 14:51:07 2025 -0400

    Merge branch 'js/projects/make-notification-preferences-async' into js/projects/make-notification-preferences-async-part-2

commit 6d397dc7180cb0340ece7bfd00fbfb52e23f079f
Merge: c484841db c0f84b42e
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Jul 8 14:49:42 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/projects/make-notification-preferences-async

commit c0f84b42e7b20266798988c51e4e38c8151e164c
Merge: 4a10a8e35 5908e0fbc
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Jul 7 15:09:07 2025 -0400

    Merge pull request #2993 from trackabout/df/0356/ab-5343-truck-inventory-line-item-issues

commit d60738055fe78541f67b00411e6e06b6c118d9b6
Merge: 92a24fd96 4a10a8e35
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Jul 3 14:25:35 2025 -0500

    Merge branch 'development' of https://github.com/trackabout/smartphone into st/AB-4614-VoicePhase-2
    
    # Conflicts:
    #       TrackAbout.Mobile/UI/Actions/BaseAction.cs

commit 9e80fb2e25f783f93ea653e83a3920141a613ed1
Merge: 38ebf0cd3 626b3cbdd
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jul 1 11:34:45 2025 -0500

    Merge pull request #2996 from trackabout/client-test
    
    Merge client-test to production

commit 4a10a8e35f95a3e728d655f404d9b4c58929bc86
Merge: 0b61460a6 c28d9461f
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jul 1 10:43:36 2025 -0500

    Merge pull request #2991 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 626b3cbddddf32c38a4f5bbed0d58b79a81d8d24
Merge: 99c90a664 c28d9461f
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jul 1 10:43:18 2025 -0500

    Merge pull request #2995 from trackabout/qa
    
    Merge QA to client-test

commit c28d9461ffff50d4bcb0885fb4acad4a0ca8aa71
Merge: e942cfb6e 9d71c73ab
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Mon Jun 30 13:36:09 2025 -0500

    Merge pull request #2994 from trackabout/mk/ab-4227Cleanup
    
    AB#4227 Asset Intake show asset count

commit 0b61460a64a8d8151d5c2731ca01f507f69786a6
Merge: 770b92562 915df44b0
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Jun 30 11:24:06 2025 -0400

    Merge pull request #2992 from trackabout/js/356/ab-5010-part-2
    
    AB-5010: branch transfers and serial number support

commit e942cfb6e4fe77d15f098cf1474af5723e4b159f
Merge: 9ca1b9356 ae789cfe5
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Mon Jun 30 08:40:52 2025 -0500

    Merge pull request #2990 from trackabout/mk/ab-4227Cleanup
    
    AB#4227 Usability and Crash Fix

commit 770b925623b2c2e101ee0871f8a8ef3b5da8c4b2
Merge: 1d66f15b9 70a8de3f5
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Fri Jun 27 11:58:20 2025 -0600

    Merge pull request #2929 from trackabout/cq/AB-4842
    
    AB#4842 Fix POD tap address or phone number does not open appropriate app.

commit 9dce5fb53fca28e18225cd2ef9fe8224c57ced78
Merge: 58bbb42cb 1d66f15b9
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jun 27 11:37:15 2025 -0500

    Merge branch 'development' of https://github.com/trackabout/smartphone into st/AB-4614-VoicePhase-2

commit 1d66f15b9415e1378c51679c4c7c40197fd5d110
Merge: f495a6052 9ca1b9356
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jun 27 10:37:03 2025 -0600

    Merge pull request #2985 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit f495a6052b434b6a28e9b5af2c0cb7ea23c7e912
Merge: 627c57640 bc59ecd55
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Jun 27 07:28:59 2025 -0400

    Merge pull request #2988 from trackabout/df/0356/ab-5305-maint-work-order-fixes-2
    
    AB#5305 - Part 2 - Updates OrderLineItems.Completed logic, Moves IsHardGoodsRequired check, and Adds CompleteOrder.

commit 627c576402ca02fa5d45d7c6943795dd8b632943
Merge: cb4b36a4b 9f18ffab6
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Jun 27 07:28:50 2025 -0400

    Merge pull request #2989 from trackabout/df/0356/ab-4238-truck-manifest-print-items
    
    AB#5343- Fixes an issue with Print Truck Load Manifest Action showing "Unclassified" erroneously

commit cb4b36a4b9f613f71b4c01b61cb5698e8b27c0c5
Merge: f1b0d5a51 ad10a04da
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Jun 25 16:43:40 2025 -0400

    Merge pull request #2984 from trackabout/df/0356/ab-5305-maint-work-order-fixes-1
    
    AB#5305 - Part 1 - "In Progress" Status and Completion Logic for Maintenance Work Orders

commit ad10a04da7a912e6c5dab6e2754794b28c7715a7
Merge: 6d069ca5e f1b0d5a51
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Jun 25 16:34:34 2025 -0400

    AB-5305 - Merge with latest dev.

commit f1b0d5a51866bcfdc85419d23e5f7799fca914ad
Merge: 177cf613a 7e71c0b26
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Wed Jun 25 14:19:37 2025 -0600

    Merge pull request #2978 from trackabout/rv/ab-5258-upgrade-scandit
    
    AB#5258 Update Scandit Barcode package to version 6.28.5

commit 177cf613a23e3c68a9128eda51141d3b882126ed
Merge: bfbc074b9 b2ff5dea9
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Jun 25 15:18:09 2025 -0400

    Merge pull request #2987 from trackabout/df/0356/ab-5332-manifest-group-by-is-empty
    
    AB#5332 - Group inventory print items by IsEmpty.

commit 9ca1b9356a92d2746be2aebae77b9dc19f7631fa
Merge: 2681a2b58 6814ba2eb
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Jun 25 08:53:57 2025 -0600

    Merge pull request #2977 from trackabout/st/AB-4938
    
    AB-4938 - Add support for variable tag parameter names in URL type barcodes

commit bfbc074b9a1f27e11984e3ac712dfe364104982c
Merge: b641b7992 2d097eab2
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Jun 25 08:48:22 2025 -0400

    Merge pull request #2983 from trackabout/js/356/ab-5010-final
    
    AB-5010, TAM7: warn when the same asset is delivered multiple times on the same trip

commit 6b9ad8bca19d4feb3142b65e3f111b7cc5b1deae
Merge: 5241a8353 b641b7992
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Jun 24 17:51:08 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/356/ab-5010-final
    
    # Conflicts:
    #       TrackAbout.Mobile/UI/Actions/MaintenanceWorkOrderAction.cs
    #       TrackAbout.Mobile/UI/Controllers/Services/AssetEntryService.cs

commit b641b79927d80f5368930687384d899878877d13
Merge: 9158959fc 2681a2b58
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jun 24 16:32:07 2025 -0500

    Merge pull request #2964 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 2681a2b58c740be563286766b6730226d4a94166
Merge: b2128d27d d4ed6760a
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jun 24 15:35:08 2025 -0500

    Merge pull request #2981 from trackabout/mk/ab-4227Cleanup
    
    AB#4227 UX

commit 9158959fc7086d58d2a08512a1f7ceabdaa3a7b4
Merge: 3b879e569 96bad407f
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Jun 24 13:32:05 2025 -0400

    Merge pull request #2982 from trackabout/js/356/ab-5010-refactor-hardware-scan-handling-final
    
    AB-5010, TAM7: refactor DeliveryEnterAssetsController to use the EnterAssetsHardwareScanSubController

commit b2128d27db88641194cbd8b5b520c4085b8006fc
Merge: eabfb41f5 bfa980c85
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Mon Jun 23 10:17:35 2025 -0500

    Merge pull request #2926 from trackabout/mk/ab-4227Cleanup
    
    AB#4227 QA Feedback

commit 3b879e5698595bc53a5d732ae4a75aef2c5c5346
Merge: 4570947b2 e967ce9af
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Fri Jun 20 12:54:12 2025 -0600

    Merge pull request #2953 from trackabout/rv/ab-4478-condemn-assets
    
    AB4478 Fix Condemn assets action crash while using Serial Number

commit 4570947b2cf2dbcc49d8c752a1afc896df18e4db
Merge: 78fae339f 79b2b1f80
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Jun 18 14:55:05 2025 -0400

    Merge pull request #2976 from trackabout/df/0356/ab-4241-truck-manifest-ui-changes
    
    AB#4241 - Truck Inventory - Various UI changes

commit 78fae339f4ddbebb39299acb801e196206875b30
Merge: f5300c8bb baa6a431e
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Jun 18 13:43:51 2025 -0400

    Merge pull request #2973 from trackabout/df/0356/ab-4238-truck-manifest-print-items-update
    
    AB#4238 - Truck Manifest Printing Updates

commit 506e881875f26decdf22f4b0ef0f202eb6d98aed
Merge: a7c7c01d8 eabfb41f5
Author: Michael Kent <mkent@trackabout.com>
Date:   Tue Jun 17 15:36:27 2025 -0500

    Merge branch 'qa' into mk/ab-4227Cleanup

commit 99c90a664f20e15fdff154f8362925e5e1315153
Merge: 2953ef026 eabfb41f5
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Jun 17 14:44:28 2025 -0400

    Merge pull request #2974 from trackabout/qa
    
    Merge qa into client-test following the 355 release (TAM7)

commit f5300c8bbd12e6f8a921e65ca379b4a4cbc4a2ec
Merge: 3f529d0c2 fd53ee7e4
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Jun 16 16:54:58 2025 -0400

    Merge pull request #2971 from trackabout/df/0356/ab-5244-camera-scan-method-crash-fix
    
    AB#5244 - Adds feature toggle UseLegacyiOSModalDismissalBehavior.

commit eabfb41f54d9065bacf73a7359377112b9ccae24
Merge: 864d9a0f7 9e976ed81
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Jun 13 17:31:36 2025 -0400

    Merge pull request #2970 from trackabout/df/0355/regression-fix

commit 864d9a0f77a30a0988c17c3906e515e7af8eb986
Merge: 2d9c05bce 3ccc28f70
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri Jun 13 09:30:47 2025 -0400

    Merge pull request #2969 from trackabout/df/0355/ab-4201-main-order-shows-returns
    
    AB#4201 - Fixes an issue with not hiding return values on maintenance work orders on iOS

commit 89cc3050fd22963e3a39be40d79af5ee4b5630f2
Merge: b15648637 3f529d0c2
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Thu Jun 12 12:32:32 2025 -0600

    Merge development into ab-5133-remove-featuretoggle

commit 2d9c05bce2c58485d95c9a4f2756c0491eeb9219
Merge: a207158b1 bc695b52a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Thu Jun 12 14:25:36 2025 -0400

    Merge pull request #2967 from trackabout/js/355/ab-5217-part-2
    
    AB-5217, Maintenance with Work Orders: show different counts on Scan Assets and Manual Asset Entry screens

commit a7c7c01d8d05d72c6178cbaf7a0f3d8243407a9e
Merge: aff18dca1 a207158b1
Author: Michael Kent <mkent@trackabout.com>
Date:   Thu Jun 12 11:06:24 2025 -0500

    Merge branch 'qa' into mk/ab-4227Cleanup

commit a207158b1f43622c7bf685222273c25198f36209
Merge: b71917b06 8b231e5a5
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Wed Jun 11 21:23:27 2025 -0500

    Merge pull request #2968 from trackabout/mk/ab-5156
    
    AB#5218 CAIT using unit of measure use default value.

commit b71917b06a03e400d7f12f80a7e516f8fd670ea4
Merge: 601466b80 e673fd04e
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Wed Jun 11 15:09:18 2025 -0500

    Merge pull request #2966 from trackabout/mk/ab-5156
    
    AB 5156 Send CAI

commit a78ad2d6980f5fe925d0e6afb3812af6c762901e
Merge: 37ab4e368 601466b80
Author: Michael Kent <mkent@trackabout.com>
Date:   Wed Jun 11 13:50:53 2025 -0500

    Merge branch 'qa' into mk/ab-5156

commit 601466b803c57534089ba88ed9162c549401d99e
Merge: 18337702b 43552c9b9
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Jun 11 10:51:33 2025 -0400

    Merge pull request #2965 from trackabout/js/355/ab-5217
    
    AB-5217, maintennace with work orders: show the correct counts on the scan assets screeen

commit 18337702b512922807650cc656ba3c834925f37d
Merge: cd94da5e2 5338d2005
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue Jun 10 18:00:34 2025 -0500

    Merge pull request #2961 from trackabout/mk/ab-5156
    
    AB#5156

commit cd94da5e22dabe4902a440d2e95fedc93c47b8da
Merge: d2fc5b819 8803e180a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 15:38:32 2025 -0600

    Merge pull request #2963 from trackabout/st/AB-4852-SaveOrder
    
    AB-4852 - TAM7 Allow 20 Images

commit 3f529d0c21a901dadd2cb4bbf0a1d5a377c65edd
Merge: 4350bfae4 041852131
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 15:16:59 2025 -0600

    Merge pull request #2962 from trackabout/st/UpdatePipeline-356
    
    Updated pipeline for 356 builds.

commit 4350bfae487ac9ec007c165180e7096b02f34b66
Merge: 27d2d7a79 d2fc5b819
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 15:00:29 2025 -0600

    Merge pull request #2960 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit d2fc5b81909a02da7e11010ad78011e6d31aaf00
Merge: 4eaa17259 27d2d7a79
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 14:49:40 2025 -0600

    Merge pull request #2959 from trackabout/development
    
    Merging development to qa after AWS0355 code freeze

commit 27d2d7a79fa82d0aec68996ac6a6f1b3055023c2
Merge: 1c573df7c 2afc7d6ee
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Jun 10 14:59:16 2025 -0400

    Merge pull request #2954 from trackabout/df/355/ab-5154-asset-entry-bug
    
    AB#5154 - Fix asset entry validation for unfulfilled line items.

commit 1c573df7c537b41ea8d71654e66291461cba5265
Merge: 6a6eebd21 41d6ab681
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 11:33:43 2025 -0600

    Merge pull request #2958 from trackabout/st/AB-5155
    
    AB-5155 - Voice Input - Default AutoAdvance config to True

commit 6a6eebd210614de431c0ed28190038d1f057e544
Merge: b2c7f797c b4dad4bb1
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 11:25:28 2025 -0600

    Merge pull request #2957 from trackabout/l10n_crowdin_translations
    
    New Crowdin translations

commit b2c7f797c5960d327d1b5187d3ab7090364850f7
Merge: fc9ae2249 b0f23e413
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 11:24:06 2025 -0600

    Merge pull request #2955 from trackabout/st/AB-4852-UpdateDefault
    
    AB-4852 - Roadmap: Maint Work Orders: TAM7 Allow 20 Images

commit aff18dca162efa09eba01759a82e3796b468a23e
Merge: 486abc6e6 fc9ae2249
Author: Michael Kent <mkent@trackabout.com>
Date:   Tue Jun 10 11:54:29 2025 -0500

    Merge branch 'development' into mk/ab-4227Cleanup

commit fc9ae22498bc4a1712cf9d2d9677228d46b304cd
Merge: fd100d427 4eaa17259
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 10:34:40 2025 -0600

    Merge pull request #2956 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 4eaa17259bd6a858dd37bf62ed29b2c68ac5f25e
Merge: ff03d102a 2953ef026
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 10 10:27:49 2025 -0600

    Merge pull request #2950 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit fd100d427c2bcb9663e788dbe0690fd497a16ab4
Merge: 18d3240c8 45c7af741
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Jun 9 13:12:16 2025 -0400

    Merge pull request #2952 from trackabout/df/0355/ab-5135-fix-line-item-totals
    
    AB#5135 - Fixes issues with line item totals. Fixes warning message.

commit 18d3240c83e337e19d13788279b6f94b057127bd
Merge: aa257ce76 ccf8f5fd2
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Jun 9 08:30:02 2025 -0600

    Merge pull request #2951 from trackabout/st/AB-5147-2
    
    AB-5147 AB-4206 - FIX - Roadmap: Maint Work Orders: TAM7 Update confirmation screen

commit aa257ce76cfd72879ddcc30f89409fbbf7009a63
Merge: 1666b7b68 b9ae4e0d2
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:58:19 2025 -0400

    Merge pull request #2947 from trackabout/js/355/ab-5134
    
    AB-5134: users unable to add assets with alerts on the Edit and Add Maintenance Service Items screens

commit 2953ef026a789f9b004fbda3d354b60965d8e0be
Merge: e42eaed5a c62a58799
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:53:56 2025 -0400

    Merge pull request #2942 from trackabout/js/355/ab-5132
    
    AB-5132: TAM7 does not assign return guide numbers to delivery complaint assets

commit 1666b7b686d761abb16581b873665c41f01e6ead
Merge: 2056bbea5 25060c6b7
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jun 6 14:52:58 2025 -0600

    Merge pull request #2948 from trackabout/st/AB-4852-2
    
    AB-4852 -Roadmap: Maint Work Orders: TAM7 Allow 20 Images - Fix

commit 2056bbea5a141f76a3cc6ab171dd7b8ed245eae3
Merge: e5a52ab78 aa9c0029c
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:31:07 2025 -0400

    Merge pull request #2944 from trackabout/js/355/ab-5136
    
    AB-5136: Maintenance with work orders enter assets screen not dismissing "device offline" message in iOS

commit e5a52ab785358148e736957ade14024610fa31d2
Merge: 324d40ad6 f78ee44bb
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:26:47 2025 -0400

    Merge pull request #2945 from trackabout/js/355/ab-5135
    
    AB-5135, AB-5139: maintenance with work order fixes

commit 324d40ad68e066630ee00164b2eaf1e22632d73c
Merge: 5ae9284d7 6b756de35
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Fri Jun 6 14:25:22 2025 -0600

    Merge pull request #2939 from trackabout/cq/AB-5109
    
    AB#5109 Fix issue with ns asset into a container.

commit f78ee44bbe431d36faceb8993995a4e65b5214a3
Merge: 70dc35393 5ae9284d7
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:23:24 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/355/ab-5135
    
    # Conflicts:
    #       TrackAbout.Mobile/UI/Controllers/MaintenanceWorkOrderSelectTripOrderController.cs

commit 5ae9284d78073271630677542c2ae3eb867f695c
Merge: ab68d603e 8f92d7dcd
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:22:06 2025 -0400

    Merge pull request #2946 from trackabout/js/355/disable-ad-hoc-orders-for-maintenance-with-work-order
    
    Maitenance with work orders: disable ad-hoc work orders for maintenance

commit ab68d603e42de2c45a1419f4421cdd2a05c3109e
Merge: 6d729f02f 6df91846f
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Jun 6 14:13:26 2025 -0600

    Merge pull request #2949 from trackabout/st/AB-5147
    
    AB-5147 AB-4206 - FIX - Roadmap: Maint Work Orders: TAM7 Update confirmation screen

commit a0101094b97ea86ef68d4aaf731a2132c4121c3a
Merge: a4dde0b0d 6d729f02f
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri Jun 6 16:11:01 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/355/ab-5135

commit 9152dca261cfb05d05ebca85e7228f4ab9fbfeae
Merge: 60c5b0881 38e517ae4
Author: Michael Kent <mkent@trackabout.com>
Date:   Fri Jun 6 11:53:38 2025 -0500

    Merge branch 'development' into mk/ab-4227Cleanup

commit 6d729f02f5acb334490f243340c1345b3bbdbbee
Merge: 06b17d908 a2e97968b
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Fri Jun 6 08:20:02 2025 -0500

    Merge pull request #2925 from trackabout/mk/ab-4204
    
    AB 4204 CAI Collection On Maintenance Order

commit 06b17d908d5b7dd2caf968be4d36e2927410bf71
Merge: 38e517ae4 4f859ecbf
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Thu Jun 5 17:51:03 2025 -0400

    Merge pull request #2943 from trackabout/js/355/ab-5137
    
    AB-5137: enter assets screen crashes when trying to key in or scan assets

commit c796930f2e4f70fbd46d2e563027b33059d6fb91
Merge: 0b012a93e 38e517ae4
Author: Michael Kent <mkent@trackabout.com>
Date:   Thu Jun 5 15:45:47 2025 -0500

    Merge branch 'development' into mk/ab-4204

commit 38e517ae406844685922d4c6c52bbbc0ef25c0ce
Merge: a80d42cd0 c4b1486f3
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Jun 4 13:08:27 2025 -0600

    Merge pull request #2940 from trackabout/st/AB-5129
    
    AB-5129 - ROADMAP Maintenance Order - Issue with Hard Goods save

commit a80d42cd00bf320f5df6e7905783d7087f3cd42e
Merge: 2fd41aad3 12e68163c
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 3 17:51:01 2025 -0600

    Merge pull request #2938 from trackabout/st/AB-4199-OwnerFlag
    
    AB-4944 -Roadmap: Maint Work Orders: Display Counts from other records in the Order

commit 2fd41aad375db9764254774faddb8ca1ffb36c29
Merge: 779677015 56dbe6a40
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Jun 3 18:53:23 2025 -0400

    Merge pull request #2936 from trackabout/js/355/ab-5126
    
    AB-5126: nudge the maintenance asset grid content a bit to the left

commit 7796770157f3487ccaba07f4113a6d5c99f2ed00
Merge: cc3b97191 52a96732b
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Jun 3 16:24:55 2025 -0600

    Merge pull request #2910 from trackabout/st/AB-4996
    
    AB-4996 - TAM7 and AWS Error Reduction

commit cc3b97191b5ea269173a0563afd34966f882550e
Merge: db16b1ecd f01c24d78
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Tue Jun 3 16:14:30 2025 -0600

    Merge pull request #2937 from trackabout/rv/ab-5048-bugfix
    
    AB5048/AB5116 Fix - All HG showing same notes and showing Lot Number …

commit db16b1ecdc6024188db50d4465caef28b7860287
Merge: efcb04b4c 8ec19ee04
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Mon Jun 2 15:38:06 2025 -0600

    Merge pull request #2935 from trackabout/rv/ab-5048-bugfix
    
    AB5048/AB5116 Bug - Retrieving notes of hard goods line item

commit efcb04b4cb76c795f0c6d9d535f74071cb332252
Merge: 6a20ea529 57caf3e83
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Jun 2 14:29:49 2025 -0400

    Merge pull request #2934 from trackabout/js/355/ab-4853-qa-fixes-1
    
    AB-4853, QA Fixes 1: Add New Line Item for Maintenance Work Orders (TAM7)

commit 3d575e4f80b963b7de275a2e2b5b9c80a756aba8
Merge: be23b4405 c484841db
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri May 30 17:05:11 2025 -0400

    Merge branch 'js/projects/make-notification-preferences-async' into js/projects/make-notification-preferences-async-part-2
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/BasePreferencesManager.cs

commit c484841db9bd53fe968585dd76eb6cb6c60ff82d
Merge: 06c642f5b 6a20ea529
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri May 30 16:51:01 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/projects/make-notification-preferences-async
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/Interfaces/IPreferencesManager.cs

commit 6a20ea5295e75425e5094b03da25ba0d73c4443a
Merge: 3c504b3dc bdf4a8c88
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Fri May 30 12:27:59 2025 -0600

    Merge pull request #2930 from trackabout/rv/ab-4945
    
    AB4945 CreateMaintenanceIntakeRecord request to save asset intake API

commit 3c504b3dc0dcf1b99b04a01eefbb675d6bade005
Merge: 7c2924822 ff0117006
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Fri May 30 09:47:47 2025 -0600

    Merge pull request #2836 from trackabout/cq/AB-4009
    
    AB#4009 Fix NSAssets Line Numbers in Containers during delivery.

commit cae413bd464bc34dcce63d5d64985ae4e0ff0f73
Merge: ff607215c 7c2924822
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Fri May 30 08:41:46 2025 -0600

    Merge development into rv/ab-4945

commit 7c2924822c70f11e0b94db3efbb2ec9329049757
Merge: 88ea99fda 03cd44941
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri May 30 10:20:08 2025 -0400

    Merge pull request #2931 from trackabout/df/0355/ab-4944-maint-update-line-items-cherry-picks
    
    AB#4944 - Rename Additional to Ship

commit bcfc58ff9b117e499479f4b4af3fa7365590b877
Merge: 54b431dcd 88ea99fda
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri May 30 09:42:40 2025 -0400

    AB-4944 - Merge with latest dev. Revert changes to HardwareScanReceived.

commit ff01170068fb7faaf4c1784feb14b7192e0b2831
Merge: 73d975e49 88ea99fda
Author: ChristianQuesada <cquesada@trackabout.com>
Date:   Thu May 29 14:42:59 2025 -0600

    Merge branch 'development' into cq/AB-4009

commit 88ea99fda448e1b8b7d3d3c9e0681e77e8d6615b
Merge: f74ee2498 8b24921c7
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu May 29 10:42:44 2025 -0600

    Merge pull request #2915 from trackabout/st/AB-4208
    
    AB-4208 - Roadmap: Maint Work Orders: TAM7 Implement close maintenance action

commit 51a1ac87810554bafa482a53df8c775150bb75f7
Merge: 591ed58c2 f74ee2498
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu May 29 11:12:15 2025 -0500

    Merge branch 'development' of https://github.com/trackabout/smartphone into st/AB-4208
    
    # Conflicts:
    #       TrackAbout.Mobile.UI.Droid/Activities/MaintenanceWorkOrderEnterQuantityActivity.cs
    #       TrackAbout.Mobile/Api/TrackAboutRestAPI.dtos.cs
    #       TrackAbout.Mobile/UI/Adapters/IMaintenanceWorkOrderEnterAssetsAdapter.cs
    #       TrackAbout.Mobile/UI/Controllers/MaintenanceWorkOrderEnterAssetsController.cs

commit f74ee24986dc8412cd76a437464f6ff1886fe587
Merge: 4821af790 79b96a1bf
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Wed May 28 16:48:19 2025 -0600

    Merge pull request #2923 from trackabout/rv/ab-5048-addnotes-hardgoods
    
    AB5048 Maintenance Work Order - add notes field to hardgoods screen

commit 4821af79006767bd2b4227ccddc342253812c077
Merge: 5a7abad66 cda04a881
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed May 28 16:44:33 2025 -0600

    Merge pull request #2921 from trackabout/st/AB-4852
    
    AB-4852 - Roadmap: Maint Work Orders: TAM7 Allow 20 Images

commit 5a7abad66bcb63faf18cbe56e63679c87a273575
Merge: e2e2cd860 4c15f0e1c
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed May 28 16:00:35 2025 -0400

    Merge pull request #2922 from trackabout/df/0355/ab-4944-maint-update-line-items-cherry-picks
    
    AB#4944 - Maintenance Update Line Items - Cherry Picks

commit 3d8049887f6f49f75ef8552ea1d2a3fcc534019c
Merge: 9c2d02d9e e2e2cd860
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed May 28 14:45:14 2025 -0400

    AB-4944 - Merge with latest dev.

commit e2e2cd860260e2d0aac473fbff06a91e96ef8ef1
Merge: b7b6f69a1 18c0310b2
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed May 28 14:18:54 2025 -0400

    Merge pull request #2927 from trackabout/js/355/ab-4853-final
    
    AB#4853 - Part 2: Add New Line Item for Maintenance Work Orders

commit 6dc0ad0a0464b0119b0169a411e25e21c8da6c7b
Merge: 2a96ae17e b7b6f69a1
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed May 28 13:11:47 2025 -0500

    Merge branch 'development' of https://github.com/trackabout/smartphone into st/AB-4996

commit b7b6f69a114195026460e48e5694fda1a3aea10e
Merge: 91fb0e6b3 39f9e6358
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed May 28 13:54:23 2025 -0400

    Merge pull request #2928 from trackabout/js/355/ab-4853-refactoring-1
    
    AB#4853 - Part 2: Add New Line Item for Maintenance Work Orders (TAM7 Refactoring)

commit 46e9b5d9fa1506fe5a2cbeacd1db378e2db954d1
Merge: 41fe120a5 39f9e6358
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed May 28 12:42:36 2025 -0400

    Merge branch 'js/355/ab-4853-refactoring-1' into js/355/ab-4853-final

commit 41fe120a532fd77d7313d6fe88b57f58c205ebb3
Merge: 37b962a2f 91fb0e6b3
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed May 28 11:47:02 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/355/ab-4853-current-updated

commit 91fb0e6b33a4d1607e9535ca2bebcd7006a9f466
Merge: 40ce824a5 ff03d102a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Sat May 24 09:46:55 2025 -0600

    Merge pull request #2914 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit ff03d102ab826255fe101600fab97346647a0bfd
Merge: b1c355bf8 e42eaed5a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri May 23 17:03:51 2025 -0600

    Merge pull request #2920 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 40ce824a515af59c48e6bdc81c52a0a4d678a3f0
Merge: de5a09cb5 b1cbc50f6
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri May 23 15:20:00 2025 -0400

    Merge pull request #2919 from trackabout/df/0355/fix-missing-photos

commit e42eaed5a653c460f8281cd8a526f8c9a84da5c3
Merge: 10e6bedda 8557c3af8
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Fri May 23 14:51:21 2025 -0400

    Merge pull request #2918 from trackabout/js/355/ab-5066
    
    AB-5066: TAM7 is assigning return guide numbers to customer-owned delivered assets

commit c018999634cad6baf05afcf7dc5208e066e2748f
Merge: e070737ae de5a09cb5
Author: ChristianQuesada <cquesada@trackabout.com>
Date:   Fri May 23 11:54:51 2025 -0600

    Merge branch 'development' into cq/AB-4009

commit de5a09cb5d3f5fab9ac2bbc2adce3e3f67e90642
Merge: 22a173e2f effd4038c
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri May 23 07:52:17 2025 -0600

    Merge pull request #2916 from trackabout/st/AB-4209-2
    
    AB-4209 - Roadmap: Maint Work Orders: TAM7 Save Record and split record based on subactions.

commit b1c355bf85b105c32c211d2eb4b5ea966654d1b4
Merge: 369d1b4a4 10e6bedda
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu May 22 01:32:15 2025 -0600

    Merge pull request #2913 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 10e6beddaf96656d7d4828fd7c0ef82dbef959a4
Merge: 5b7c68683 38ebf0cd3
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed May 21 18:09:06 2025 -0600

    Merge pull request #2902 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit 22a173e2f82f2590dc5abede8da06ad292b8d001
Merge: bca6fe66d 3a46dc47e
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed May 21 16:30:02 2025 -0600

    Merge pull request #2912 from trackabout/st/AB-4209
    
    AB-4209 Roadmap: Maint Work Orders: TAM7 Save Record and split record based on subactions

commit 5b7c68683916f50745118f6b10c24114e01807ad
Merge: b134671ee 3c7631696
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed May 21 12:32:33 2025 -0400

    Merge pull request #2911 from trackabout/js/354/AB-5041
    
    AB-5041 (defect): TAM7 is assigning truck load guide numbers to customer-owned returns

commit 7f9c8b84a5948a40609960d5683d57baaf0e1746
Merge: f51235f62 bca6fe66d
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue May 20 17:49:14 2025 -0500

    Merge branch 'development' of https://github.com/trackabout/smartphone into st/AB-4209

commit bca6fe66db957ddb0afb73ed58c8fd5ba1eabd01
Merge: c35f4eb69 6b8200e99
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Tue May 20 09:46:24 2025 -0500

    Merge pull request #2906 from trackabout/mk/ab-4227
    
    AB 4227 Change add new to be a secondary workflow in Maintenance Asset Intake

commit c35f4eb6957aae552e02ab65e65af24662351927
Merge: fe0e8a2a9 a242d8eba
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Mon May 19 10:27:05 2025 -0500

    Merge pull request #2907 from trackabout/mk/copilotInstructions
    
    Initial copilot instructions

commit fe0e8a2a98719126719001061efb0e9d2f5019da
Merge: fed3554c0 369d1b4a4
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon May 19 09:34:20 2025 -0400

    Merge pull request #2896 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit fed3554c02269f1e49a2b73beb4be0d851c8b76d
Merge: d567fe249 aaf198377
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri May 16 15:21:20 2025 -0600

    Merge pull request #2908 from trackabout/st/AB-4206
    
    AB-4206 - Roadmap: Maint Work Orders: TAM7 Update confirmation screen

commit 11be04db28bb6be5c6df6626abe3d2017932a19b
Merge: 8eacb0784 d567fe249
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri May 16 01:56:22 2025 -0500

    Merge branch 'development' of https://github.com/trackabout/smartphone into st/AB-4206

commit d567fe249b6929e400e771bff8f21b5768d26de0
Merge: 44cbde158 b47bab0cb
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu May 15 13:13:29 2025 -0400

    Merge pull request #2905 from trackabout/df/0355/ab-4853-add-line-item
    
    AB#4853 - Part 1: Convert EditMaintenanceServiceItemController to SecondaryWorkflow

commit 44cbde158970f9611e4b2718b6f931ff5eadfd05
Merge: 28fc5e93c d48948606
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Tue May 13 13:02:48 2025 -0600

    Merge pull request #2903 from trackabout/rv/ab-4370-add-po-number
    
    AB4370/4910 Change alignment for PO Number and wrap long PO Number

commit 28fc5e93c00a164e6ab5d501ad665f183e89bb85
Merge: a9ac679c2 041fef2c7
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue May 13 14:58:25 2025 -0400

    Merge pull request #2904 from trackabout/df/0355/ab-4853-add-line-item
    
    AB#4853 - Fixes iOS build.

commit a9ac679c213f9dac99af3626ec7da09e589bd605
Merge: 8f888e32b 22cb8678e
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue May 13 14:48:00 2025 -0400

    Merge pull request #2900 from trackabout/js/355/ab-4203
    
    AB-4203, Maintenace With Work Orders: TAM7 Service Item Details screen (TAM7)

commit 8f888e32b1f816461b3064984f935d61c9217d6e
Merge: 8cee785f0 49d51d420
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue May 13 14:23:24 2025 -0400

    Merge pull request #2886 from trackabout/df/0355/ab-4202-maintenace-work-order-enter-assets
    
    AB#4202 - Adds MaintenanceWorkOrderEnterAssets

commit 8cee785f07cdcf5abb93de7690617d8fc038882b
Merge: a0c95414d 964a3e574
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue May 13 10:44:59 2025 -0400

    Merge pull request #2894 from trackabout/df/0355/fix-missing-photos
    
    AB#4676 - Clean Invalid Media Files

commit a0c95414da5404daa4b71fa4ad60f9c5d0659015
Merge: d8843e7c4 3e63d2131
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Tue May 13 08:17:34 2025 -0600

    Merge pull request #2863 from trackabout/rv/ab-4403-locate-default
    
    AB4403 Show all permissible locations along with selected default

commit 19dd2f0cbe9e189dedc1dfc96bed9ff62aebb93a
Merge: af81b7c0b d8843e7c4
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Mon May 12 14:13:39 2025 -0600

    Merge development into rv/ab-4370-add-po-number

commit fe0fda04daf2b7f5cc9acef34d5c1b9b8ece16c7
Merge: 7b47626a5 d8843e7c4
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri May 9 10:09:30 2025 -0400

    Merge branch 'development' into df/0355/ab-4202-maintenace-work-order-enter-assets

commit d8843e7c49ec098424a35c84b6d6416409ec00f4
Merge: 0237f4067 1c50daa81
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Fri May 9 10:08:33 2025 -0400

    Merge pull request #2895 from trackabout/js/355/ab-4203-refactor-hardware-scan-subcontroller
    
    AB-4203: refactoring for maintenance with work order

commit 38ebf0cd3045bf6a18cb2c7244af7bd5629b9095
Merge: 2d51fd335 b134671ee
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed May 7 16:13:15 2025 -0400

    Merge pull request #2901 from trackabout/client-test
    
    Update Production with Client-Test after 354 Release

commit 369d1b4a497d7bdb8cf7e99ef9bfbf6f33c29dca
Merge: c409d5f5d b134671ee
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue May 6 14:55:59 2025 -0400

    Merge pull request #2898 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit b134671eea1d87ba0ec56f5f5751ed387222e27a
Merge: 68ae34b4a dd60c3472
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue May 6 06:29:35 2025 -0600

    Merge pull request #2899 from trackabout/st/AB-4909
    
    AB-4909 - Register Asset crashing app when dynamic forms have default values

commit 68ae34b4a42f1e67779bd40c178e4fc7dbb53eae
Merge: 61f82d5f3 c409d5f5d
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon May 5 10:53:39 2025 -0400

    Merge pull request #2897 from trackabout/qa
    
    7.354.2 Release: merge qa into client-test

commit c409d5f5dcf0bb4e9d97b4c82ea5defc70916f09
Merge: 4d5cc27ae 57c22697b
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Thu May 1 14:49:10 2025 -0400

    Merge pull request #2891 from trackabout/js/355/ab-4861
    
    AB-4861, set returned asset guide numbers even if the user only made an even exchange

commit 89d30d6e41ffa4addc35e8375e875e8f407a35d4
Merge: c6261d042 492f96342
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu May 1 10:57:02 2025 -0400

    AB-4202 - Merge with latest AB-4203

commit 492f96342388f3d442ba8a64d97173d11e3147ee
Merge: f0644fc3c 1c50daa81
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Apr 30 15:29:58 2025 -0400

    Merge branch 'js/355/ab-4203-refactor-hardware-scan-subcontroller' into js/355/ab-4203

commit 353b0a92db8dd71c3c530b745c1245e3c3dfbcb0
Merge: 47b81617e f08976e33
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Apr 30 15:04:37 2025 -0400

    Merge branch 'js/355/ab-4203-refactor-hardware-scan-subcontroller' into js/355/AB-4203
    
    # Conflicts:
    #       TrackAbout.Mobile/Infrastructure/Interfaces/MobileViews.cs
    #       TrackAbout.Mobile/Models/DeviceConfig.cs

commit 0237f406724b3b7b34b337c992062d2be54f6fc2
Merge: 05da62606 db37b0668
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Tue Apr 29 14:39:24 2025 -0600

    Merge pull request #2866 from trackabout/rv/ab-4370-add-po-number
    
    AB4370 Add PO Number on POD first screen

commit 05da62606488f599791b9f57d6664a88bae1c1f4
Merge: ace73aef7 4d5cc27ae
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Apr 29 13:26:23 2025 -0600

    Merge pull request #2881 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 4d5cc27ae15c50e219188398f19dfc65fcc9ac32
Merge: feda3ac83 61f82d5f3
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Apr 29 13:04:43 2025 -0600

    Merge pull request #2890 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit ace73aef789550afb8f069a43bcb1cabfa77cb0b
Merge: 92591c5b6 c2cad5a4b
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Apr 29 14:36:36 2025 -0400

    Merge pull request #2893 from trackabout/js/355/stub-screens-prompt
    
    Add a prompt for generating screen stubs from an IAdapter.

commit e58e71e258b654e102a32599b9a3ff28a9cb12cd
Merge: 28b6362a4 92591c5b6
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Apr 28 10:04:26 2025 -0400

    Merge branch 'development' into df/0355/ab-4202-maintenace-work-order-enter-assets

commit 61f82d5f3bca57811922b717197059c073ee0dc4
Merge: dfbedb82c feda3ac83
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Fri Apr 25 16:05:27 2025 -0500

    Merge pull request #2889 from trackabout/qa
    
    354.1 Merge QA to Client-Test

commit 92591c5b677ed16bd4189fc215db0a9918706515
Merge: ddba6d6e9 3d5783934
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Fri Apr 25 11:33:17 2025 -0500

    Merge pull request #2887 from trackabout/mk/ab-4227
    
    AB#4227 Create Asset Intake Action

commit feda3ac83dbb572e94f27660c30f7d032a700121
Merge: 91e3cf354 c9188410a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Fri Apr 25 07:50:45 2025 -0600

    Merge pull request #2888 from trackabout/st/AB-4681-2
    
    AB 4681 - Voice Entry enhancements 1.5

commit 91e3cf3549577793427f63122114a7b37a8dd0b4
Merge: 1149eca16 cf0d12bd3
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Apr 21 17:23:59 2025 -0600

    Merge pull request #2884 from trackabout/st/AB-4614-VoiceEntry-Enh
    
    AB-4681 - Voice Entry Support Phase 1.5

commit cf0d12bd3f6baac1318ec7172450ea9ae72405ed
Merge: 63f1dfd6f eb1158c6a
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Apr 21 16:41:08 2025 -0500

    Merge branch 'df/0354/ab-4664-dynamic-form-layout-fixes' of https://github.com/trackabout/smartphone into st/AB-4614-VoiceEntry-Enh

commit 63f1dfd6f3a003fdfafb89439c3a04b6900aa0c2
Merge: 8968caf1b 1149eca16
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Mon Apr 21 16:40:51 2025 -0500

    Merge branch 'qa' of https://github.com/trackabout/smartphone into st/AB-4614-VoiceEntry-Enh

commit 1149eca16fbb73febc3a2b7a69974d21292b2ce1
Merge: 434d3195e 7e09465ed
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Mon Apr 21 09:01:22 2025 -0600

    Merge pull request #2876 from trackabout/rv/ab-4358-decimalpoint-locale
    
    AB4358 Decimal point issue with locale change

commit e193a88d4387118b6e0992aafecaf3d5e371a651
Merge: 564fd5d0c 434d3195e
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Apr 17 14:29:03 2025 -0500

    Merge branch 'qa' of https://github.com/trackabout/smartphone into st/AB-4614-VoiceEntry-Enh

commit ddba6d6e951cb50c34292d35118f1ca68e40d42d
Merge: f8620d9ab 53437511f
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Apr 17 10:55:34 2025 -0600

    Merge pull request #2882 from trackabout/st/PipelineSprint-355
    
    Updated sprint number to 355 in pipiline

commit 06c642f5b6a0ca7e822e7a27cc66ef7aada6d604
Merge: bd1393cf1 f8620d9ab
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Thu Apr 17 12:50:44 2025 -0400

    Merge branch 'development' of https://github.com/trackabout/smartphone into js/354/make-notification-preferences-async

commit 434d3195e29a8682d24278d25a9ba44359066c55
Merge: c08c43bd6 f8620d9ab
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Apr 17 10:03:30 2025 -0600

    Merge pull request #2880 from trackabout/development
    
    Merging development to qa after AWS0354 code freeze

commit f8620d9abff566ec55350f24955e1c4b6c75c527
Merge: 6cc6fa2e3 534240225
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Apr 16 14:42:31 2025 -0600

    Merge pull request #2878 from trackabout/l10n_crowdin_translations
    
    New Crowdin translations

commit 6cc6fa2e3e8fc5f74bb705db53863ff660c49e94
Merge: d535b248e 42b8ce3f7
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Wed Apr 16 14:37:53 2025 -0400

    Merge pull request #2877 from trackabout/js/354/ab-4472-QA-Fixes-2
    
    AB-4472: QA fixes 2

commit 026a579ca3817a2a0fc42b4024bf58ef65b618ab
Merge: 1ce39b711 d535b248e
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Wed Apr 16 09:47:42 2025 -0600

    Merge development into rv/ab-4358-decimalpoint-locale

commit d535b248ebabcff296b0d3ce3e54894176d8c756
Merge: 1a6f7b3fd deb974efe
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Tue Apr 15 12:50:21 2025 -0600

    Merge pull request #2875 from trackabout/rv/ab-4358-rollback
    
    Revert "Merge pull request #2849 from trackabout/rv/ab-4358-decimalpo…

commit 1a6f7b3fdd10a817104d392d788267c424436cfb
Merge: 89a61c35d c08c43bd6
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Apr 15 09:34:14 2025 -0600

    Merge pull request #2874 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit c08c43bd688f9d5a0351e88806d0955f7bf2dca0
Merge: 5ed877e1d dfbedb82c
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Apr 15 09:31:22 2025 -0600

    Merge pull request #2861 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit dfbedb82c1ef14e370d5794c92fd381b322c64e3
Merge: ee5e8f4da 2d51fd335
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Apr 15 09:28:09 2025 -0600

    Merge pull request #2862 from trackabout/merge-production-into-client-test
    
    Merge production into client-test

commit 89a61c35d69672088b070e7bdaf21d09da6d5f05
Merge: a24d4d18b cab3880cf
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Apr 14 16:59:54 2025 -0400

    Merge pull request #2873 from trackabout/df/0354/ab-4201-maint-order-selection-screen
    
    AB#4201 - Fixes issues with scan items.

commit a24d4d18b3a9c49ce2105b4a6c77c7c8f9019dad
Merge: 01fcc14aa 6d48ce5c5
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Mon Apr 14 16:32:31 2025 -0400

    Merge pull request #2847 from trackabout/js/354/ab-4472
    
    AB-4472: Linde Peru Electronic Guide Number updates (and bonus fixes)

commit 01fcc14aa89664ba3f67855f89697166514e15de
Merge: f9be0da84 498430c4f
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Mon Apr 14 15:06:30 2025 -0400

    Merge pull request #2872 from trackabout/df/0354/ab-4201-maint-order-selection-screen
    
    AB#4201 - Bug Fixes

commit f9be0da8426251304dc0ea8fa3de79754eadb397
Merge: 9252a97f7 3cec232c9
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Sat Apr 12 17:08:35 2025 -0400

    Merge pull request #2871 from trackabout/df/0354/ab-4176/update-android-api-ver
    
    AB#4176 - Resolve issues with insets and signature view.

commit 9252a97f72ea797cc5514ab75dc2b025b2a8e980
Merge: 88211a701 77a66d4a7
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Apr 10 15:55:30 2025 -0600

    Merge pull request #2850 from trackabout/js/354/ab-4570
    
    AB-4570: TAM7: split deliveries show duplicate photos on the website

commit 88211a7015e6b7e91b4dbe9febba9ec79cab5154
Merge: 5233d46e8 377d09b80
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Thu Apr 10 15:52:55 2025 -0600

    Merge pull request #2824 from trackabout/cq/AB-4473
    
    AB#4473  Add config to make the length of Delivery Counter configurable.

commit 5233d46e8d51a689602b6ef1cab102f0036376d3
Merge: cb03c96bc 1d4621ab3
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Apr 10 12:27:45 2025 -0400

    Merge pull request #2856 from trackabout/df/0353/ab-4210-maint-work-order-workflow
    
    AB#4210 - Add skeleton workflow for Maintenance Work Order with placeholder screens

commit 1d4621ab364c6de19b33b13c55e9c90e701d980a
Merge: b40af2684 cb03c96bc
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Apr 10 12:02:28 2025 -0400

    AB-4210 - Merge with latest dev.

commit 2d51fd335c7bd44164cb4f640f35348d3ad0caba
Merge: a0e8c9d5e 9255c521a
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Thu Apr 10 11:06:40 2025 -0400

    Merge pull request #2870 from trackabout/dynamic-form-drop-down-issue
    
    AB#4664 - Prevent bottom action bar from obscuring dynamic form dropdown options

commit cb03c96bc3a31f0db9919642bcd3318016216146
Merge: 785f85eab 25721a0a2
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Wed Apr 9 19:42:00 2025 -0600

    Merge pull request #2838 from trackabout/rv/ab-4242-return-action-error
    
    AB4242 Added comments for using the incorrect return asset action com…

commit 785f85eabd5b32e46f0f4b47866cf80076863d97
Merge: 2996d4c9d af2612e42
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Wed Apr 9 16:43:42 2025 -0400

    Merge pull request #2869 from trackabout/df/0354/ab-4201-maint-order-selection-screen
    
    AB#4201 - Remove unused MaintenanceInfo code; fix null reference & improve specification factory

commit 2996d4c9da3b50c8482b7a057323ffa2841bb1be
Merge: 85b70e539 d43955cef
Author: Ranjith Vijayakumar <rvijayakumar@trackabout.com>
Date:   Wed Apr 9 13:21:44 2025 -0600

    Merge pull request #2849 from trackabout/rv/ab-4358-decimalpoint-locale
    
    AB4358 Decimal point issue in dynamic fields when French Locale is used

commit 85b70e5397b969c4238ccd58f27268a6b26a1fd9
Merge: f646025c9 4d31c8b97
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Apr 8 17:35:14 2025 -0400

    Merge pull request #2868 from trackabout/js/354/update-maui-ios-workload-to-9.0.102.1
    
    Pin guild to .NET 9.0.102, maui ios workload to 9.0.102.1

commit f646025c99bd0401f7ffc3a77cd36a62cdd4251f
Merge: 91e9f78ff e21ca0b2a
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Apr 8 15:50:17 2025 -0400

    Merge pull request #2854 from trackabout/js/354/ab-3945
    
    AB-3945: Analysis Records Save Twice in Some Cases

commit 91e9f78ff75d4065040c5221fe712877a730be06
Merge: 38315738c 71d507cbe
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Tue Apr 8 13:01:04 2025 -0600

    Merge pull request #2865 from trackabout/cq/UpdateTargetFrameworkIOS
    
    Update target framework iOS from net8.0 to net9.0.

commit 38315738c55ef966501694e5bb61dbca52a6ad34
Merge: c4034368b 9ce09a63b
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Tue Apr 8 12:06:59 2025 -0600

    Merge pull request #2864 from trackabout/cq/UpdateAzurePipelineDotNetVersion
    
    Update azure-pipelines.yml dotnet version from 8.0.x to 9.0.x.

commit c4034368b2e10d56d2424763ffeb4cc170d2a602
Merge: ea7d60baa aca4a47fd
Author: Drew Fleming <dfleming@trackabout.com>
Date:   Tue Apr 8 12:47:32 2025 -0400

    Merge pull request #2839 from trackabout/df/0354/ab-4201-maint-order-selection-screen
    
    AB#4201 - Maintenance Work Orders - TAM7 Order selection screen

commit ea7d60baa489d62d7736f53c28da458c0a5c8287
Merge: 03b791069 6fa5e787f
Author: Christian Quesada <108754994+Christian-Quesada@users.noreply.github.com>
Date:   Tue Apr 8 09:30:59 2025 -0600

    Merge pull request #2837 from trackabout/cq/AB-4406
    
    AB#4406 Fix Receipt not saving to site when signature is small.

commit 03b791069b399b1a7526d8dbf21e612e4b7f2ac9
Merge: 19f66165e 33bcf0808
Author: Jeff Sternal <jeffsternal@gmail.com>
Date:   Tue Apr 8 09:35:52 2025 -0400

    Merge pull request #2858 from trackabout/js/354/ab-4616
    
    AB-4616: add support for branch location delivery counters in thermal receipts

commit a0e8c9d5e84f529d94ca5ade914e4c9b365a727c
Merge: ad05db396 ee5e8f4da
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Apr 3 16:06:58 2025 -0500

    Merge pull request #2857 from trackabout/client-test
    
    Merge client-test to production

commit ee5e8f4da2575972ba6ec153304c5dd5dd73967a
Merge: 006dc0f11 5ed877e1d
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Thu Apr 3 15:57:35 2025 -0500

    Merge pull request #2860 from trackabout/qa
    
    Merge QA Into Client-Test

commit 19f66165e892d2c053d49bc229120115d5fceccd
Merge: 7c40891a0 5ed877e1d
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Apr 3 14:00:27 2025 -0600

    Merge pull request #2859 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 5ed877e1d7054b24e696a9cbb4319c348dea706f
Merge: 99eb15125 006dc0f11
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Thu Apr 3 11:49:57 2025 -0600

    Merge pull request #2841 from trackabout/merge-client-test-into-qa
    
    Merge client-test into qa

commit 7c40891a0dfb3a1821317ba83208d5167a2bb27b
Merge: 2da4ed75d 99eb15125
Author: Michael Kent <mjkent@users.noreply.github.com>
Date:   Wed Apr 2 09:05:35 2025 -0500

    Merge pull request #2845 from trackabout/merge-qa-into-development
    
    Merge qa into development

commit 99eb151253834f5ec895cb764e3eb8488792fbdc
Merge: 7849e28ae e42dfd413
Author: Subha Tarafdar <starafdar@trackabout.com>
Date:   Tue Apr 1 07:36:09 2025 -0600

    Merge pull request #2853 from trackabout/st/AB-3497-VoicePrompt-5
    
    AB-3497 - Voice Entry for TAM7
