リビジョン 446
入金明細入力の修正（消費税・差分の計算修正）
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs | ||
|---|---|---|
| 1188 | 1188 |
case (int)DispColumn.DepositAmount: |
| 1189 | 1189 |
depositDetail.DepositAmount = amount; |
| 1190 | 1190 |
// 消費税額計算 |
| 1191 |
depositDetail.TaxAmount = CommonMotions.cnvRound(amount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
| 1191 |
DPAmount = amount + depositDetail.DiscountAmount; |
|
| 1192 |
depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
| 1192 | 1193 |
bUpdateCarryAmount = true; |
| 1193 | 1194 |
sumDataCheck = true; |
| 1194 | 1195 |
break; |
| ... | ... | |
| 1200 | 1201 |
case (int)DispColumn.DiscountAmount: |
| 1201 | 1202 |
depositDetail.DiscountAmount = amount; |
| 1202 | 1203 |
// 消費税額計算 |
| 1203 |
DPAmount = DPAmount + amount + depositDetail.CnstrPrice + depositDetail.Fees+ depositDetail.OtherAdjustments;
|
|
| 1204 |
DPAmount = DPAmount + amount; |
|
| 1204 | 1205 |
depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
| 1205 | 1206 |
bUpdateCarryAmount = true; |
| 1206 | 1207 |
sumDataCheck = true; |
| ... | ... | |
| 1208 | 1209 |
case (int)DispColumn.CnstrPrice: |
| 1209 | 1210 |
depositDetail.CnstrPrice = amount; |
| 1210 | 1211 |
// 消費税額計算 |
| 1211 |
DPAmount = DPAmount + amount + depositDetail.DiscountAmount + depositDetail.Fees + depositDetail.OtherAdjustments; |
|
| 1212 |
depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
| 1212 |
//DPAmount = DPAmount + amount + depositDetail.DiscountAmount + depositDetail.Fees + depositDetail.OtherAdjustments;
|
|
| 1213 |
//depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0));
|
|
| 1213 | 1214 |
bUpdateCarryAmount = true; |
| 1214 | 1215 |
sumDataCheck = true; |
| 1215 | 1216 |
break; |
| 1216 | 1217 |
case (int)DispColumn.Fees: |
| 1217 | 1218 |
depositDetail.Fees = amount; |
| 1218 | 1219 |
// 消費税額計算 |
| 1219 |
DPAmount = DPAmount + amount + depositDetail.DiscountAmount + depositDetail.CnstrPrice + depositDetail.OtherAdjustments; |
|
| 1220 |
depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
| 1220 |
//DPAmount = DPAmount + amount + depositDetail.DiscountAmount + depositDetail.CnstrPrice + depositDetail.OtherAdjustments;
|
|
| 1221 |
//depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0));
|
|
| 1221 | 1222 |
bUpdateCarryAmount = true; |
| 1222 | 1223 |
sumDataCheck = true; |
| 1223 | 1224 |
break; |
| 1224 | 1225 |
case (int)DispColumn.OtherAdjustments: |
| 1225 | 1226 |
depositDetail.OtherAdjustments = amount; |
| 1226 | 1227 |
// 消費税額計算 |
| 1227 |
DPAmount = DPAmount + amount + depositDetail.DiscountAmount + depositDetail.CnstrPrice + depositDetail.Fees; |
|
| 1228 |
depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
| 1228 |
//DPAmount = DPAmount + amount + depositDetail.DiscountAmount + depositDetail.CnstrPrice + depositDetail.Fees;
|
|
| 1229 |
//depositDetail.TaxAmount = CommonMotions.cnvRound(DPAmount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0));
|
|
| 1229 | 1230 |
bUpdateCarryAmount = true; |
| 1230 | 1231 |
sumDataCheck = true; |
| 1231 | 1232 |
break; |
他の形式にエクスポート: Unified diff