diff --git a/AyaNovaQBI/AyaNovaQBI.csproj b/AyaNovaQBI/AyaNovaQBI.csproj
index 873265f..9e663bd 100644
--- a/AyaNovaQBI/AyaNovaQBI.csproj
+++ b/AyaNovaQBI/AyaNovaQBI.csproj
@@ -111,6 +111,12 @@
SetInfoOnly.cs
+
+ Form
+
+
+ SetMemoField.cs
+
Form
@@ -188,6 +194,9 @@
SetInfoOnly.cs
+
+ SetMemoField.cs
+
SetQBChargeAs.cs
diff --git a/AyaNovaQBI/SetMemoField.Designer.cs b/AyaNovaQBI/SetMemoField.Designer.cs
new file mode 100644
index 0000000..362c64e
--- /dev/null
+++ b/AyaNovaQBI/SetMemoField.Designer.cs
@@ -0,0 +1,128 @@
+namespace AyaNovaQBI
+{
+ partial class SetMemoField
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.btnOK = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.lblTitle = new System.Windows.Forms.Label();
+ this.lblDescription = new System.Windows.Forms.Label();
+ this.lblStatus = new System.Windows.Forms.Label();
+ this.ckSetMemo = new System.Windows.Forms.CheckBox();
+ this.SuspendLayout();
+ //
+ // btnOK
+ //
+ this.btnOK.Location = new System.Drawing.Point(550, 368);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(75, 23);
+ this.btnOK.TabIndex = 6;
+ this.btnOK.Text = "OK";
+ this.btnOK.UseVisualStyleBackColor = true;
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Location = new System.Drawing.Point(4, 368);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 5;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ //
+ // lblTitle
+ //
+ this.lblTitle.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lblTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblTitle.Location = new System.Drawing.Point(0, 0);
+ this.lblTitle.Name = "lblTitle";
+ this.lblTitle.Size = new System.Drawing.Size(637, 30);
+ this.lblTitle.TabIndex = 7;
+ //
+ // lblDescription
+ //
+ this.lblDescription.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lblDescription.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblDescription.Location = new System.Drawing.Point(0, 30);
+ this.lblDescription.Name = "lblDescription";
+ this.lblDescription.Size = new System.Drawing.Size(637, 165);
+ this.lblDescription.TabIndex = 8;
+ //
+ // lblStatus
+ //
+ this.lblStatus.AutoSize = true;
+ this.lblStatus.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lblStatus.Location = new System.Drawing.Point(0, 195);
+ this.lblStatus.Name = "lblStatus";
+ this.lblStatus.Size = new System.Drawing.Size(0, 13);
+ this.lblStatus.TabIndex = 10;
+ //
+ // ckSetMemo
+ //
+ this.ckSetMemo.AutoSize = true;
+ this.ckSetMemo.Dock = System.Windows.Forms.DockStyle.Top;
+ this.ckSetMemo.Location = new System.Drawing.Point(0, 208);
+ this.ckSetMemo.Name = "ckSetMemo";
+ this.ckSetMemo.Size = new System.Drawing.Size(637, 17);
+ this.ckSetMemo.TabIndex = 11;
+ this.ckSetMemo.Text = "Set memo field";
+ this.ckSetMemo.UseVisualStyleBackColor = true;
+ //
+ // SetMemoField
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.btnCancel;
+ this.ClientSize = new System.Drawing.Size(637, 403);
+ this.Controls.Add(this.ckSetMemo);
+ this.Controls.Add(this.lblStatus);
+ this.Controls.Add(this.lblDescription);
+ this.Controls.Add(this.lblTitle);
+ this.Controls.Add(this.btnOK);
+ this.Controls.Add(this.btnCancel);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "SetMemoField";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "SetMemoField";
+ this.Load += new System.EventHandler(this.SetQBClass_load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.Label lblTitle;
+ private System.Windows.Forms.Label lblDescription;
+ private System.Windows.Forms.Label lblStatus;
+ private System.Windows.Forms.CheckBox ckSetMemo;
+ }
+}
\ No newline at end of file
diff --git a/AyaNovaQBI/SetMemoField.cs b/AyaNovaQBI/SetMemoField.cs
new file mode 100644
index 0000000..389e752
--- /dev/null
+++ b/AyaNovaQBI/SetMemoField.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Data;
+using System.Windows.Forms;
+
+namespace AyaNovaQBI
+{
+ public partial class SetMemoField : Form
+ {
+ public SetMemoField()
+ {
+ InitializeComponent();
+ }
+
+
+ public string DialogTitle { get; set; }
+
+ public string OptionTitle { get; set; }
+
+ public string OptionDescription { get; set; }
+
+
+
+ public bool FillMemoField
+ {
+ get
+ {
+ return this.ckSetMemo.Checked;
+ }
+ set
+ {
+ this.ckSetMemo.Checked = value;
+ }
+ }
+
+
+ private void SetQBClass_load(object sender, EventArgs e)
+ {
+ Text = DialogTitle;
+ lblDescription.Text = OptionDescription;
+ lblTitle.Text = OptionTitle;
+ btnCancel.Text = util.AyaTranslations["Cancel"];
+ btnOK.Text = util.AyaTranslations["OK"];
+
+
+ }
+
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+ }
+}
diff --git a/AyaNovaQBI/SetMemoField.resx b/AyaNovaQBI/SetMemoField.resx
new file mode 100644
index 0000000..29dcb1b
--- /dev/null
+++ b/AyaNovaQBI/SetMemoField.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs
index 55d6405..7b0f223 100644
--- a/AyaNovaQBI/util.cs
+++ b/AyaNovaQBI/util.cs
@@ -1238,49 +1238,42 @@ namespace AyaNovaQBI
#endregion
- // #region SetMemoField
- // //No validation possible
- // //so prompt only if not setup yet
- // if (!SetEverything)
- // {
- // //if(QBItems.Rows.Contains(QDat.MiscExpenseChargeAs))
- // goto SETMEMOOK;
- // // else
- // // {
- // // MessageBox.Show("The QuickBooks Item previously set for invoicing Misc. Expense items\r\n" +
- // // "No longer appears to be valid. You will next be prompted to re-select a valid \r\n" +
- // // "QuickBooks Item.");
- // // }
- // }
+ #region SetMemoField
+ //No validation possible
+ //so prompt only if not setup yet
+ if (!SetEverything)
+ {
+ goto SETMEMOOK;
+ }
- // SetMemoField s5 = new SetMemoField();
- // s5.DialogTitle = "AyaNova QBI setup - Set Memo field?";
- // s5.OptionTitle = "Invoice memo field";
- // s5.OptionDescription =
- // "QBI needs to know if you want invoices that it creates \r\n" +
- // "in QuickBooks to have their \"Memo\" field set with\r\n" +
- // "information about the work order(s) that were the basis for\r\n" +
- // "the invoice and the name of the AyaNova user who generated them.\r\n\r\n" +
- // "This may be useful as a back reference, this setting is optional";
- // s5.FillMemoField = QDat.SetMemoField;
+ SetMemoField s5 = new SetMemoField();
+ s5.DialogTitle = "AyaNova QBI setup - Set Memo field?";
+ s5.OptionTitle = "Invoice memo field";
+ s5.OptionDescription =
+ "QBI needs to know if you want invoices that it creates \r\n" +
+ "in QuickBooks to have their \"Memo\" field set with\r\n" +
+ "information about the work order(s) that were the basis for\r\n" +
+ "the invoice and the name of the AyaNova user who generated them.\r\n\r\n" +
+ "This may be useful as a back reference, this setting is optional";
+ s5.FillMemoField = QDat.SetMemoField;
- // if (s5.ShowDialog() == DialogResult.Cancel)
- // {
- // return pfstat.Cancel;
+ if (s5.ShowDialog() == DialogResult.Cancel)
+ {
+ return pfstat.Cancel;
- // }
- // else
- // QDat.SetMemoField = s5.FillMemoField;
- // s5.Dispose();
- // s5 = null;
+ }
+ else
+ QDat.SetMemoField = s5.FillMemoField;
+ s5.Dispose();
+ s5 = null;
- //SETMEMOOK:
+ SETMEMOOK:
- // #endregion
+ #endregion
// #region SetAutoCloseField Case 7