リビジョン 253
工事一覧注文書”済”フラグ表示バグ修正
注文書承認申請バグ修正(承認申請キー作成をデフォルト値-1にしたことによる弊害)
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 64;
|
|
17 |
public static int s_SystemVersion = 65;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
---|---|---|
933 | 933 |
int AllCount = 0; |
934 | 934 |
int PrintCount = 0; |
935 | 935 |
GetPrintCount(OrderDB, ParentCode, ConstrCode, ref AllCount, ref PrintCount); |
936 |
if ((AllCount == 0) || (AllCount != 0 && AllCount == PrintCount)) FlgString = "??";
|
|
936 |
if ((AllCount == 0) || (AllCount != 0 && AllCount <= PrintCount)) FlgString = "??";
|
|
937 | 937 |
|
938 | 938 |
if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint) |
939 | 939 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs | ||
---|---|---|
395 | 395 |
/// <summary> |
396 | 396 |
/// 受付番号 |
397 | 397 |
/// </summary> |
398 |
private int m_OrderNo = -1;
|
|
398 |
private int m_OrderNo = 0;
|
|
399 | 399 |
|
400 | 400 |
/// <summary> |
401 | 401 |
/// 終了ボタン押下フラグ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs | ||
---|---|---|
194 | 194 |
|
195 | 195 |
object[] objRec = (object[])m_DetailList[0]; |
196 | 196 |
m_OrderNo = CommonMotions.cnvInt(objRec[(int)FrmOrderEntryList.ReadDBColumn.OrderNo]); |
197 |
if (m_OrderNo == 0) m_OrderNo = -1; |
|
197 |
//if (m_OrderNo == 0) m_OrderNo = -1;
|
|
198 | 198 |
|
199 | 199 |
this.Show(); |
200 | 200 |
|
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.64")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.64")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.65")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.65")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff