Merge pull request #6 from SFDO-Community/feature/fix-expenditure-typo

Fixes Expenditure Typo
SalesforceFoundation · Feb 14, 2019 · d27be2d · d27be2d
2 parents dc52f2e + 3b5501d
commit d27be2d
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 64 deletions.
diff --git a/cumulusci.yml b/cumulusci.yml
@@ -2,7 +2,7 @@ project:
     name: OutboundFundsNPSP
     package:
         name:  Outbound Funds (npsp)
-        namespace: outfundsnpsp
+        namespace: outfundsnpspext
         api_version: '42.0'
     dependencies:
         - github: 'https://github.com/SalesforceFoundation/Cumulus'

diff --git a/src/flexipages/Disbursement_NPSP_Record.flexipage b/src/flexipages/Disbursement_NPSP_Record.flexipage
@@ -93,7 +93,7 @@
             </componentInstanceProperties>
             <componentInstanceProperties>
                 <name>title</name>
-                <value>GAU Expendatures</value>
+                <value>GAU Expenditures</value>
             </componentInstanceProperties>
             <componentName>flexipage:tab</componentName>
         </componentInstances>

diff --git a/...ges/GAU_Expendature_Record_Page.flexipage → ...ges/GAU_Expenditure_Record_Page.flexipage b/...ges/GAU_Expendature_Record_Page.flexipage → ...ges/GAU_Expenditure_Record_Page.flexipage
@@ -22,8 +22,8 @@
         <name>main</name>
         <type>Region</type>
     </flexiPageRegions>
-    <masterLabel>GAU Expendature Record Page</masterLabel>
-    <sobjectType>GAU_Expendature__c</sobjectType>
+    <masterLabel>GAU Expenditure Record Page</masterLabel>
+    <sobjectType>GAU_Expenditure__c</sobjectType>
     <template>
         <name>flexipage:recordHomeSingleColTemplateDesktop</name>
     </template>

diff --git a/src/flexipages/GAU_Record_Page.flexipage → .../GAU_Outbound_Funds_Record_Page.flexipage b/src/flexipages/GAU_Record_Page.flexipage → .../GAU_Outbound_Funds_Record_Page.flexipage
@@ -8,7 +8,7 @@
             </componentInstanceProperties>
             <componentInstanceProperties>
                 <name>numVisibleActions</name>
-                <value>3</value>
+                <value>4</value>
             </componentInstanceProperties>
             <componentName>force:highlightsPanel</componentName>
         </componentInstances>
@@ -62,6 +62,10 @@
     </flexiPageRegions>
     <flexiPageRegions>
         <componentInstances>
+            <componentInstanceProperties>
+                <name>active</name>
+                <value>true</value>
+            </componentInstanceProperties>
             <componentInstanceProperties>
                 <name>body</name>
                 <value>facet-6882b7c2-c3a6-4e70-aea7-3a39acb66d9c</value>
@@ -75,7 +79,7 @@
         <componentInstances>
             <componentInstanceProperties>
                 <name>active</name>
-                <value>true</value>
+                <value>false</value>
             </componentInstanceProperties>
             <componentInstanceProperties>
                 <name>body</name>
@@ -94,7 +98,7 @@
             </componentInstanceProperties>
             <componentInstanceProperties>
                 <name>title</name>
-                <value>Expendatures</value>
+                <value>Expenditures</value>
             </componentInstanceProperties>
             <componentName>flexipage:tab</componentName>
         </componentInstances>
@@ -112,7 +116,7 @@
         <name>main</name>
         <type>Region</type>
     </flexiPageRegions>
-    <masterLabel>GAU Record Page</masterLabel>
+    <masterLabel>GAU Outbound Funds Record Page</masterLabel>
     <sobjectType>npsp__General_Accounting_Unit__c</sobjectType>
     <template>
         <name>flexipage:recordHomeSingleColTemplateDesktop</name>

diff --git a/...endature__c-GAU Expendature Layout.layout → ...enditure__c-GAU Expenditure Layout.layout b/...endature__c-GAU Expendature Layout.layout → ...enditure__c-GAU Expenditure Layout.layout
@@ -16,8 +16,7 @@
                 <field>Amount__c</field>
             </layoutItems>
         </layoutColumns>
-        <layoutColumns/>
-        <style>TwoColumnsTopToBottom</style>
+        <style>OneColumn</style>
     </layoutSections>
     <layoutSections>
         <customLabel>false</customLabel>
@@ -86,7 +85,7 @@
     <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
     <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
     <summaryLayout>
-        <masterLabel>00hf4000002vCvd</masterLabel>
+        <masterLabel>00hf4000004UyVF</masterLabel>
         <sizeX>4</sizeX>
         <sizeY>0</sizeY>
         <summaryLayoutStyle>Default</summaryLayoutStyle>

diff --git a/...nit__c-GAU w%2FDisbursement Layout.layout → ..._Unit__c-GAU Outbound Funds Layout.layout b/...nit__c-GAU w%2FDisbursement Layout.layout → ..._Unit__c-GAU Outbound Funds Layout.layout
@@ -68,29 +68,29 @@
         <layoutColumns>
             <layoutItems>
                 <behavior>Readonly</behavior>
-                <field>Total_Disbursed__c</field>
+                <field>Last_Disbursement_Date__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Readonly</behavior>
-                <field>Smallest_Disbursement__c</field>
+                <field>First_Disbursement_Date__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Readonly</behavior>
-                <field>Largest_Disbursement__c</field>
+                <field>Total_Number_of_Disbursements__c</field>
             </layoutItems>
         </layoutColumns>
         <layoutColumns>
             <layoutItems>
                 <behavior>Readonly</behavior>
-                <field>First_Disbursement_Date__c</field>
+                <field>Largest_Disbursement__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Readonly</behavior>
-                <field>Last_Disbursement_Date__c</field>
+                <field>Smallest_Disbursement__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Readonly</behavior>
-                <field>Total_Number_of_Disbursements__c</field>
+                <field>Total_Disbursed__c</field>
             </layoutItems>
         </layoutColumns>
         <style>TwoColumnsLeftToRight</style>
@@ -179,31 +179,26 @@
         <layoutColumns/>
         <style>CustomLinks</style>
     </layoutSections>
-    <miniLayout>
-        <fields>Name</fields>
-        <fields>npsp__Active__c</fields>
-        <fields>Amount_Available__c</fields>
-    </miniLayout>
     <platformActionList>
         <actionListContext>Record</actionListContext>
         <platformActionListItems>
-            <actionName>Edit</actionName>
-            <actionType>StandardButton</actionType>
+            <actionName>npsp__Recalculate_Rollups</actionName>
+            <actionType>CustomButton</actionType>
             <sortOrder>0</sortOrder>
         </platformActionListItems>
         <platformActionListItems>
-            <actionName>Delete</actionName>
+            <actionName>Edit</actionName>
             <actionType>StandardButton</actionType>
             <sortOrder>1</sortOrder>
         </platformActionListItems>
         <platformActionListItems>
-            <actionName>Clone</actionName>
+            <actionName>Delete</actionName>
             <actionType>StandardButton</actionType>
             <sortOrder>2</sortOrder>
         </platformActionListItems>
         <platformActionListItems>
-            <actionName>npsp__Recalculate_Rollups</actionName>
-            <actionType>CustomButton</actionType>
+            <actionName>Clone</actionName>
+            <actionType>StandardButton</actionType>
             <sortOrder>3</sortOrder>
         </platformActionListItems>
     </platformActionList>
@@ -212,8 +207,15 @@
         <fields>npsp__Opportunity__c</fields>
         <fields>npsp__Percent__c</fields>
         <fields>npsp__Amount__c</fields>
+        <fields>npsp__Campaign__c</fields>
         <relatedList>npsp__Allocation__c.npsp__General_Accounting_Unit__c</relatedList>
     </relatedLists>
+    <relatedLists>
+        <fields>NAME</fields>
+        <fields>Disbursement__c</fields>
+        <fields>Amount__c</fields>
+        <relatedList>GAU_Expenditure__c.General_Accounting_Unit__c</relatedList>
+    </relatedLists>
     <relatedLists>
         <fields>TASK.SUBJECT</fields>
         <fields>TASK.WHO_NAME</fields>
@@ -233,17 +235,13 @@
         <fields>TASK.LAST_UPDATE</fields>
         <relatedList>RelatedHistoryList</relatedList>
     </relatedLists>
-    <relatedLists>
-        <fields>NAME</fields>
-        <relatedList>GAU_Expendature__c.General_Accounting_Unit__c</relatedList>
-    </relatedLists>
     <showEmailCheckbox>false</showEmailCheckbox>
     <showHighlightsPanel>false</showHighlightsPanel>
     <showInteractionLogPanel>false</showInteractionLogPanel>
     <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
     <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
     <summaryLayout>
-        <masterLabel>00hf4000002vHQJ</masterLabel>
+        <masterLabel>00hf4000004V09p</masterLabel>
         <sizeX>4</sizeX>
         <sizeY>0</sizeY>
         <summaryLayoutStyle>Default</summaryLayoutStyle>

diff --git a/...sbursement w%2FExpendatures Layout.layout → ...sement__c-Disbursement NPSP Layout.layout b/...sbursement w%2FExpendatures Layout.layout → ...sement__c-Disbursement NPSP Layout.layout
@@ -114,7 +114,7 @@
         <fields>Amount__c</fields>
         <fields>General_Accounting_Unit__c</fields>
         <fields>CREATED_DATE</fields>
-        <relatedList>GAU_Expendature__c.Disbursement__c</relatedList>
+        <relatedList>GAU_Expenditure__c.Disbursement__c</relatedList>
     </relatedLists>
     <relatedLists>
         <relatedList>RelatedFileList</relatedList>
@@ -125,7 +125,7 @@
     <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
     <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
     <summaryLayout>
-        <masterLabel>00hf4000002vHe4</masterLabel>
+        <masterLabel>00hf4000004UyVG</masterLabel>
         <sizeX>4</sizeX>
         <sizeY>0</sizeY>
         <summaryLayoutStyle>Default</summaryLayoutStyle>

diff --git a/src/objects/GAU_Expendature__c.object → src/objects/GAU_Expenditure__c.object b/src/objects/GAU_Expendature__c.object → src/objects/GAU_Expenditure__c.object
@@ -43,12 +43,12 @@
     <allowInChatterGroups>false</allowInChatterGroups>
     <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
     <compactLayouts>
-        <fullName>GAU_Expendature_Compact_Layout</fullName>
+        <fullName>GAU_Expenditure_Compact_Layout</fullName>
         <fields>Name</fields>
         <fields>Disbursement__c</fields>
         <fields>Amount__c</fields>
         <fields>General_Accounting_Unit__c</fields>
-        <label>GAU Expendature Compact Layout</label>
+        <label>GAU Expenditure Compact Layout</label>
     </compactLayouts>
     <deploymentStatus>Deployed</deploymentStatus>
     <deprecated>false</deprecated>
@@ -81,7 +81,6 @@
         <externalId>false</externalId>
         <label>Disbursement</label>
         <referenceTo>outfunds__Disbursement__c</referenceTo>
-        <relationshipLabel>GAU Expendatures</relationshipLabel>
         <relationshipName>GAU_Expendatures</relationshipName>
         <required>false</required>
         <trackTrending>false</trackTrending>
@@ -94,21 +93,20 @@
         <externalId>false</externalId>
         <label>General Accounting Unit</label>
         <referenceTo>npsp__General_Accounting_Unit__c</referenceTo>
-        <relationshipLabel>GAU Expendatures</relationshipLabel>
         <relationshipName>GAU_Expendatures</relationshipName>
         <relationshipOrder>0</relationshipOrder>
         <reparentableMasterDetail>true</reparentableMasterDetail>
         <trackTrending>false</trackTrending>
         <type>MasterDetail</type>
         <writeRequiresMasterRead>true</writeRequiresMasterRead>
     </fields>
-    <label>GAU Expendature</label>
+    <label>GAU Expenditure</label>
     <nameField>
         <displayFormat>GAUE-{00000}</displayFormat>
-        <label>GAU Expendature Number</label>
+        <label>GAU Expenditure Number</label>
         <type>AutoNumber</type>
     </nameField>
-    <pluralLabel>GAU Expendatures</pluralLabel>
+    <pluralLabel>GAU Expenditures</pluralLabel>
     <searchLayouts/>
     <sharingModel>ControlledByParent</sharingModel>
     <visibility>Public</visibility>

diff --git a/src/objects/npsp__General_Accounting_Unit__c.object b/src/objects/npsp__General_Accounting_Unit__c.object
@@ -19,8 +19,8 @@
         <deprecated>false</deprecated>
         <externalId>false</externalId>
         <label>First Disbursement Date</label>
-        <summarizedField>GAU_Expendature__c.CreatedDate</summarizedField>
-        <summaryForeignKey>GAU_Expendature__c.General_Accounting_Unit__c</summaryForeignKey>
+        <summarizedField>GAU_Expenditure__c.CreatedDate</summarizedField>
+        <summaryForeignKey>GAU_Expenditure__c.General_Accounting_Unit__c</summaryForeignKey>
         <summaryOperation>min</summaryOperation>
         <trackHistory>false</trackHistory>
         <trackTrending>false</trackTrending>
@@ -31,8 +31,8 @@
         <deprecated>false</deprecated>
         <externalId>false</externalId>
         <label>Largest Disbursement ($)</label>
-        <summarizedField>GAU_Expendature__c.Amount__c</summarizedField>
-        <summaryForeignKey>GAU_Expendature__c.General_Accounting_Unit__c</summaryForeignKey>
+        <summarizedField>GAU_Expenditure__c.Amount__c</summarizedField>
+        <summaryForeignKey>GAU_Expenditure__c.General_Accounting_Unit__c</summaryForeignKey>
         <summaryOperation>max</summaryOperation>
         <trackHistory>false</trackHistory>
         <trackTrending>false</trackTrending>
@@ -43,8 +43,8 @@
         <deprecated>false</deprecated>
         <externalId>false</externalId>
         <label>Last Disbursement Date</label>
-        <summarizedField>GAU_Expendature__c.CreatedDate</summarizedField>
-        <summaryForeignKey>GAU_Expendature__c.General_Accounting_Unit__c</summaryForeignKey>
+        <summarizedField>GAU_Expenditure__c.CreatedDate</summarizedField>
+        <summaryForeignKey>GAU_Expenditure__c.General_Accounting_Unit__c</summaryForeignKey>
         <summaryOperation>max</summaryOperation>
         <trackHistory>false</trackHistory>
         <trackTrending>false</trackTrending>
@@ -55,8 +55,8 @@
         <deprecated>false</deprecated>
         <externalId>false</externalId>
         <label>Smallest Disbursement</label>
-        <summarizedField>GAU_Expendature__c.Amount__c</summarizedField>
-        <summaryForeignKey>GAU_Expendature__c.General_Accounting_Unit__c</summaryForeignKey>
+        <summarizedField>GAU_Expenditure__c.Amount__c</summarizedField>
+        <summaryForeignKey>GAU_Expenditure__c.General_Accounting_Unit__c</summaryForeignKey>
         <summaryOperation>min</summaryOperation>
         <trackHistory>false</trackHistory>
         <trackTrending>false</trackTrending>
@@ -67,8 +67,8 @@
         <deprecated>false</deprecated>
         <externalId>false</externalId>
         <label>Total Disbursed ($)</label>
-        <summarizedField>GAU_Expendature__c.Amount__c</summarizedField>
-        <summaryForeignKey>GAU_Expendature__c.General_Accounting_Unit__c</summaryForeignKey>
+        <summarizedField>GAU_Expenditure__c.Amount__c</summarizedField>
+        <summaryForeignKey>GAU_Expenditure__c.General_Accounting_Unit__c</summaryForeignKey>
         <summaryOperation>sum</summaryOperation>
         <trackHistory>false</trackHistory>
         <trackTrending>false</trackTrending>
@@ -79,7 +79,7 @@
         <deprecated>false</deprecated>
         <externalId>false</externalId>
         <label>Total Number of Disbursements</label>
-        <summaryForeignKey>GAU_Expendature__c.General_Accounting_Unit__c</summaryForeignKey>
+        <summaryForeignKey>GAU_Expenditure__c.General_Accounting_Unit__c</summaryForeignKey>
         <summaryOperation>count</summaryOperation>
         <trackHistory>false</trackHistory>
         <trackTrending>false</trackTrending>

diff --git a/src/package.xml b/src/package.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Outbound Funds %28npsp%29</fullName>
+    <apiAccessLevel>Unrestricted</apiAccessLevel>
+    <description>Extension package to connect Outbound Funds to the NPSP.</description>
+    <namespacePrefix>outfundsnpspext</namespacePrefix>
     <types>
-        <members>GAU_Expendature__c.GAU_Expendature_Compact_Layout</members>
+        <members>GAU_Expenditure__c.GAU_Expenditure_Compact_Layout</members>
         <name>CompactLayout</name>
     </types>
     <types>
-        <members>GAU_Expendature__c.Amount__c</members>
-        <members>GAU_Expendature__c.Disbursement__c</members>
-        <members>GAU_Expendature__c.General_Accounting_Unit__c</members>
+        <members>GAU_Expenditure__c.Amount__c</members>
+        <members>GAU_Expenditure__c.Disbursement__c</members>
+        <members>GAU_Expenditure__c.General_Accounting_Unit__c</members>
         <members>npsp__General_Accounting_Unit__c.Amount_Available__c</members>
         <members>npsp__General_Accounting_Unit__c.First_Disbursement_Date__c</members>
         <members>npsp__General_Accounting_Unit__c.Largest_Disbursement__c</members>
@@ -19,20 +22,20 @@
         <name>CustomField</name>
     </types>
     <types>
-        <members>GAU_Expendature__c</members>
+        <members>GAU_Expenditure__c</members>
         <name>CustomObject</name>
     </types>
     <types>
         <members>Disbursement_NPSP_Record</members>
-        <members>GAU_Expendature_Record_Page</members>
-        <members>GAU_Record_Page</members>
+        <members>GAU_Expenditure_Record_Page</members>
+        <members>GAU_Outbound_Funds_Record_Page</members>
         <name>FlexiPage</name>
     </types>
     <types>
-        <members>GAU_Expendature__c-GAU Expendature Layout</members>
-        <members>npsp__General_Accounting_Unit__c-GAU w%2FDisbursement Layout</members>
-        <members>outfunds__Disbursement__c-Disbursement w%2FExpendatures Layout</members>
+        <members>GAU_Expenditure__c-GAU Expenditure Layout</members>
+        <members>npsp__General_Accounting_Unit__c-GAU Outbound Funds Layout</members>
+        <members>outfunds__Disbursement__c-Disbursement NPSP Layout</members>
         <name>Layout</name>
     </types>
     <version>42.0</version>
-</Package>
+</Package>