Merge branch '1.3'

# Conflicts:
#	Setup/Setup.vdproj

App/App.config

@@ -72,7 +72,7 @@
                 <value>8</value>
             </setting>
             <setting name="LabelTemplate" serializeAs="String">
-                <value>^^18^**Objednávka: {order_no}**^^{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type_list}</value>
+                <value>^^18^**Objednávka: {order_no}**^^{cr}{email}{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type_list}</value>
             </setting>
             <setting name="CSVDelimiter" serializeAs="String">
                 <value>,</value>

App/FormLabelPrint.cs

@@ -116,6 +116,7 @@ namespace qdr.app.studiou.orders2printpack
             // Create result DataTable with appropriate columns
             DataTable result = new DataTable();
             result.Columns.Add("order_no", typeof(string));
+            result.Columns.Add("email", typeof(string));
             result.Columns.Add("prod_cat", typeof(string));
             result.Columns.Add("prod_var_type", typeof(string));
             result.Columns.Add("qty", typeof(string));
@@ -125,12 +126,14 @@ namespace qdr.app.studiou.orders2printpack
                 .GroupBy(row => new
                 {
                     OrderNo = row.Field<string>("order_no"),
+                    Email = row.Field<string>("email"),
                     ProdCat = row.Field<string>("prod_cat"),
                     ProdVarType = row.Field<string>("prod_var_type")
                 })
                 .Select(group => new
                 {
                     group.Key.OrderNo,
+                    group.Key.Email,
                     group.Key.ProdCat,
                     group.Key.ProdVarType,
                     TotalQty = group.Sum(row => int.Parse(row.Field<string>("qty"))).ToString()
@@ -145,6 +148,7 @@ namespace qdr.app.studiou.orders2printpack
             {
                 result.Rows.Add(
                     item.OrderNo,
+                    item.Email,
                     item.ProdCat,
                     item.ProdVarType,
                     int.Parse(item.TotalQty)

App/Properties/AppSettings.Designer.cs

@@ -278,8 +278,8 @@ namespace qdr.app.studiou.orders2printpack.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("^^18^**Objednávka: {order_no}**^^{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type_list" +
-            "}")]
+        [global::System.Configuration.DefaultSettingValueAttribute("^^18^**Objednávka: {order_no}**^^{cr}{email}{cr}^^14^**{prod_cat}**^^{cr}{prod_va" +
+            "r_type_list}")]
         public string LabelTemplate {
             get {
                 return ((string)(this["LabelTemplate"]));

App/Properties/AppSettings.settings

@@ -67,7 +67,7 @@
       <Value Profile="(Default)">8</Value>
     </Setting>
     <Setting Name="LabelTemplate" Type="System.String" Scope="User">
-      <Value Profile="(Default)">^^18^**Objednávka: {order_no}**^^{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type_list}</Value>
+      <Value Profile="(Default)">^^18^**Objednávka: {order_no}**^^{cr}{email}{cr}^^14^**{prod_cat}**^^{cr}{prod_var_type_list}</Value>
     </Setting>
     <Setting Name="CSVDelimiter" Type="System.String" Scope="User">
       <Value Profile="(Default)">,</Value>

App/dlgLabelSettings.Designer.cs

@@ -89,9 +89,9 @@
             label2.AutoSize = true;
             label2.Location = new Point(385, 11);
             label2.Name = "label2";
-            label2.Size = new Size(100, 120);
+            label2.Size = new Size(100, 150);
             label2.TabIndex = 4;
-            label2.Text = "Použité proměné:\r\norder_no\r\nprod_cat\r\nprod_name\r\nprod_var\r\nprod_var_type\r\nprod_img_url\r\nqty\r\ncr";
+            label2.Text = "Použité proměné:\r\norder_no\r\nprod_cat\r\nprod_name\r\nprod_var\r\nprod_var_type\r\nprod_img_url\r\nqty\r\nemail\r\ncr";
             // 
             // label3
             // 

App/qdr.app.studiou.orders2printpack.csproj

@@ -16,9 +16,9 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\bo_strong_key_pair.snk</AssemblyOriginatorKeyFile>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <AssemblyVersion>1.3.2.0</AssemblyVersion>
-    <FileVersion>1.3.2.0</FileVersion>
-    <Version>1.3.2</Version>
+    <AssemblyVersion>1.3.3.0</AssemblyVersion>
+    <FileVersion>1.3.3.0</FileVersion>
+    <Version>1.3.3</Version>
 	<ApplicationHighDpiMode>SystemAware</ApplicationHighDpiMode>
     <ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
   </PropertyGroup>

Setup/Setup.vdproj

@@ -198,15 +198,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Order2PrintPack"
-        "ProductCode" = "8:{ADACE647-81FE-4E08-84E4-E0A948CD3BE3}"
-        "PackageCode" = "8:{B0774F7D-AACA-419F-B58F-7150F6807E40}"
+        "ProductCode" = "8:{1931821E-83E3-4602-9EEA-7B36045ADC75}"
+        "PackageCode" = "8:{9042A1B7-DF0D-4969-8574-0B5FF20C5B53}"
         "UpgradeCode" = "8:{38F8DC1E-8290-49ED-A3D2-32BC6DD74325}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.3.2"
+        "ProductVersion" = "8:1.3.3"
         "Manufacturer" = "8:Quadarax"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"