リビジョン 200
工事予算書、指導員稼働月数不具合修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 43;
|
|
| 17 |
public static int s_SystemVersion = 44;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs | ||
|---|---|---|
| 2768 | 2768 |
if (AmountConfigRate < -999.00 || 999.00 < AmountConfigRate) AmountConfigRate = 0; |
| 2769 | 2769 |
|
| 2770 | 2770 |
// 給与コンテンツセット |
| 2771 |
Content = string.Format(CommonDefine.s_SalaryCostMonthlyFormat, CostsValue.ToString("#,0"), CommonDefine.InstructorMonthryCost.ToString("#,0"));
|
|
| 2771 |
Content = string.Format(CommonDefine.s_SalaryCostMonthlyFormat, CalcBetweenTimes.ToString("#,0"), CommonDefine.InstructorMonthryCost.ToString("#,0"));
|
|
| 2772 | 2772 |
|
| 2773 | 2773 |
// 差分日付 |
| 2774 | 2774 |
int dDiffDays = 0; |
| ... | ... | |
| 2806 | 2806 |
AmountConfigRate = (CostsValue / OrdersPrice) * 100.0; |
| 2807 | 2807 |
if (AmountConfigRate < -999.00 || 999.00 < AmountConfigRate) AmountConfigRate = 0; |
| 2808 | 2808 |
// 給与コンテンツセット |
| 2809 |
Content = string.Format(CommonDefine.s_SalaryCostMonthlyFormat, CostsValue.ToString("#,0"), CommonDefine.InstructorMonthryCost.ToString("#,0"));
|
|
| 2809 |
Content = string.Format(CommonDefine.s_SalaryCostMonthlyFormat, CalcBetweenTimes.ToString("#,0"), CommonDefine.InstructorMonthryCost.ToString("#,0"));
|
|
| 2810 | 2810 |
} |
| 2811 | 2811 |
} |
| 2812 | 2812 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestEntry/FrmEntryReqSelOrderer.Designer.cs | ||
|---|---|---|
| 217 | 217 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; |
| 218 | 218 |
this.Margin = new System.Windows.Forms.Padding(4); |
| 219 | 219 |
this.Name = "FrmEntryReqSelOrderer"; |
| 220 |
this.ShowIcon = false; |
|
| 220 | 221 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
| 221 | 222 |
this.Text = "請求書作成"; |
| 222 | 223 |
this.Load += new System.EventHandler(this.FrmEntryReqSelOrderer_Load); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs | ||
|---|---|---|
| 1743 | 1743 |
//dgv1[tcol, trow].Value = m_lstDepositDate[i].ToString("yyyy/MM/dd");
|
| 1744 | 1744 |
if (m_lstDepositState[i] == (int)DepositState.Done) |
| 1745 | 1745 |
{
|
| 1746 |
dgv1[tcol, trow].Value = DepDetail.ConfirmationDate.ToString("yyyy/MM/dd");
|
|
| 1746 |
if (DepDetail.ConfirmationDate.Date != DateTime.MinValue.Date) |
|
| 1747 |
dgv1[tcol, trow].Value = DepDetail.ConfirmationDate.ToString("yyyy/MM/dd");
|
|
| 1747 | 1748 |
dgv1[tcol, trow].Style.Alignment = DataGridViewContentAlignment.MiddleCenter; |
| 1748 | 1749 |
} |
| 1749 | 1750 |
else |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.43")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.43")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.44")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.44")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff