From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/objects/Repair_Quotation__c/fields/Request_discount_price__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Repair_Quotation__c/fields/Request_discount_price__c.field-meta.xml b/force-app/main/default/objects/Repair_Quotation__c/fields/Request_discount_price__c.field-meta.xml
index 7240288..c57b6d9 100644
--- a/force-app/main/default/objects/Repair_Quotation__c/fields/Request_discount_price__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair_Quotation__c/fields/Request_discount_price__c.field-meta.xml
@@ -4,7 +4,7 @@
     <externalId>false</externalId>
     <formula>IF(Isnull(Request_amount_after_discount__c)
   ,-1 * (Nullvalue(sales_discount__c, 0) + Nullvalue(Set_discount__c, 0) + Nullvalue(Contract_target__c, 0))
-  , (Request_discount_amount__c + Nullvalue(New_QIS_free__c,0) + Nullvalue(New_QIS_not_QIS_issue__c,0) + Nullvalue(Contract_free__c,0) + Nullvalue(Contract_not_QIS_issue__c,0) + Nullvalue(Loaner_repair__c,0) + Nullvalue(maintenance_pj__c,0) + Nullvalue(CCD_cut__c,0) + Nullvalue(Special_offer__c,0) + Nullvalue(long_term_insurance__c,0) + Nullvalue(long_term_insurance_MD__c,0) + Nullvalue(Servince_contract_discount_amount__c,0) + Nullvalue(Delivery_compensation__c,0) + Nullvalue(Other_discount__c,0))
+  , (Request_discount_amount__c + Nullvalue(New_QIS_free__c,0) + Nullvalue(New_QIS_not_QIS_issue__c,0) + Nullvalue(Contract_free__c,0) + Nullvalue(Contract_not_QIS_issue__c,0) + Nullvalue(Loaner_repair__c,0) + Nullvalue(maintenance_pj__c,0) + Nullvalue(CCD_cut__c,0)+Nullvalue(callback_corresponding__c,0) + Nullvalue(Special_offer__c,0) + Nullvalue(long_term_insurance__c,0) + Nullvalue(long_term_insurance_MD__c,0) + Nullvalue(Servince_contract_discount_amount__c,0) + Nullvalue(Delivery_compensation__c,0) + Nullvalue(Other_discount__c,0))
 )</formula>
     <label>鐢宠鍑忎环浠锋牸</label>
     <precision>18</precision>

--
Gitblit v1.9.1