fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/dashboards/ConsumableSalesDashboard/ezyQWhsDlQfrUPdIMqUmGsdMeWiYAH2.dashboard-meta.xml

@@ -27,12 +27,12 @@
                <enableHover>false</enableHover>
                <expandOthers>false</expandOthers>
                <groupingColumn
        >Consumable_Orderdetails__c.HospItal_Name__c</groupingColumn>
                >Consumable_Orderdetails__c.HospItal_Name__c</groupingColumn>
                <groupingSortProperties>
                    <groupingSorts>
                        <groupingLevel>g1</groupingLevel>
                        <sortColumn
            >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        <sortOrder>d</sortOrder>
                    </groupingSorts>
                </groupingSortProperties>
@@ -40,7 +40,7 @@
                <legendPosition>Bottom</legendPosition>
                <maxValuesDisplayed>10</maxValuesDisplayed>
                <report
        >ConsumableSalesReport/CurrentMonthSalesRankByAccount</report>
                >ConsumableSalesReport/CurrentMonthSalesRankByAccount</report>
                <showPercentage>false</showPercentage>
                <showPicturesOnCharts>false</showPicturesOnCharts>
                <showValues>true</showValues>
@@ -69,12 +69,12 @@
                <enableHover>false</enableHover>
                <expandOthers>false</expandOthers>
                <groupingColumn
        >Consumable_Orderdetails__c.HospItal_Name__c</groupingColumn>
                >Consumable_Orderdetails__c.HospItal_Name__c</groupingColumn>
                <groupingSortProperties>
                    <groupingSorts>
                        <groupingLevel>g1</groupingLevel>
                        <sortColumn
            >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        <sortOrder>d</sortOrder>
                    </groupingSorts>
                </groupingSortProperties>
@@ -110,12 +110,12 @@
                <enableHover>false</enableHover>
                <expandOthers>false</expandOthers>
                <groupingColumn
        >Consumable_Orderdetails__c.Product_bbname__c</groupingColumn>
                >Consumable_Orderdetails__c.Product_bbname__c</groupingColumn>
                <groupingSortProperties>
                    <groupingSorts>
                        <groupingLevel>g1</groupingLevel>
                        <sortColumn
            >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        <sortOrder>d</sortOrder>
                    </groupingSorts>
                </groupingSortProperties>
@@ -123,7 +123,7 @@
                <legendPosition>Bottom</legendPosition>
                <maxValuesDisplayed>10</maxValuesDisplayed>
                <report
        >ConsumableSalesReport/CurrentMonthSalesRankByProduct</report>
                >ConsumableSalesReport/CurrentMonthSalesRankByProduct</report>
                <showPercentage>false</showPercentage>
                <showPicturesOnCharts>false</showPicturesOnCharts>
                <showValues>true</showValues>
@@ -152,12 +152,12 @@
                <enableHover>false</enableHover>
                <expandOthers>false</expandOthers>
                <groupingColumn
        >Consumable_Orderdetails__c.Product_bbname__c</groupingColumn>
                >Consumable_Orderdetails__c.Product_bbname__c</groupingColumn>
                <groupingSortProperties>
                    <groupingSorts>
                        <groupingLevel>g1</groupingLevel>
                        <sortColumn
            >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        >s!Consumable_Orderdetails__c.Sale_amount__c</sortColumn>
                        <sortOrder>d</sortOrder>
                    </groupingSorts>
                </groupingSortProperties>