From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/objects/Maintenance_Contract__c/fields/contractAmountForRate__c.field-meta.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/contractAmountForRate__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/contractAmountForRate__c.field-meta.xml
index d62df74..31a2ea5 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/contractAmountForRate__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/contractAmountForRate__c.field-meta.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>contractAmountForRate__c</fullName>
-    <description>IF(RecordType_DeveloperName__c == &apos;VM_Contract&apos;, Maintenance_Price_Amount__c , previousTotalContractAmount__c +(Contract_Amount__c - Estimation_Id__r.Asset_Repair_Sum_Price__c) * if( today() &gt; Contract_End_Date__c,1, (DATE(Year(today()),MONTH(today()),1) - Contract_Start_Date__c )/(Contract_End_Date__c- Contract_Start_Date__c +1) ))</description>
+    <description>IF(RecordType_DeveloperName__c == &apos;VM_Contract&apos;, Maintenance_Price_Amount__c , previousTotalContractAmount__c +(Contract_Amount__c - Estimation_Id__r.Asset_Repair_Sum_Price__c) * if( today() &gt; Contract_End_Date__c,1, (DATE(Year(today()),MONTH(today()),1) - Contract_Start_Date__c )/(Contract_End_Date__c- Contract_Start_Date__c +1) ))
+IF(RecordType_DeveloperName__c == &apos;VM_Contract&apos;, FM__c, previousTotalContractAmount__c +(Contract_Amount__c - Estimation_Id__r.Asset_Repair_Sum_Price__c) * if( today() &gt; Contract_End_Date__c,1, (DATE(Year(today()),MONTH(today()),1) - Contract_Start_Date__c )/(Contract_End_Date__c- Contract_Start_Date__c +1) ))</description>
     <externalId>false</externalId>
-    <formula>previousTotalContractAmount__c + ContractAmount_F__c * if( today() &gt; Contract_End_Date__c,1, (DATE(Year(today()),MONTH(today()),1) - Contract_Start_Date__c )/(Contract_End_Date__c- Contract_Start_Date__c +1) )</formula>
+    <formula>IF(RecordType_DeveloperName__c == &apos;VM_Contract&apos;, FM__c, previousTotalContractAmount__c +(Contract_Amount__c - Estimation_Id__r.Asset_Repair_Sum_Price__c) * if( today() &gt; Contract_End_Date__c,1, (DATE(Year(today()),MONTH(today()),1) - Contract_Start_Date__c )/(Contract_End_Date__c- Contract_Start_Date__c +1) ))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鍚堝悓閲戦(娑堣垂鐜囪绠楃敤鍒嗘瘝)</label>
     <precision>18</precision>

--
Gitblit v1.9.1