リビジョン 245
消費税取得修正
請求まとめ対象リスト作成時クリア追加
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
---|---|---|
1832 | 1832 |
{ |
1833 | 1833 |
//???????????????? |
1834 | 1834 |
//dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KojiSeikyu].Value) * CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKinRitu].Value); |
1835 |
SystemMaster sm = new SystemMaster(); |
|
1836 |
dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KojiSeikyu].Value) * (sm.CooperationRate/100)); |
|
1835 |
//SystemMaster sm = new SystemMaster(); |
|
1836 |
//dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KojiSeikyu].Value) * (sm.CooperationRate/100));?@ |
|
1837 |
dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KojiSeikyu].Value) |
|
1838 |
* (CommonMotions.SystemMasterData.ConsumptionTax / 100)); |
|
1837 | 1839 |
} |
1838 | 1840 |
else |
1839 | 1841 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
---|---|---|
1295 | 1295 |
int ApprovalPerson = 0; |
1296 | 1296 |
string ApprovalPersonName = string.Empty; |
1297 | 1297 |
int ApprovalAuthority = 0; |
1298 |
DateTime dtApproval = DateTime.MinValue; |
|
1298 | 1299 |
|
1299 | 1300 |
foreach (DataGridViewRow CurRow in dgv.Rows) |
1300 | 1301 |
{ |
... | ... | |
1313 | 1314 |
ApprovalPerson = CommonMotions.cnvInt(CurRow.Cells[i].Value); |
1314 | 1315 |
ApprovalPersonName = CommonMotions.cnvString(CurRow.Cells[i + s_ShoninPersonNameCnt].Value); |
1315 | 1316 |
ApprovalAuthority = CommonMotions.cnvInt(CurRow.Cells[i + s_ShoninAuthorityCnt].Value); |
1316 |
|
|
1317 |
dtApproval = CommonMotions.cnvDate(CurRow.Cells[i + s_ShoninDateCnt].Value); |
|
1317 | 1318 |
if (ApprovalPerson == 0) continue; |
1318 | 1319 |
|
1319 | 1320 |
PaymentApprovalInfo DataRec = new PaymentApprovalInfo(); |
... | ... | |
1326 | 1327 |
DataRec.ApprovalPerson = ApprovalPerson; // ???F???? |
1327 | 1328 |
DataRec.ApprovalPersonName = ApprovalPersonName; // ???F??? |
1328 | 1329 |
DataRec.ApprovalAuthority = ApprovalAuthority; // ???F???? |
1330 |
DataRec.ApprovalDate = dtApproval; // ???F???t |
|
1329 | 1331 |
|
1330 | 1332 |
DataList.Add(DataRec); |
1331 | 1333 |
} |
... | ... | |
1364 | 1366 |
// ----- ?x?????F???f?[?^?Z?b?g |
1365 | 1367 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
1366 | 1368 |
ArrayList DataList = new ArrayList(); |
1369 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
|
1367 | 1370 |
SetApprovalInfoData(dgv, ref DataList); |
1368 | 1371 |
if (DataList.Count > 0) ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Add(DataList); |
1369 | 1372 |
|
... | ... | |
1409 | 1412 |
// ----- ?x?????F???f?[?^ |
1410 | 1413 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
1411 | 1414 |
ArrayList DataList = new ArrayList(); |
1415 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
|
1412 | 1416 |
SetApprovalInfoData(dgv, ref DataList); |
1413 | 1417 |
if (DataList.Count > 0) ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Add(DataList); |
1414 | 1418 |
|
... | ... | |
1450 | 1454 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
1451 | 1455 |
ArrayList DataList = new ArrayList(); |
1452 | 1456 |
SetApprovalInfoData(dgv, ref DataList); |
1457 |
frm.ArrayParam.Clear(); |
|
1453 | 1458 |
if (DataList.Count > 0) frm.ArrayParam.Add(DataList); |
1454 | 1459 |
|
1455 | 1460 |
// ?\???E???F???R?[?h?X?V |
... | ... | |
1501 | 1506 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
1502 | 1507 |
ArrayList DataList = new ArrayList(); |
1503 | 1508 |
SetApprovalInfoData(dgv, ref DataList); |
1509 |
frm.ArrayParam.Clear(); |
|
1504 | 1510 |
if (DataList.Count > 0) frm.ArrayParam.Add(DataList); |
1505 | 1511 |
|
1506 | 1512 |
// ?\???E???F???R?[?h?X?V |
... | ... | |
1552 | 1558 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
1553 | 1559 |
ArrayList DataList = new ArrayList(); |
1554 | 1560 |
SetApprovalInfoData(dgv, ref DataList); |
1561 |
frm.ArrayParam.Clear(); |
|
1555 | 1562 |
if (DataList.Count > 0) frm.ArrayParam.Add(DataList); |
1556 | 1563 |
|
1557 | 1564 |
// ?\???E???F???R?[?h?X?V |
他の形式にエクスポート: Unified diff