From 7c75750dd5447c26abba5e53a3deaf4f4ccaa3ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20Iv=C3=A1n?= <ivan.szabo.sis@gmail.com>
Date: Sat, 26 Aug 2017 10:53:26 +0200
Subject: [PATCH] =?UTF-8?q?N=C3=A9h=C3=A1ny=20ford=C3=ADt=C3=A1s=20+=20WIN?=
 =?UTF-8?q?-WEB=20kevered=C3=A9s=20...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessObjects/PriceFixCustomers_VC.cs   | 12 +++++-----
 .../Controllers/NewCustomersFromVC.cs         | 14 +++++------
 .../Model.DesignedDiffs.Localization.hu.xafml | 24 +++++++++++++++++++
 Nuvolar.Win.Lite/app.config                   |  2 +-
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs
index f46be31..12b6d4b 100644
--- a/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs
+++ b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs
@@ -15,7 +15,7 @@ using DevExpress.Persistent.Base;
 using DevExpress.Persistent.Validation;
 using DevExpress.ExpressApp.Xpo;
 using DevExpress.Xpo;
-using Nuvolar.Module.Win;
+//using Nuvolar.Module.Win;
 
 namespace Nuvolar.Module.BusinessObjects
 {
@@ -23,7 +23,7 @@ namespace Nuvolar.Module.BusinessObjects
 
     public partial class PriceFixCustomers_VC : ViewController
     {
-        private WaitFormClass _WaitFormClass;
+        //private WaitFormClass _WaitFormClass;
         public PriceFixCustomers_VC()
         {
             InitializeComponent();
@@ -34,7 +34,7 @@ namespace Nuvolar.Module.BusinessObjects
             base.OnActivated();
             if (View.Id == "PriceFixCustomers_ListView")
             {
-                _WaitFormClass = new WaitFormClass();
+                //_WaitFormClass = new WaitFormClass();
                 Load_PriceFixCustomers_ListView();
             }
             // Perform various tasks depending on the target View.
@@ -72,10 +72,10 @@ namespace Nuvolar.Module.BusinessObjects
             XPCollection<Customers> _Customers_Collection = new XPCollection<Customers>(_ocur.Session, CriteriaOperator.Parse("IsNull(Pricing)=False"));
 
 
-            _WaitFormClass.Initwork(1, 1, _Customers_Collection.Count);
+            //_WaitFormClass.Initwork(1, 1, _Customers_Collection.Count);
             foreach (Customers _Customers in _Customers_Collection)
             {
-                _WaitFormClass.DoWork();
+                //_WaitFormClass.DoWork();
                 foreach (PricingFix _PricingFix in _Customers.Pricing.PricingFix)
                 {
                     PriceFixCustomers _PriceFixCustomers = new PriceFixCustomers(_ocur.Session);
@@ -138,7 +138,7 @@ namespace Nuvolar.Module.BusinessObjects
                 }
 
             }
-            _WaitFormClass.FinalWork();
+            //_WaitFormClass.FinalWork();
 
         }
     }
diff --git a/Nuvolar.Module.Win.CSharp/Controllers/NewCustomersFromVC.cs b/Nuvolar.Module.Win.CSharp/Controllers/NewCustomersFromVC.cs
index 25296df..97fc6f3 100644
--- a/Nuvolar.Module.Win.CSharp/Controllers/NewCustomersFromVC.cs
+++ b/Nuvolar.Module.Win.CSharp/Controllers/NewCustomersFromVC.cs
@@ -6,14 +6,14 @@ using DevExpress.ExpressApp;
 using DevExpress.ExpressApp.Actions;
 using DevExpress.ExpressApp.Xpo;
 using Nuvolar.Module.BusinessObjects;
-using Nuvolar.Module.Win;
+//using Nuvolar.Module.Win;
 
 namespace Nuvolar.Module.Controllers
 {
     // For more typical usage scenarios, be sure to check out https://documentation.devexpress.com/eXpressAppFramework/clsDevExpressExpressAppViewControllertopic.aspx.
     public partial class NewCustomersFromVC : ViewController
     {
-        private WaitFormClass _WaitFormClass;
+        //private WaitFormClass _WaitFormClass;
         private XPObjectSpace _onew;
         private int _Counter = 0;
         public NewCustomersFromVC()
@@ -24,7 +24,7 @@ namespace Nuvolar.Module.Controllers
         protected override void OnActivated()
         {
             base.OnActivated();
-            _WaitFormClass = new WaitFormClass();
+            //_WaitFormClass = new WaitFormClass();
             // Perform various tasks depending on the target View.
         }
         protected override void OnViewControlsCreated()
@@ -102,11 +102,11 @@ namespace Nuvolar.Module.Controllers
         }
         private void NewCustomersFrom_FinalWork(object sender, WorkEventArgs e)
         {
-            _WaitFormClass.FinalWork();
+            //_WaitFormClass.FinalWork();
         }
         private void NewCustomersFrom_DoWork(object sender, WorkEventArgs e)
         {
-            _WaitFormClass.DoWork();
+            //_WaitFormClass.DoWork();
             _Counter++;
 
             if (_Counter % 100 == 0)
@@ -116,8 +116,8 @@ namespace Nuvolar.Module.Controllers
        }
         private void NewCustomersFrom_InitWork(object sender, WorkEventArgs e)
         {
-            _WaitFormClass.Initwork(1, 1, e.Count);
-            _WaitFormClass.Caption = e.Message;          
+            //_WaitFormClass.Initwork(1, 1, e.Count);
+            //_WaitFormClass.Caption = e.Message;          
         }
        
     }
diff --git a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
index 81fbda2..f136a0d 100644
--- a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
+++ b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
@@ -8165,6 +8165,14 @@
         <LocalizationItem Name="e1_4" Value="1-4 számlaosztály (mérlegszámlák)" />
         <LocalizationItem Name="e5_9" Value="5-9 számlaosztály (eredményszámlák)" />
       </LocalizationGroup>
+      <LocalizationGroup Name="Nuvolar.Module.eActionFrequency">
+        <LocalizationItem Name="eDaily" Value="Napi" />
+        <LocalizationItem Name="eMonthly" Value="Havi" />
+        <LocalizationItem Name="eQuarter" Value="Negyedéves" />
+        <LocalizationItem Name="eTwoWeekly" Value="Két hetes" />
+        <LocalizationItem Name="eWeekly" Value="Heti" />
+        <LocalizationItem Name="eYear" Value="Éves" />
+      </LocalizationGroup>
       <LocalizationGroup Name="Nuvolar.Module.eADRPackingUnit" Value="Csomagolási egység">
         <LocalizationItem Name="eNotSet" Value="Nincs beállítva" />
         <LocalizationItem Name="eUnit_I" Value="I." />
@@ -8327,6 +8335,10 @@
         <LocalizationItem Name="ePhone" Value="Telefon" />
         <LocalizationItem Name="ePostal" Value="Postai" />
       </LocalizationGroup>
+      <LocalizationGroup Name="Nuvolar.Module.eEventDirection">
+        <LocalizationItem Name="eIn" Value="Bejövő" />
+        <LocalizationItem Name="eOut" Value="Kimenő" />
+      </LocalizationGroup>
       <LocalizationGroup Name="Nuvolar.Module.eEventType">
         <LocalizationItem Name="eMeeting" Value="Találkozás" />
         <LocalizationItem Name="ePhoneConversation" Value="Telefonbeszélgetés" />
@@ -8509,6 +8521,16 @@
         <LocalizationItem Name="eNOInvoiceState" Value="NEM számlázható" />
         <LocalizationItem Name="eNoState" Value="Nincs beállítva" />
       </LocalizationGroup>
+      <LocalizationGroup Name="Nuvolar.Module.eInvoiceStrategy">
+        <LocalizationItem Name="eDeliveryNoteOut" Value="Kimenő szállítólevél" />
+        <LocalizationItem Name="eDeliveryNoteOutAndInvoice" Value="Kimenő szállítólevél + kimenő számla" />
+        <LocalizationItem Name="eInvoice" Value="Kimenő számla" />
+        <LocalizationItem Name="eInvoiceAdvance" Value="Kimenő előlegszámla" />
+        <LocalizationItem Name="eInvoiceAdvanceAsk" Value="Előleg bekérő" />
+        <LocalizationItem Name="eInvoiceFinal" Value="Végszámla" />
+        <LocalizationItem Name="eStorageOutAndDeliveryNoteOut" Value="Kitárolás + kimenő szállítólevél" />
+        <LocalizationItem Name="eStorageOutAndDeliveryNoteOutAndInvoice" Value="Kitárolás + kimenő szállítólevél + kimenő számla" />
+      </LocalizationGroup>
       <LocalizationGroup Name="Nuvolar.Module.eInvoiceTypeBase">
         <LocalizationItem Name="eAdvancePayment" Value="Előleg számla" />
         <LocalizationItem Name="eCustomRate" Value="Bekérő dokumentum" />
@@ -8844,6 +8866,8 @@
         <LocalizationItem Name="eReady" Value="Kész !" />
       </LocalizationGroup>
       <LocalizationGroup Name="Nuvolar.Module.eStoragePDACollectionType">
+        <LocalizationItem Name="eInventorySurplus" Value="Leltártöbblet" />
+        <LocalizationItem Name="eInventoryWant" Value="Leltárhiány" />
         <LocalizationItem Name="eIsInventory" Value="Leltár" />
         <LocalizationItem Name="eIsLocationIn" Value="Szétrakás polcra" />
         <LocalizationItem Name="eIsLocationOut" Value="Összeszedés polcról" />
diff --git a/Nuvolar.Win.Lite/app.config b/Nuvolar.Win.Lite/app.config
index fcd95b9..5ee5b78 100644
--- a/Nuvolar.Win.Lite/app.config
+++ b/Nuvolar.Win.Lite/app.config
@@ -23,7 +23,7 @@
     <switches>
       <!-- Use the one of predefined values: 0-Off, 1-Errors, 2-Warnings, 3-Info, 4-Verbose. The default value is 3. -->
       <add name="eXpressAppFramework" value="1" />
-      <add name="XPO" value="4" />
+      <!--<add name="XPO" value="4" />-->
       <add name="AllowDebugXtraReportScripts" value="False" />
     </switches>
   </system.diagnostics>