From 042735c4d44e740121dbbb52257617d348a1c391 Mon Sep 17 00:00:00 2001 From: fuyu <fuyu@prec-tech.com> Date: 星期一, 06 三月 2023 13:39:38 +0800 Subject: [PATCH] Merge branch '进口单证+obsap+导入' --- force-app/main/default/objects/Statu_Achievements_Journal__c/fields/ShippedAmount_without_tax_F__c.field-meta.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/force-app/main/default/objects/Statu_Achievements_Journal__c/fields/ShippedAmount_without_tax_F__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements_Journal__c/fields/ShippedAmount_without_tax_F__c.field-meta.xml index ca11fce..47f6333 100644 --- a/force-app/main/default/objects/Statu_Achievements_Journal__c/fields/ShippedAmount_without_tax_F__c.field-meta.xml +++ b/force-app/main/default/objects/Statu_Achievements_Journal__c/fields/ShippedAmount_without_tax_F__c.field-meta.xml @@ -13,8 +13,11 @@ ShippedAmount__c * 6.5, IF(DeliveryDate__c < Datevalue("2018-05-01") , ShippedAmount__c * 6.8, +IF(DeliveryDate__c < Datevalue("2018-11-01") , +ShippedAmount__c * 6.3, IF(DeliveryDate__c < Datevalue($Label.Tax_Foreign_Date) , -ShippedAmount__c * 6.3,ShippedAmount__c * 6.8 +ShippedAmount__c * 6.8,ShippedAmount__c * 6.43 +) ) ) ) -- Gitblit v1.9.1