リビジョン 145
給与計算日表示ミス修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 32;
|
|
| 17 |
public static int s_SystemVersion = 33;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
|---|---|---|
| 1833 | 1833 |
DateTime stDate = DateTime.Today; |
| 1834 | 1834 |
DateTime edDate = DateTime.Today; |
| 1835 | 1835 |
|
| 1836 |
DateTime dtCurDefaultStart = dtDefaultStart; |
|
| 1837 |
DateTime dtCurDefaultEnd = DateTime.Today; |
|
| 1838 | 1836 |
// ???^???W?v???? |
| 1839 | 1837 |
for (int i = 0; i < PersonCDArray.Count; i++) |
| 1840 | 1838 |
{
|
| ... | ... | |
| 1848 | 1846 |
// ??v???Z |
| 1849 | 1847 |
TotalSalary += workSalary; |
| 1850 | 1848 |
|
| 1851 |
if (stDate < dtCurDefaultStart) dtCurDefaultStart = stDate; |
|
| 1852 |
if (dtCurDefaultEnd < edDate) dtCurDefaultEnd = edDate; |
|
| 1853 | 1849 |
} |
| 1854 |
if (PersonCDArray.Count == 1) |
|
| 1855 |
{
|
|
| 1856 |
if (dtHireStDayArray[0] != DateTime.MinValue) |
|
| 1857 |
if (dtDefaultStart < dtHireStDayArray[0]) dtCurDefaultStart = dtHireStDayArray[0]; |
|
| 1858 | 1850 |
|
| 1859 |
if (dtHireEdDayArray[0] != DateTime.MinValue) |
|
| 1860 |
if (dtHireEdDayArray[0] < dtDefaultEnd) dtCurDefaultEnd = dtHireEdDayArray[0]; |
|
| 1861 |
} |
|
| 1862 |
|
|
| 1863 | 1851 |
// ----- ?\?????? |
| 1864 | 1852 |
// ?U?????^???z?E?????v???z?E?e???v???z?? |
| 1865 | 1853 |
ProfitGeneral(ref OnSalary, ref NetIncome, ref NonSalary); |
| ... | ... | |
| 1895 | 1883 |
lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
|
| 1896 | 1884 |
|
| 1897 | 1885 |
// ???^?v?Z?J?n???E?I???? |
| 1898 |
lblStartDate.Text = dtCurDefaultStart.ToShortDateString();
|
|
| 1899 |
lblEndDate.Text = dtCurDefaultEnd.ToShortDateString();
|
|
| 1886 |
lblStartDate.Text = stDate.ToShortDateString();
|
|
| 1887 |
lblEndDate.Text = edDate.ToShortDateString();
|
|
| 1900 | 1888 |
} |
| 1901 | 1889 |
catch (Exception ex) |
| 1902 | 1890 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
|---|---|---|
| 1866 | 1866 |
DateTime stDate = DateTime.Today; |
| 1867 | 1867 |
DateTime edDate = DateTime.Today; |
| 1868 | 1868 |
|
| 1869 |
DateTime dtCurDefaultStart = dtDefaultStart; |
|
| 1870 |
DateTime dtCurDefaultEnd = DateTime.Today; |
|
| 1871 | 1869 |
// ???^???W?v???? |
| 1872 | 1870 |
for (int i = 0; i < PersonCDArray.Count; i++) |
| 1873 | 1871 |
{
|
| ... | ... | |
| 1880 | 1878 |
int workSalary = CalcElapsedSalary(stDate, edDate, PersonCDArray[i], SalaryArray[i]); |
| 1881 | 1879 |
// ??v???Z |
| 1882 | 1880 |
TotalSalary += workSalary; |
| 1883 |
|
|
| 1884 |
if (stDate < dtCurDefaultStart) dtCurDefaultStart = stDate; |
|
| 1885 |
if (dtCurDefaultEnd < edDate) dtCurDefaultEnd = edDate; |
|
| 1886 | 1881 |
} |
| 1887 | 1882 |
|
| 1888 | 1883 |
// ----- ?\?????? |
| ... | ... | |
| 1920 | 1915 |
lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
|
| 1921 | 1916 |
|
| 1922 | 1917 |
// ???^?v?Z?J?n???E?I???? |
| 1923 |
lblStartDate.Text = dtCurDefaultStart.ToShortDateString();
|
|
| 1924 |
lblEndDate.Text = dtCurDefaultEnd.ToShortDateString();
|
|
| 1918 |
lblStartDate.Text = stDate.ToShortDateString();
|
|
| 1919 |
lblEndDate.Text = edDate.ToShortDateString();
|
|
| 1925 | 1920 |
} |
| 1926 | 1921 |
catch (Exception ex) |
| 1927 | 1922 |
{
|
他の形式にエクスポート: Unified diff