Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev

admin

2025-01-22 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def

@@ -45,6 +45,8 @@
          Properties:
          [
            DataType: 'MacroPlan'
            FilterArguments: 'factory:QLibMacroPlannerWebUI::ApplicationMacroPlanner.dhSelectedFactoryMCRR'
            FixedFilter: 'object.Filter( factory )'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'MachineLogisticsCostReportRow'
@@ -54,7 +56,7 @@
      Properties:
      [
        Legend: 'Category'
        SortCriteria: 'Category'
        SortCriteria: 'Index;Category'
        Taborder: 1
      ]
    }
@@ -79,7 +81,7 @@
      ]
      Properties:
      [
        Legend: 'StartDate'
        Legend: 'DisplayName'
        SortCriteria: 'StartDate'
        Taborder: 2
      ]