Raktárközi átadásról és szállítói visszárúról lehet szállítólevelet készíteni

Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs

@@ -30,6 +30,8 @@
         {
             this.components = new System.ComponentModel.Container();
             this.aCreateDeliveryNoteOutfromStorageOut = new DevExpress.ExpressApp.Actions.PopupWindowShowAction(this.components);
+            this.aPrint_DeliveryNoteOutHeader = new DevExpress.ExpressApp.Actions.SimpleAction(this.components);
+            this.aStornoDeliveryNoteOutfromStorageOut = new DevExpress.ExpressApp.Actions.SimpleAction(this.components);
             // 
             // aCreateDeliveryNoteOutfromStorageOut
             // 
@@ -38,20 +40,50 @@
             this.aCreateDeliveryNoteOutfromStorageOut.Caption = "aCreate Delivery Note Outfrom Storage Out";
             this.aCreateDeliveryNoteOutfromStorageOut.ConfirmationMessage = null;
             this.aCreateDeliveryNoteOutfromStorageOut.Id = "aCreateDeliveryNoteOutfromStorageOut";
+            this.aCreateDeliveryNoteOutfromStorageOut.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject;
             this.aCreateDeliveryNoteOutfromStorageOut.TargetObjectType = typeof(Nuvolar.Module.StorageOutHeader);
             this.aCreateDeliveryNoteOutfromStorageOut.TargetViewNesting = DevExpress.ExpressApp.Nesting.Root;
             this.aCreateDeliveryNoteOutfromStorageOut.TargetViewType = DevExpress.ExpressApp.ViewType.ListView;
             this.aCreateDeliveryNoteOutfromStorageOut.ToolTip = null;
             this.aCreateDeliveryNoteOutfromStorageOut.TypeOfView = typeof(DevExpress.ExpressApp.ListView);
+            this.aCreateDeliveryNoteOutfromStorageOut.CustomizePopupWindowParams += new DevExpress.ExpressApp.Actions.CustomizePopupWindowParamsEventHandler(this.aCreateDeliveryNoteOutfromStorageOut_CustomizePopupWindowParams);
+            this.aCreateDeliveryNoteOutfromStorageOut.Execute += new DevExpress.ExpressApp.Actions.PopupWindowShowActionExecuteEventHandler(this.aCreateDeliveryNoteOutfromStorageOut_Execute);
+            // 
+            // aPrint_DeliveryNoteOutHeader
+            // 
+            this.aPrint_DeliveryNoteOutHeader.Caption = "aPrint_DeliveryNoteOutHeader";
+            this.aPrint_DeliveryNoteOutHeader.ConfirmationMessage = null;
+            this.aPrint_DeliveryNoteOutHeader.Id = "aPrint_DeliveryNoteOutHeader";
+            this.aPrint_DeliveryNoteOutHeader.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject;
+            this.aPrint_DeliveryNoteOutHeader.TargetObjectType = typeof(Nuvolar.Module.StorageOutHeader);
+            this.aPrint_DeliveryNoteOutHeader.TargetViewNesting = DevExpress.ExpressApp.Nesting.Root;
+            this.aPrint_DeliveryNoteOutHeader.TargetViewType = DevExpress.ExpressApp.ViewType.ListView;
+            this.aPrint_DeliveryNoteOutHeader.ToolTip = null;
+            this.aPrint_DeliveryNoteOutHeader.TypeOfView = typeof(DevExpress.ExpressApp.ListView);
+            this.aPrint_DeliveryNoteOutHeader.Execute += new DevExpress.ExpressApp.Actions.SimpleActionExecuteEventHandler(this.aPrint_DeliveryNoteOutHeader_Execute);
+            // 
+            // aStornoDeliveryNoteOutfromStorageOut
+            // 
+            this.aStornoDeliveryNoteOutfromStorageOut.Caption = "aStorno Delivery Note Outfrom Storage Out";
+            this.aStornoDeliveryNoteOutfromStorageOut.ConfirmationMessage = null;
+            this.aStornoDeliveryNoteOutfromStorageOut.Id = "aStornoDeliveryNoteOutfromStorageOut";
+            this.aStornoDeliveryNoteOutfromStorageOut.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject;
+            this.aStornoDeliveryNoteOutfromStorageOut.TargetObjectType = typeof(Nuvolar.Module.StorageOutHeader);
+            this.aStornoDeliveryNoteOutfromStorageOut.ToolTip = null;
+            this.aStornoDeliveryNoteOutfromStorageOut.Execute += new DevExpress.ExpressApp.Actions.SimpleActionExecuteEventHandler(this.aStornoDeliveryNoteOutfromStorageOut_Execute);
             // 
             // StorageOut_VC
             // 
             this.Actions.Add(this.aCreateDeliveryNoteOutfromStorageOut);
+            this.Actions.Add(this.aPrint_DeliveryNoteOutHeader);
+            this.Actions.Add(this.aStornoDeliveryNoteOutfromStorageOut);
 
         }
 
         #endregion
 
         private DevExpress.ExpressApp.Actions.PopupWindowShowAction aCreateDeliveryNoteOutfromStorageOut;
+        private DevExpress.ExpressApp.Actions.SimpleAction aPrint_DeliveryNoteOutHeader;
+        private DevExpress.ExpressApp.Actions.SimpleAction aStornoDeliveryNoteOutfromStorageOut;
     }
 }

Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs

@@ -13,6 +13,9 @@ using DevExpress.ExpressApp.Templates;
 using DevExpress.ExpressApp.Utils;
 using DevExpress.Persistent.Base;
 using DevExpress.Persistent.Validation;
+using DevExpress.ExpressApp.Xpo;
+using DevExpress.Persistent.BaseImpl;
+using Nuvolar.Module.Helpers;
 
 namespace Nuvolar.Module.Controllers
 {
@@ -39,5 +42,107 @@ namespace Nuvolar.Module.Controllers
             // Unsubscribe from previously subscribed events and release other references and resources.
             base.OnDeactivated();
         }
+
+        /// <summary>
+        /// Kitárolási bizonylatról => szállítólevél (egy az egyben !)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void aCreateDeliveryNoteOutfromStorageOut_Execute(object sender, PopupWindowShowActionExecuteEventArgs e)
+        {
+            //Ellenőrzés, hogy készült-e már minden kitárolási sorról szállítólevél
+            XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace;
+            StorageOutHeader _StorageOutHeader = _ocur.GetObject(View.CurrentObject) as StorageOutHeader;
+            bool _Ok = true;
+            foreach (StorageOutRows _StorageOutRows in _StorageOutHeader.StorageOutRows)
+            {
+                if (_StorageOutRows.QTT_To_DeliveryOut == _StorageOutRows.QTT)
+                {
+                    _Ok = false;
+                    break;
+                }
+            }
+            if (_StorageOutHeader.DeliveryNoteOutHeader != null)
+            {
+                _Ok = false;
+            }
+            if (_Ok)
+            {
+                DeliveryNoteOutHeader _DeliveryNoteOutHeader = BusinessDocumentHelper.CreateNewDeliveryNoteOutHeader(_ocur, e.PopupWindow.View.CurrentObject as DeliveryNoteView);
+                long i = 1;
+                foreach (StorageOutRows _StorageOutRows in _StorageOutHeader.StorageOutRows)
+                {
+                    foreach (StorageOutRowsInRows _StorageOutRowsInRows in _StorageOutRows.StorageOutRowsInRows)
+                    {
+                        _StorageOutRowsInRows.QTT_Will = _StorageOutRowsInRows.QTT;
+                        BusinessDocumentHelper.AddNewDeliveryNoteOutRows(_ocur, _DeliveryNoteOutHeader, _StorageOutRowsInRows, i);
+                        i += 1;
+                    }
+
+                }
+                if (BusinessDocumentHelper.FinalizeDeliveryNoteOutHeader(_ocur, _DeliveryNoteOutHeader, _StorageOutHeader))
+                {
+                    //Nyomtatás
+                    BusinessDocumentHelper.PrintDeliveryNoteOutHeader(_ocur, Frame, _DeliveryNoteOutHeader);
+                }
+            }
+
+        }
+
+        private void aCreateDeliveryNoteOutfromStorageOut_CustomizePopupWindowParams(object sender, CustomizePopupWindowParamsEventArgs e)
+        {
+            XPObjectSpace _onew = Application.CreateObjectSpace() as XPObjectSpace;
+            DeliveryNoteView _DeliveryNoteView = _onew.CreateObject<DeliveryNoteView>();
+            StorageOutHeader _StorageOutHeader = _onew.GetObject(View.CurrentObject) as StorageOutHeader;
+
+            _DeliveryNoteView.Customers = _StorageOutHeader.Customers;
+            _DeliveryNoteView.TransportAddress = _StorageOutHeader.Storage.Address;
+            _DeliveryNoteView.DateExecution = DateTime.Now;
+            _DeliveryNoteView.CurrencyName = _onew.FindObject<CurrencyName>(CriteriaOperator.Parse("ShortName='HUF'"));
+            if (_StorageOutHeader.StorageMoveType.MoveType==eMoveType.InventoryTransfer)
+            {
+                _DeliveryNoteView.DeliveryNoteOutType = _StorageOutHeader.Storage.DeliveryNoteOutType_InventoryTransfer;
+            }
+            if (_StorageOutHeader.StorageMoveType.MoveType == eMoveType.ReturnBack)
+            {
+                _DeliveryNoteView.DeliveryNoteOutType = _StorageOutHeader.Storage.DeliveryNoteOutType_ReturnBack;
+            }
+
+
+            if (_StorageOutHeader.Customers != null)
+            {
+                if (_StorageOutHeader.Customers.Address1 != null) _DeliveryNoteView.TransportAddress = _onew.GetObjectByKey<Address>(_StorageOutHeader.Customers.Address1.Oid);
+                if (_StorageOutHeader.Customers.Address2 != null) _DeliveryNoteView.TransportAddress = _onew.GetObjectByKey<Address>(_StorageOutHeader.Customers.Address2.Oid);
+                if (_StorageOutHeader.Customers.ShipmentOption != null) _DeliveryNoteView.ShipmentOption = _onew.GetObjectByKey<ShipmentOption>(_StorageOutHeader.Customers.ShipmentOption.Oid);
+                if (_StorageOutHeader.Customers.QualityOption != null) _DeliveryNoteView.QualityOption = _onew.GetObjectByKey<QualityOption>(_StorageOutHeader.Customers.QualityOption.Oid);
+            }
+
+            e.View = Application.CreateDetailView(_onew, "DeliveryNoteView_DetailView", false, _DeliveryNoteView);
+        }
+
+        /// <summary>
+        /// Kitárolási bizonylathoz kapcsolódó szállítólevél újranyomtatása
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void aPrint_DeliveryNoteOutHeader_Execute(object sender, SimpleActionExecuteEventArgs e)
+        {
+            XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace;
+            StorageOutHeader _StorageOutHeader = View.CurrentObject as StorageOutHeader;
+            BusinessDocumentHelper.PrintDeliveryNoteOutHeader(_ocur, Frame, _StorageOutHeader.DeliveryNoteOutHeader);
+
+        }
+
+        private void aStornoDeliveryNoteOutfromStorageOut_Execute(object sender, SimpleActionExecuteEventArgs e)
+        {
+            XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace;
+            StorageOutHeader _StorageOutHeader = View.CurrentObject as StorageOutHeader;
+            DeliveryNoteOutHeader _DeliveryNoteOutHeader = BusinessDocumentHelper.StornoDeliveryNoteOutHeaderfromStorageOutHeader(_ocur, _StorageOutHeader);
+            if (_DeliveryNoteOutHeader!=null)
+            {
+                BusinessDocumentHelper.PrintDeliveryNoteOutHeader(_ocur, Frame, _DeliveryNoteOutHeader);
+            }
+            
+        }
     }
 }

Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx

@@ -118,7 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="aCreateDeliveryNoteOutfromStorageOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="aPrint_DeliveryNoteOutHeader.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>290, 17</value>
+  </metadata>
+  <metadata name="aStornoDeliveryNoteOutfromStorageOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>290, 56</value>
   </metadata>
   <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>

Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs

@@ -1,4 +1,6 @@
-using DevExpress.ExpressApp.Xpo;
+using DevExpress.Data.Filtering;
+using DevExpress.ExpressApp;
+using DevExpress.ExpressApp.Xpo;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19,14 +21,206 @@ namespace Nuvolar.Module.Helpers
 
             return _DeliveryNoteOutHeader;
         }
-
+        /// <summary>
-        public static bool AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader)
+        /// Új kimenő szállíttólevél fejléc a _deliveryNoteView popup alapján
+        /// </summary>
+        /// <param name="_ObjectSpace"></param>
+        /// <param name="_DeliveryNoteView"></param>
+        /// <returns></returns>
+        public static DeliveryNoteOutHeader CreateNewDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteView _DeliveryNoteView)
         {
-            return true;
+            DeliveryNoteOutHeader _DeliveryNoteOutHeader = _ObjectSpace.CreateObject<DeliveryNoteOutHeader>();
+            try
+            {
+                _DeliveryNoteOutHeader.CustomersFrom = _ObjectSpace.GetObject(_DeliveryNoteView.CustomersFrom);
+                _DeliveryNoteOutHeader.ConnectInfo = "";
+                _DeliveryNoteOutHeader.CurrencyName = _ObjectSpace.GetObject((_DeliveryNoteView.CurrencyName));
+                _DeliveryNoteOutHeader.Customers = _ObjectSpace.GetObject((_DeliveryNoteView.Customers));
+                _DeliveryNoteOutHeader.DateCreated = GeneralFunction.GetSQLTime(_ObjectSpace.Session);
+                _DeliveryNoteOutHeader.DateExecution = GeneralFunction.GetSQLTime(_ObjectSpace.Session);
+                _DeliveryNoteOutHeader.DeliveryNoteOutType = _ObjectSpace.GetObject((_DeliveryNoteView.DeliveryNoteOutType));
+                _DeliveryNoteOutHeader.DocumentNumber = "";
+                _DeliveryNoteOutHeader.IsEditable = false;
+                _DeliveryNoteOutHeader.IsStorno = false;
+                _DeliveryNoteOutHeader.Note = _ObjectSpace.GetObject((_DeliveryNoteView.Note));
+                _DeliveryNoteOutHeader.QualityOption = _ObjectSpace.GetObject((_DeliveryNoteView.QualityOption));
+                _DeliveryNoteOutHeader.ShipmentOption = _ObjectSpace.GetObject((_DeliveryNoteView.ShipmentOption));
+                _DeliveryNoteOutHeader.TransportAddress = _ObjectSpace.GetObject((_DeliveryNoteView.TransportAddress));
+            }
+            catch (Exception)
+            {
+                _ObjectSpace.Delete(_DeliveryNoteOutHeader);
+                _DeliveryNoteOutHeader = null;
+            }
+
+            return _DeliveryNoteOutHeader;
         }
+        /// <summary>
+        /// Létrehoz egy új DeliveryNoteOutRows objektumot (üresen, de a DeliveryNoteOutHeader-t beilleszti)
+        /// </summary>
+        /// <param name="_ObjectSpace"></param>
+        /// <param name="_DeliveryNoteOutHeader"></param>
+        /// <returns></returns>
+        public static DeliveryNoteOutRows AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader)
+        {
+            DeliveryNoteOutRows _DeliveryNoteOutRows = _ObjectSpace.CreateObject<DeliveryNoteOutRows>();
+
+
+            _DeliveryNoteOutRows.DeliveryNoteOutHeader = _DeliveryNoteOutHeader;
+
+            return _DeliveryNoteOutRows;
+        }
+        /// <summary>
+        /// Kitárolási sor FIFO lábaiból a QTT alapján egy kiszállítási sort készít
+        /// </summary>
+        /// <param name="_ObjectSpace"></param>
+        /// <param name="_DeliveryNoteOutHeader"></param>
+        /// <param name="_StorageOutRows"></param>
+        /// <returns></returns>
+        public static DeliveryNoteOutRows AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader, StorageOutRowsInRows _StorageOutRowsInRows, long _RowIndex)
+        {
+            DeliveryNoteOutRows _DeliveryNoteOutRows = _ObjectSpace.CreateObject<DeliveryNoteOutRows>();
+            try
+            {
+
+
+                _DeliveryNoteOutRows.DeliveryNoteOutHeader = _DeliveryNoteOutHeader;
+                _DeliveryNoteOutRows.DividedOriginal = 0;
+                _DeliveryNoteOutRows.QTT = _StorageOutRowsInRows.QTT_Will;
+                _DeliveryNoteOutRows.QTT_Invoiced = 0;
+                _DeliveryNoteOutRows.QTT_Will = 0;
+                _DeliveryNoteOutRows.RowIndex = _RowIndex;
+                _DeliveryNoteOutRows.StorageOutRowsInRows = _ObjectSpace.GetObject(_StorageOutRowsInRows);
+
+                _StorageOutRowsInRows.QTT_To_DeliveryOut = _DeliveryNoteOutRows.QTT; // A kitárolási sor is update !!!!
+            }
+            catch (Exception)
+            {
+
+                _ObjectSpace.Delete(_DeliveryNoteOutRows);
+                _DeliveryNoteOutRows = null;
+            }
+
+            return _DeliveryNoteOutRows;
+        }
+        /// <summary>
+        /// Véglegesíti a korábban elkezdett DeliveryNoteOutHeader-t
+        /// </summary>
+        /// <param name="_ObjectSpace"></param>
+        /// <param name="_DeliveryNoteOutHeader"></param>
+        /// <returns></returns>
         public static bool FinalizeDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader)
         {
-            return true;
+            bool _Ok = true;
+            try
+            {
+                _ObjectSpace.CommitChanges();
+            }
+            catch (Exception)
+            {
+
+                _Ok = false;
+            }
+
+            return _Ok;
+        }
+        public static bool FinalizeDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader, StorageOutHeader _StorageOutHeader)
+        {
+            bool _Ok = true;
+            try
+            {
+                _StorageOutHeader.DeliveryNoteOutHeader = _ObjectSpace.GetObject(_DeliveryNoteOutHeader);
+                _ObjectSpace.CommitChanges();
+            }
+            catch (Exception)
+            {
+
+                _Ok = false;
+            }
+
+            return _Ok;
+        }
+        /// <summary>
+        /// Szállítólevél nyomtatása
+        /// </summary>
+        /// <param name="_ObjectSpace"></param>
+        /// <param name="_Frame"></param>
+        /// <param name="_DeliveryNoteOutHeader"></param>
+        public static void PrintDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, Frame _Frame, DeliveryNoteOutHeader _DeliveryNoteOutHeader)
+        {
+            if (_DeliveryNoteOutHeader==null)
+            {
+                return;
+            }
+            if (_DeliveryNoteOutHeader.DeliveryNoteOutType.ReportDataV2 != null)
+            {
+                XAFPrintHelper _XAFPrintHelper = new XAFPrintHelper(_ObjectSpace, _Frame, _DeliveryNoteOutHeader.DeliveryNoteOutType.ReportDataV2,
+                    CriteriaOperator.Parse("DeliveryNoteOutHeader.Oid = ?", _DeliveryNoteOutHeader.Oid));
+                _XAFPrintHelper.ShowPreviewV2();
+            }
+
+        }
+        /// <summary>
+        /// Kitárolási bizonylatról kiszállítótt szállító stornírozása
+        /// </summary>
+        /// <param name="_ObjectSpace"></param>
+        /// <param name="_DeliveryNoteOutHeader_Original"></param>
+        /// <param name="_StorageOutHeader"></param>
+        /// <returns></returns>
+        public static DeliveryNoteOutHeader StornoDeliveryNoteOutHeaderfromStorageOutHeader(XPObjectSpace _ObjectSpace, StorageOutHeader _StorageOutHeader)
+        {
+
+            DeliveryNoteOutHeader _DeliveryNoteOutHeader = CreateNewDeliveryNoteOutHeader(_ObjectSpace);
+            try
+            {
+                _StorageOutHeader.DeliveryNoteOutHeader.IsEditable = false;
+                _StorageOutHeader.DeliveryNoteOutHeader.IsStorno = true;
+                
+
+                _DeliveryNoteOutHeader.ConnectInfo = _StorageOutHeader.DeliveryNoteOutHeader.DocumentNumber;
+                _DeliveryNoteOutHeader.CurrencyName = _StorageOutHeader.DeliveryNoteOutHeader.CurrencyName;
+                _DeliveryNoteOutHeader.Customers = _StorageOutHeader.DeliveryNoteOutHeader.Customers;
+                _DeliveryNoteOutHeader.CustomersFrom = _StorageOutHeader.DeliveryNoteOutHeader.CustomersFrom;
+                _DeliveryNoteOutHeader.DateCreated = GeneralFunction.GetSQLTime(_ObjectSpace.Session);
+                _DeliveryNoteOutHeader.DateExecution = GeneralFunction.GetSQLTime(_ObjectSpace.Session);
+                _DeliveryNoteOutHeader.DeliveryNoteOutType = _StorageOutHeader.DeliveryNoteOutHeader.DeliveryNoteOutType;
+                _DeliveryNoteOutHeader.IsEditable = false;
+                _DeliveryNoteOutHeader.IsStorno = true;
+                _DeliveryNoteOutHeader.Note = _StorageOutHeader.DeliveryNoteOutHeader.Note;
+                _DeliveryNoteOutHeader.QualityOption = _StorageOutHeader.DeliveryNoteOutHeader.QualityOption;
+                _DeliveryNoteOutHeader.ShipmentOption = _StorageOutHeader.DeliveryNoteOutHeader.ShipmentOption;
+                _DeliveryNoteOutHeader.TransportAddress = _StorageOutHeader.DeliveryNoteOutHeader.TransportAddress;
+
+                foreach (DeliveryNoteOutRows _DeliveryNoteOutRows_Original in _StorageOutHeader.DeliveryNoteOutHeader.DeliveryNoteOutRows)
+                {
+
+                    _DeliveryNoteOutRows_Original.StorageOutRowsInRows.QTT_To_DeliveryOut = 0;
+                    DeliveryNoteOutRows _DeliveryOutRows = _ObjectSpace.CreateObject<DeliveryNoteOutRows>();
+
+                    _DeliveryOutRows.DeliveryNoteOutHeader = _DeliveryNoteOutHeader;
+                    _DeliveryOutRows.ADRNumber = _DeliveryNoteOutRows_Original.ADRNumber;
+                    _DeliveryOutRows.Note = _DeliveryNoteOutRows_Original.Note;
+                    _DeliveryOutRows.QTT = _DeliveryNoteOutRows_Original.QTT * -1;
+                    _DeliveryOutRows.QTT_Invoiced = 0;
+                    _DeliveryOutRows.QTT_Will = 0;
+                    _DeliveryOutRows.RowIndex = _DeliveryNoteOutRows_Original.RowIndex;
+                    _DeliveryOutRows.StorageOutRowsInRows = _DeliveryNoteOutRows_Original.StorageOutRowsInRows;
+
+
+                }
+
+                _StorageOutHeader.DeliveryNoteOutHeader = null;
+                _ObjectSpace.CommitChanges();
+            }
+            catch (Exception)
+            {
+
+            }
+            finally
+            {
+                
+            }
+            return _DeliveryNoteOutHeader;
         }
         #endregion
         #region Invoice

Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml

@@ -2,11 +2,14 @@
 <Application>
   <ActionDesign>
     <Actions>
+      <Action Id="aCreateDeliveryNoteOutfromStorageOut" Caption="Raktárközi szállítólevél készítése" />
       <Action Id="aCreateNAVInvoiceReportXML" Caption="Lekérdezés futtatása" ConfirmationMessage="Niztosan lefuttatja a lekérdezést ?" />
       <Action Id="aMoveOrderIn" Caption="Átvitel másik rendelésre" />
       <Action Id="aOpenWindowsExplorer" Caption="Windows Intéző megnyitása" />
       <Action Id="aOrderInStorageOut" Caption="Kitárolás" />
+      <Action Id="aPrint_DeliveryNoteOutHeader" Caption="Szállítólevél nyomtatása" />
       <Action Id="aRecreateCustomersOrderDocuments" Caption="Beszállítói dokumentum paraméter generálása" />
+      <Action Id="aStornoDeliveryNoteOutfromStorageOut" Caption="Szállítólevél stornírozása" />
     </Actions>
   </ActionDesign>
   <BOModel>

Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml

@@ -2,13 +2,15 @@
 <Application>
   <ActionDesign>
     <Actions>
-      <Action Id="aCreateDeliveryNoteOutfromStorageOut" ImageName="document_lock" Caption="Szállítólevél készítése" TargetObjectsCriteria="[StorageMoveType.MoveDirection] = ##Enum#Nuvolar.Module.eMoveDirection,eOutput# And [StorageMoveType.MoveType] = ##Enum#Nuvolar.Module.eMoveType,InventoryTransfer#" />
+      <Action Id="aCreateDeliveryNoteOutfromStorageOut" ImageName="document_lock" Caption="Szállítólevél készítése" TargetObjectsCriteria="[StorageMoveType.MoveDirection] = ##Enum#Nuvolar.Module.eMoveDirection,eOutput# And [DeliveryNoteOutHeader] Is Null And [StorageMoveType.MoveType] In (##Enum#Nuvolar.Module.eMoveType,InventoryTransfer#, ##Enum#Nuvolar.Module.eMoveType,ReturnBack#)" />
       <Action Id="aCreateNAVInvoiceReportXML" ImageName="Action_Export_ToXML" />
       <Action Id="aDeliveryNoteOutPrint_Divided" ImageName="MenuBar_Print" TargetObjectsCriteria="[DividedOriginal] In (2L, 1L)" />
       <Action Id="aMoveOrderIn" ImageName="replace2" />
       <Action Id="aMoveOrderInBack" ImageName="selection_replace" TargetObjectsCriteria="[OrderInHeader.IsEditable] = True And [QTT_Invoiced] = 0.0 And [QTT_DeliveryNoted] &gt; 0.0 And [QTT_DeliveryNoted] = [QTT_Storaged] And [DividedOriginal] = 1L" />
       <Action Id="aOpenWindowsExplorer" ImageName="console" />
       <Action Id="aOrderInStorageOut" ImageName="document_out" />
+      <Action Id="aPrint_DeliveryNoteOutHeader" ImageName="Action_Printing_Print" TargetObjectsCriteria="[DeliveryNoteOutHeader] Is Not Null" />
+      <Action Id="aStornoDeliveryNoteOutfromStorageOut" ImageName="document_delete" TargetObjectsCriteria="[DeliveryNoteOutHeader] Is Not Null And [DeliveryNoteOutHeader.IsStorno] = False And [StorageMoveType.MoveType] In (##Enum#Nuvolar.Module.eMoveType,InventoryTransfer#, ##Enum#Nuvolar.Module.eMoveType,ReturnBack#) And [StorageMoveType.MoveDirection] = ##Enum#Nuvolar.Module.eMoveDirection,eOutput#" />
       <Action Id="aViewPriceFixCustomers" Caption="Ármátrix áttekintése" ImageName="money2" />
     </Actions>
     <ActionToContainerMapping>

Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb

@@ -107,7 +107,11 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok
             SetPropertyValue("QTT_Will", _QTT_Will, value)
         End Set
     End Property
-    <Size(-1)> _
+    ''' <summary>
+    ''' Megjegyzés (Note)
+    ''' </summary>
+    ''' <returns></returns>
+    <Size(-1)>
     Property Note() As String
         Get
             Return _Note
@@ -116,6 +120,10 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok
             SetPropertyValue("Note", _Note, value)
         End Set
     End Property
+    ''' <summary>
+    ''' ADR szám a szállításhoz (ADRNumber)
+    ''' </summary>
+    ''' <returns></returns>
     Property ADRNumber As Double
         Get
             Return _ADRNumber
@@ -124,6 +132,10 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok
             SetPropertyValue("ADRNumber", _ADRNumber, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Eredeti megosztási sor
+    ''' </summary>
+    ''' <returns></returns>
     <VisibleInDetailView(False), VisibleInLookupListView(False), VisibleInListView(False)>
     Property DividedOriginal As Long
         Get
@@ -133,6 +145,11 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok
             SetPropertyValue("DividedOriginal", _DividedOriginal, value)
         End Set
     End Property
+
+    ''' <summary>
+    ''' Megosztási sor azonosító
+    ''' </summary>
+    ''' <returns></returns>
     <VisibleInDetailView(False), VisibleInLookupListView(False), VisibleInListView(False)>
     Property DividedGUID As Guid
         Get

Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.Designer.vb

@@ -21,11 +21,11 @@ Partial Class OrderInVC
 	'Required by the Component Designer
 	Private components As System.ComponentModel.IContainer
 
-	'NOTE: The following procedure is required by the Component Designer
+    'NOTE: The following procedure is required by the Component Designer
-	'It can be modified using the Component Designer.
+    'It can be modified using the Component Designer.
-	'Do not modify it using the code editor.
+    'Do not modify it using the code editor.
-	<System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
-	Private Sub InitializeComponent()
+    Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Me.aFinalizeOrderIn = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components)
         Me.aStornoOrderIn = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components)

Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.resx

@@ -118,109 +118,109 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="aFinalizeOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
-  <metadata name="aStornoOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>544, 17</value>
-  </metadata>
-  <metadata name="aToTable_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1129, 17</value>
-  </metadata>
-  <metadata name="aToTableD_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <metadata name="aUp_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>174, 56</value>
-  </metadata>
-  <metadata name="aDown_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>499, 56</value>
-  </metadata>
-  <metadata name="aGenerateStorageOutFromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>825, 56</value>
-  </metadata>
-  <metadata name="aGenerateInvoicefromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1065, 56</value>
-  </metadata>
-  <metadata name="aReCalculatePricing_OrderInRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 95</value>
-  </metadata>
-  <metadata name="aRecalculateOrder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>798, 95</value>
-  </metadata>
-  <metadata name="aGenerateOrderOutTempFromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1156, 95</value>
-  </metadata>
-  <metadata name="aGenerateStorageOutFromOrderInFIFO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>196, 134</value>
-  </metadata>
-  <metadata name="aBackToEdit_OrderInHeader.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>636, 134</value>
-  </metadata>
-  <metadata name="aProductFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>840, 134</value>
-  </metadata>
-  <metadata name="aORI_Storno_Invoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>974, 134</value>
-  </metadata>
-  <metadata name="aORI_Storno_DeliveryNoteOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 173</value>
-  </metadata>
-  <metadata name="aORI_Storno_StorageOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>502, 173</value>
-  </metadata>
-  <metadata name="aORI_Create_DeliveryInvoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>689, 173</value>
-  </metadata>
-  <metadata name="aORI_Create_Delivery.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1125, 173</value>
-  </metadata>
-  <metadata name="aORI_Create_Invoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>490, 212</value>
-  </metadata>
-  <metadata name="aGenerateStorageOutFromOrderInBack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>224, 212</value>
-  </metadata>
-  <metadata name="aOrderIn_InvoiceRowFinalize.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 212</value>
   </metadata>
-  <metadata name="aORI_Invoice_Popup_Description.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aStornoOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>895, 173</value>
+    <value>1313, 173</value>
   </metadata>
-  <metadata name="aORI_Invoice_Popup_DescriptionHeader.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aToTable_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>233, 173</value>
+    <value>1165, 173</value>
   </metadata>
-  <metadata name="aORI_OrderToSetCustomerOrder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aToTableD_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1137, 134</value>
+    <value>1038, 17</value>
   </metadata>
-  <metadata name="aORI_OrderToIncoming.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aUp_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 134</value>
+    <value>1044, 173</value>
   </metadata>
-  <metadata name="aOrderIn_ChangeRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aDown_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>461, 134</value>
+    <value>907, 173</value>
   </metadata>
-  <metadata name="aOrderInOther_ChangeRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aGenerateStorageOutFromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>949, 95</value>
+    <value>667, 173</value>
   </metadata>
-  <metadata name="aOrderInStorageOutDeliveryNoteOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aGenerateInvoicefromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>544, 95</value>
+    <value>206, 56</value>
   </metadata>
-  <metadata name="aOrderInStorageOutDeliveryNoteOutInvoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="aReCalculatePricing_OrderInRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>433, 173</value>
+  </metadata>
+  <metadata name="aRecalculateOrder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>282, 173</value>
+  </metadata>
+  <metadata name="aGenerateOrderOutTempFromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 95</value>
   </metadata>
+  <metadata name="aGenerateStorageOutFromOrderInFIFO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 173</value>
+  </metadata>
+  <metadata name="aBackToEdit_OrderInHeader.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1302, 134</value>
+  </metadata>
+  <metadata name="aProductFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1168, 134</value>
+  </metadata>
+  <metadata name="aORI_Storno_Invoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1005, 134</value>
+  </metadata>
+  <metadata name="aORI_Storno_DeliveryNoteOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>508, 95</value>
+  </metadata>
+  <metadata name="aORI_Storno_StorageOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>818, 134</value>
+  </metadata>
+  <metadata name="aORI_Create_DeliveryInvoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>612, 134</value>
+  </metadata>
+  <metadata name="aORI_Create_Delivery.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 134</value>
+  </metadata>
+  <metadata name="aORI_Create_Invoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>450, 134</value>
+  </metadata>
+  <metadata name="aGenerateStorageOutFromOrderInBack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>184, 134</value>
+  </metadata>
+  <metadata name="aOrderIn_InvoiceRowFinalize.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1223, 95</value>
+  </metadata>
+  <metadata name="aORI_Invoice_Popup_Description.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>993, 95</value>
+  </metadata>
+  <metadata name="aORI_Invoice_Popup_DescriptionHeader.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>724, 95</value>
+  </metadata>
+  <metadata name="aORI_OrderToSetCustomerOrder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>278, 95</value>
+  </metadata>
+  <metadata name="aORI_OrderToIncoming.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1174, 56</value>
+  </metadata>
+  <metadata name="aOrderIn_ChangeRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1353, 56</value>
+  </metadata>
+  <metadata name="aOrderInOther_ChangeRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>967, 56</value>
+  </metadata>
+  <metadata name="aOrderInStorageOutDeliveryNoteOut.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>713, 56</value>
+  </metadata>
+  <metadata name="aOrderInStorageOutDeliveryNoteOutInvoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>420, 56</value>
+  </metadata>
   <metadata name="aOrderIn_RecalculateDEV.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>636, 56</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="aOrderInInvoiceAdvanceAsk.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>295, 56</value>
+    <value>1195, 17</value>
   </metadata>
   <metadata name="aOrderInInvoiceAdvance.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1277, 17</value>
+    <value>853, 17</value>
   </metadata>
   <metadata name="aORI_DeleteInvoiceProforma.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>921, 17</value>
+    <value>645, 17</value>
   </metadata>
   <metadata name="aGenerateInvoiceFromOrderInFinal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>680, 17</value>
+    <value>404, 17</value>
   </metadata>
   <metadata name="aORI_RegenerateValues.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>223, 17</value>

Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb

@@ -48,6 +48,8 @@ Public Class StorageOutHeader
     Private _WorkSheet_Header As WorkSheet_Header 'Melyik munkalaphoz kapcsolódik a kitárolás
     Private _StoragePDACollectionHeader As StoragePDACollectionHeader
     Private _ConnectInfo As String
+    Private _DeliveryNoteOutHeader As DeliveryNoteOutHeader 'Milyen szállítólevelen lett raktárközi kiszállítva, visszárúzva stb.
+
 
     '----------------------------------------------------------------------------
     Private _row_OutMode As eOutMode
@@ -239,6 +241,18 @@ Public Class StorageOutHeader
             SetPropertyValue("ConnectInfo", _ConnectInfo, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Milyen szállítólevelen lett kiszállítva (raktárközi, visszárú esetén)
+    ''' </summary>
+    ''' <returns></returns>
+    Property DeliveryNoteOutHeader As DeliveryNoteOutHeader
+        Get
+            Return _DeliveryNoteOutHeader
+        End Get
+        Set(value As DeliveryNoteOutHeader)
+            SetPropertyValue("DeliveryNoteOutHeader", _DeliveryNoteOutHeader, value)
+        End Set
+    End Property
 
     'Nonpersistent
     <NonPersistent()>
@@ -298,9 +312,9 @@ Public Class StorageOutHeader
     End Property
 
     'XPCollections
-    <VisibleInListView(False)> _
+    <VisibleInListView(False)>
-    <Association("StorageOut", GetType(StorageOutRows))> _
+    <Association("StorageOut", GetType(StorageOutRows))>
-    Public ReadOnly Property StorageOutRows() As XPCollection(Of StorageOutRows)
+    Public ReadOnly Property StorageOutRows As XPCollection(Of StorageOutRows)
         Get
             Return GetCollection(Of StorageOutRows)("StorageOutRows")
         End Get

Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb

@@ -28,13 +28,18 @@ Public Class Storage '-- Raktárak ------------
     Private _ReportIn As ReportData ' -- Nyomtatvány betárolás
     Private _ReportOut As ReportData ' -- Nyomtatvány kitárolás
     Private _ReportInventory As ReportData '--Leltár nyomtatvány DataType InventorySIR
-
+    Private _DeliveryNoteOutType_InventoryTransfer As DeliveryNoteOutType '--Szállítólevél a raktárközi átadás hoz
+    Private _DeliveryNoteOutType_ReturnBack As DeliveryNoteOutType '--Szállítólevél a visszárúhoz
 
     Public Sub New(ByVal session As Session)
         MyBase.New(session)
     End Sub
     Public Overrides Sub AfterConstruction()
     End Sub
+    ''' <summary>
+    ''' Saját cég
+    ''' </summary>
+    ''' <returns></returns>
     Property CustomersFrom As CustomersFrom
         Get
             Return _CustomersFrom
@@ -43,6 +48,10 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("CustomersFrom", _CustomersFrom, value)
         End Set
     End Property
+    ''' <summary>
+    ''' A raktár címe
+    ''' </summary>
+    ''' <returns></returns>
     <ImmediatePostData(True), DataSourceProperty("CustomersFrom_Address")>
     Property Address As Address
         Get
@@ -52,7 +61,11 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("Address", _Address, value)
         End Set
     End Property
-    <RuleRequiredField("Storage-ShortName", DefaultContexts.Save)> _
+    ''' <summary>
+    ''' Rövid megnevezés
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Storage-ShortName", DefaultContexts.Save)>
     Property ShortName As String
         Get
             Return _ShortName
@@ -61,7 +74,11 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("ShortName", _ShortName, value)
         End Set
     End Property
-    <RuleRequiredField("Storage-Description", DefaultContexts.Save)> _
+    ''' <summary>
+    ''' Leírás (max 100 karakter)
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Storage-Description", DefaultContexts.Save)>
     Property Description As String
         Get
             Return _Description
@@ -70,7 +87,11 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("Description", _Description, value)
         End Set
     End Property
-    <RuleRequiredField("Storage-NumberGeneratorOut", DefaultContexts.Save), NonCloneable()> _
+    ''' <summary>
+    ''' Kitárolás sorszám generátora
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Storage-NumberGeneratorOut", DefaultContexts.Save), NonCloneable()>
     Property NumberGeneratorOut As NumberGenerator
         Get
             Return _NumberGeneratorOut
@@ -79,7 +100,11 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("NumberGeneratorOut", _NumberGeneratorOut, value)
         End Set
     End Property
-    <RuleRequiredField("Storage-NumberGeneratorIn", DefaultContexts.Save), NonCloneable()> _
+    ''' <summary>
+    ''' Betárolás sorszámgenerátora
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Storage-NumberGeneratorIn", DefaultContexts.Save), NonCloneable()>
     Property NumberGeneratorIn As NumberGenerator
         Get
             Return _NumberGeneratorIn
@@ -88,7 +113,11 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("NumberGeneratorIn", _NumberGeneratorIn, value)
         End Set
     End Property
-    <RuleRequiredField("Storage-NumberGeneratorOutS", DefaultContexts.Save), NonCloneable()> _
+    ''' <summary>
+    ''' Kitárolás stornó sorszámgenerátora
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Storage-NumberGeneratorOutS", DefaultContexts.Save), NonCloneable()>
     Property NumberGeneratorOutS As NumberGenerator
         Get
             Return _NumberGeneratorOutS
@@ -97,7 +126,11 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("NumberGeneratorOutS", _NumberGeneratorOutS, value)
         End Set
     End Property
-    <RuleRequiredField("Storage-NumberGeneratorInS", DefaultContexts.Save), NonCloneable()> _
+    ''' <summary>
+    ''' Betárolás stornó sorszámgenerátora
+    ''' </summary>
+    ''' <returns></returns>
+    <RuleRequiredField("Storage-NumberGeneratorInS", DefaultContexts.Save), NonCloneable()>
     Property NumberGeneratorInS As NumberGenerator
         Get
             Return _NumberGeneratorInS
@@ -106,6 +139,10 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("NumberGeneratorInS", _NumberGeneratorInS, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Betárolás nyomtatványa
+    ''' </summary>
+    ''' <returns></returns>
     Property ReportIn As ReportData
         Get
             Return _ReportIn
@@ -114,6 +151,10 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("ReportIn", _ReportIn, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Kitárolás nyomtatvány
+    ''' </summary>
+    ''' <returns></returns>
     Property ReportOut As ReportData
         Get
             Return _ReportOut
@@ -122,6 +163,10 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("ReportOut", _ReportOut, value)
         End Set
     End Property
+    ''' <summary>
+    ''' Leltár nyomtatvány
+    ''' </summary>
+    ''' <returns></returns>
     Property ReportInventory As ReportData
         Get
             Return _ReportInventory
@@ -130,7 +175,30 @@ Public Class Storage '-- Raktárak ------------
             SetPropertyValue("ReportInventory", _ReportInventory, value)
         End Set
     End Property
-
+    ''' <summary>
+    ''' Szállítólevél a raktárközi átadás hoz
+    ''' </summary>
+    ''' <returns></returns>
+    Property DeliveryNoteOutType_InventoryTransfer As DeliveryNoteOutType
+        Get
+            Return _DeliveryNoteOutType_InventoryTransfer
+        End Get
+        Set(value As DeliveryNoteOutType)
+            SetPropertyValue("DeliveryNoteOutType_InventoryTransfer", _DeliveryNoteOutType_InventoryTransfer, value)
+        End Set
+    End Property
+    ''' <summary>
+    ''' Szállítólevél a visszárúhoz
+    ''' </summary>
+    ''' <returns></returns>
+    Property DeliveryNoteOutType_ReturnBack As DeliveryNoteOutType
+        Get
+            Return _DeliveryNoteOutType_ReturnBack
+        End Get
+        Set(value As DeliveryNoteOutType)
+            SetPropertyValue("DeliveryNoteOutType_ReturnBack", _DeliveryNoteOutType_ReturnBack, value)
+        End Set
+    End Property
     '-------------ReadOnly--------------
     <VisibleInListView(False)> _
     Private ReadOnly Property CustomersFrom_Address As XPCollection(Of Address)

Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml

@@ -7177,6 +7177,8 @@
       <OwnMembers>
         <Member Name="Address" Caption="Cím" />
         <Member Name="CustomersFrom" Caption="Saját cég" />
+        <Member Name="DeliveryNoteOutType_InventoryTransfer" Caption="Szállítólevél tipus (raktárközi átadás)" />
+        <Member Name="DeliveryNoteOutType_ReturnBack" Caption="Szállítólevél tipus (visszárú)" />
         <Member Name="Description" Caption="Leírás" />
         <Member Name="NumberGeneratorIn" Caption="Sorszám (bejövő)" />
         <Member Name="NumberGeneratorInS" Caption="Sorszám (bejövő stornó)" />
@@ -7383,6 +7385,7 @@
         <Member Name="CreateDate" Caption="Dátum" />
         <Member Name="Customers" Caption="Partner" />
         <Member Name="CustomersFrom" Caption="Saját cég" />
+        <Member Name="DeliveryNoteOutHeader" Caption="Szállítólevél" />
         <Member Name="DocumentNumber" Caption="Bizonylatszám" />
         <Member Name="IsEditable" Caption="Szerkeszthető" />
         <Member Name="IsStorno" Caption="Stornó" />
@@ -8568,6 +8571,10 @@
         <LocalizationItem Name="eOctober" Value="Október" />
         <LocalizationItem Name="eSeptember" Value="Szeptember" />
       </LocalizationGroup>
+      <LocalizationGroup Name="Nuvolar.Module.eMoveDirection">
+        <LocalizationItem Name="eInput" Value="Bejövő" />
+        <LocalizationItem Name="eOutput" Value="Kimenő" />
+      </LocalizationGroup>
       <LocalizationGroup Name="Nuvolar.Module.eMoveEventsType">
         <LocalizationItem Name="StorageInBackToEdit" Value="Betárolás vissza szerkesztésre" />
         <LocalizationItem Name="StorageInFinal" Value="Betárolás véglegesítése" />
@@ -15109,8 +15116,8 @@
             </LayoutGroup>
             <LayoutGroup Id="Item2" Caption="Sorszámok, nyomtatványok">
               <LayoutGroup Id="ac14f294-7977-418b-b6ec-fdfa6128d94f" Caption="ac14f294-7977-418b-b6ec-fdfa6128d94f">
-                <LayoutGroup Id="cdddc320-d867-48f6-884a-5d62a8fc7970" Caption="" />
+                <LayoutGroup Id="cdddc320-d867-48f6-884a-5d62a8fc7970" Caption="cdddc320-d867-48f6-884a-5d62a8fc7970(12)" />
-                <LayoutGroup Id="60b9aa32-ade1-4e32-b7e2-ab039d419f9c" Caption="" />
+                <LayoutGroup Id="60b9aa32-ade1-4e32-b7e2-ab039d419f9c" Caption="60b9aa32-ade1-4e32-b7e2-ab039d419f9c(16)" />
               </LayoutGroup>
             </LayoutGroup>
           </LayoutGroup>

Nuvolar.Module/Model.DesignedDiffs.xafml

@@ -26570,27 +26570,31 @@
       <Layout>
         <LayoutGroup Id="Main" RelativeSize="100" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default">
           <LayoutGroup Id="SimpleEditors" RelativeSize="100" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default">
-            <LayoutGroup Id="Storage" Direction="Vertical" RelativeSize="16" Caption="Storage" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default">
+            <LayoutGroup Id="Storage" Direction="Vertical" RelativeSize="19.78319783197832" Caption="Storage" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default">
-              <LayoutGroup Id="Storage_col1" RelativeSize="76" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default">
+              <LayoutGroup Id="Storage_col1" RelativeSize="100" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default">
-                <LayoutItem Id="CustomersFrom" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" RelativeSize="28" ViewItem="CustomersFrom" />
+                <LayoutItem Id="CustomersFrom" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" RelativeSize="28.571428571428573" ViewItem="CustomersFrom" />
-                <LayoutItem Id="ShortName" Index="1" RelativeSize="21" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" ViewItem="ShortName" />
+                <LayoutItem Id="ShortName" Index="1" RelativeSize="21.428571428571427" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" ViewItem="ShortName" />
-                <LayoutItem Id="Description" Index="2" RelativeSize="21" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" ViewItem="Description" />
+                <LayoutItem Id="Description" Index="2" RelativeSize="21.428571428571427" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" ViewItem="Description" />
-                <LayoutItem Id="Address" Index="3" RelativeSize="28" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" ViewItem="Address" />
+                <LayoutItem Id="Address" Index="3" RelativeSize="28.571428571428573" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" ViewItem="Address" />
+                <LayoutItem Id="NumberGeneratorIn" Index="4" RelativeSize="23.529411764705884" Removed="True" />
+                <LayoutItem Id="NumberGeneratorOutS" Index="4" RelativeSize="23.529411764705884" Removed="True" />
                 <LayoutItem Id="NumberGeneratorOut" ViewItem="NumberGeneratorOut" Removed="True" />
               </LayoutGroup>
               <LayoutGroup Id="Storage_col2" Removed="True" />
             </LayoutGroup>
-            <LayoutGroup Id="Item2" ShowCaption="True" CaptionLocation="Top" Index="1" RelativeSize="83" ImageName="" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Direction="Vertical" IsNewNode="True">
+            <LayoutGroup Id="Item2" ShowCaption="True" CaptionLocation="Top" Index="1" RelativeSize="80.216802168021687" ImageName="" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Direction="Vertical" IsNewNode="True">
-              <LayoutGroup Id="ac14f294-7977-418b-b6ec-fdfa6128d94f" Direction="Horizontal" Index="0" RelativeSize="95" ShowCaption="False" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" IsNewNode="True">
+              <LayoutGroup Id="ac14f294-7977-418b-b6ec-fdfa6128d94f" Direction="Horizontal" Index="0" RelativeSize="100" ShowCaption="False" ImageName="" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" IsNewNode="True">
-                <LayoutGroup Id="cdddc320-d867-48f6-884a-5d62a8fc7970" ShowCaption="False" Direction="Vertical" Index="0" RelativeSize="49" IsNewNode="True">
+                <LayoutGroup Id="cdddc320-d867-48f6-884a-5d62a8fc7970" ShowCaption="False" Direction="Vertical" Index="0" RelativeSize="49.515608180839614" IsNewNode="True">
-                  <LayoutItem Id="NumberGeneratorIn" ViewItem="NumberGeneratorIn" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="0" RelativeSize="4" IsNewNode="True" />
+                  <LayoutItem Id="NumberGeneratorIn" ViewItem="NumberGeneratorIn" Index="0" RelativeSize="5.7347670250896057" IsNewNode="True" />
-                  <LayoutItem Id="NumberGeneratorInS" ViewItem="NumberGeneratorInS" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="1" RelativeSize="3" IsNewNode="True" />
+                  <LayoutItem Id="NumberGeneratorInS" ViewItem="NumberGeneratorInS" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="1" RelativeSize="4.301075268817204" IsNewNode="True" />
-                  <LayoutItem Id="ReportIn" ShowCaption="True" ViewItem="ReportIn" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="2" RelativeSize="92" IsNewNode="True" />
+                  <LayoutItem Id="NumberGeneratorOut" ViewItem="NumberGeneratorOut" Index="2" RelativeSize="4.301075268817204" IsNewNode="True" />
+                  <LayoutItem Id="NumberGeneratorOutS" ViewItem="NumberGeneratorOutS" Index="3" RelativeSize="85.663082437275989" IsNewNode="True" />
                 </LayoutGroup>
-                <LayoutGroup Id="60b9aa32-ade1-4e32-b7e2-ab039d419f9c" ShowCaption="False" Direction="Vertical" Index="1" RelativeSize="50" IsNewNode="True">
+                <LayoutGroup Id="60b9aa32-ade1-4e32-b7e2-ab039d419f9c" ShowCaption="False" Direction="Vertical" Index="1" RelativeSize="50.484391819160386" IsNewNode="True">
-                  <LayoutItem Id="NumberGeneratorOut" ViewItem="NumberGeneratorOut" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="0" RelativeSize="4" IsNewNode="True" />
+                  <LayoutItem Id="ReportIn" ViewItem="ReportIn" Index="0" RelativeSize="5.7347670250896057" IsNewNode="True" />
-                  <LayoutItem Id="NumberGeneratorOutS" ViewItem="NumberGeneratorOutS" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="1" RelativeSize="3" IsNewNode="True" />
+                  <LayoutItem Id="ReportOut" ShowCaption="True" ViewItem="ReportOut" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="1" RelativeSize="4.301075268817204" IsNewNode="True" />
-                  <LayoutItem Id="ReportOut" ShowCaption="True" ViewItem="ReportOut" CaptionLocation="Default" CaptionWordWrap="Default" CaptionHorizontalAlignment="Default" CaptionVerticalAlignment="Default" Index="2" RelativeSize="92" IsNewNode="True" />
+                  <LayoutItem Id="DeliveryNoteOutType_InventoryTransfer" ViewItem="DeliveryNoteOutType_InventoryTransfer" Index="2" RelativeSize="4.301075268817204" IsNewNode="True" />
+                  <LayoutItem Id="DeliveryNoteOutType_ReturnBack" ViewItem="DeliveryNoteOutType_ReturnBack" Index="3" RelativeSize="85.663082437275989" CaptionLocation="Left" IsNewNode="True" />
                 </LayoutGroup>
               </LayoutGroup>
             </LayoutGroup>