リビジョン 227
部署まとめ・台帳まとめ不具合修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 51;
|
|
| 17 |
public static int s_SystemVersion = 52;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
|---|---|---|
| 1676 | 1676 |
{
|
| 1677 | 1677 |
try |
| 1678 | 1678 |
{
|
| 1679 |
if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 1679 |
if (StartDate == DateTime.MinValue)
|
|
| 1680 | 1680 |
{
|
| 1681 |
StartDate = HireStartDate; |
|
| 1682 |
} |
|
| 1683 |
else if (dtDefaultStart < StartDate) |
|
| 1684 |
{
|
|
| 1685 | 1681 |
StartDate = dtDefaultStart; |
| 1686 | 1682 |
} |
| 1687 |
else if (StartDate == DateTime.MaxValue)
|
|
| 1683 |
else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 1688 | 1684 |
{
|
| 1689 |
StartDate = dtDefaultStart;
|
|
| 1685 |
StartDate = HireStartDate;
|
|
| 1690 | 1686 |
} |
| 1691 |
else |
|
| 1687 |
else if (dtDefaultStart < StartDate)
|
|
| 1692 | 1688 |
{
|
| 1693 | 1689 |
StartDate = dtDefaultStart; |
| 1694 | 1690 |
} |
| ... | ... | |
| 1705 | 1701 |
{ // ??????????????I????????????
|
| 1706 | 1702 |
CompDate = HireCompDate; |
| 1707 | 1703 |
} |
| 1708 |
else if (CompDate == DateTime.MinValue) |
|
| 1709 |
{
|
|
| 1710 |
CompDate = dtDefaultEnd; |
|
| 1711 |
} |
|
| 1712 | 1704 |
else |
| 1713 | 1705 |
{ // ??O?????
|
| 1714 | 1706 |
CompDate = DateTime.Today.Date; |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
|---|---|---|
| 398 | 398 |
{
|
| 399 | 399 |
try |
| 400 | 400 |
{
|
| 401 |
if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 401 |
if (StartDate == DateTime.MinValue)
|
|
| 402 | 402 |
{
|
| 403 |
StartDate = HireStartDate; |
|
| 404 |
} |
|
| 405 |
else if (dtDefaultStart < StartDate) |
|
| 406 |
{
|
|
| 407 | 403 |
StartDate = dtDefaultStart; |
| 408 | 404 |
} |
| 409 |
else if (StartDate == DateTime.MaxValue)
|
|
| 405 |
else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 410 | 406 |
{
|
| 411 |
StartDate = dtDefaultStart;
|
|
| 407 |
StartDate = HireStartDate;
|
|
| 412 | 408 |
} |
| 413 |
else |
|
| 409 |
else if (dtDefaultStart < StartDate)
|
|
| 414 | 410 |
{
|
| 415 | 411 |
StartDate = dtDefaultStart; |
| 416 | 412 |
} |
| 417 | 413 |
|
| 418 |
|
|
| 419 | 414 |
// ?????????????????????O?????????? |
| 420 | 415 |
if (CompDate.Date > DateTime.Today.Date) return; |
| 421 | 416 |
|
| ... | ... | |
| 428 | 423 |
{ // ??????????????I????????????
|
| 429 | 424 |
CompDate = HireCompDate; |
| 430 | 425 |
} |
| 431 |
else if (CompDate == DateTime.MinValue) |
|
| 432 |
{
|
|
| 433 |
CompDate = dtDefaultEnd; |
|
| 434 |
} |
|
| 435 | 426 |
else |
| 436 | 427 |
{ // ??O?????
|
| 437 | 428 |
CompDate = DateTime.Today.Date; |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.51")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.51")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.52")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.52")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff