diff --git a/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers.cs b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers.cs
new file mode 100644
index 0000000..97d2df8
--- /dev/null
+++ b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers.cs
@@ -0,0 +1,26 @@
+using System;
+using DevExpress.Xpo;
+using DevExpress.Persistent.Base;
+namespace Nuvolar.Module.BusinessObjects
+{
+ [DefaultClassOptions]
+ [NavigationItem(false)]
+ [NonPersistent()]
+ public class PriceFixCustomers : XPBaseObject
+ {
+ public PriceFixCustomers(Session session) : base(session) { }
+
+
+ public Customers Customers { get; set; }
+ public Products Products { get; set; }
+ public double PriceNettoHUF { get; set; }
+ public double PriceNettoDEV { get; set; }
+ public double PriceAverageNettoHUF { get; set; }
+ public double PriceAverageNettoDEV { get; set; }
+ public double MarginPercent { get; set; }
+ public CurrencyName CurrencyName { get; set; }
+ public double CurrencyRateValue { get; set; }
+ public DateTime DateValid { get; set; }
+
+ }
+}
diff --git a/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.Designer.cs b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.Designer.cs
new file mode 100644
index 0000000..043ba48
--- /dev/null
+++ b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.Designer.cs
@@ -0,0 +1,56 @@
+namespace Nuvolar.Module.BusinessObjects
+{
+ partial class PriceFixCustomers_VC
+ {
+ ///
+ /// 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 Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.aViewPriceFixCustomers = new DevExpress.ExpressApp.Actions.SimpleAction(this.components);
+ //
+ // aViewPriceFixCustomers
+ //
+ this.aViewPriceFixCustomers.Caption = "aView Price Fix Customers";
+ this.aViewPriceFixCustomers.ConfirmationMessage = null;
+ this.aViewPriceFixCustomers.Id = "aViewPriceFixCustomers";
+ this.aViewPriceFixCustomers.TargetObjectType = typeof(Nuvolar.Module.Customers);
+ this.aViewPriceFixCustomers.TargetViewNesting = DevExpress.ExpressApp.Nesting.Root;
+ this.aViewPriceFixCustomers.TargetViewType = DevExpress.ExpressApp.ViewType.ListView;
+ this.aViewPriceFixCustomers.ToolTip = null;
+ this.aViewPriceFixCustomers.TypeOfView = typeof(DevExpress.ExpressApp.ListView);
+ this.aViewPriceFixCustomers.Execute += new DevExpress.ExpressApp.Actions.SimpleActionExecuteEventHandler(this.aViewPriceFixCustomers_Execute);
+ //
+ // PriceFixCustomers_VC
+ //
+ this.Actions.Add(this.aViewPriceFixCustomers);
+
+ }
+
+ #endregion
+
+ private DevExpress.ExpressApp.Actions.SimpleAction aViewPriceFixCustomers;
+ }
+}
diff --git a/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs
new file mode 100644
index 0000000..f46be31
--- /dev/null
+++ b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DevExpress.Data.Filtering;
+using DevExpress.ExpressApp;
+using DevExpress.ExpressApp.Actions;
+using DevExpress.ExpressApp.Editors;
+using DevExpress.ExpressApp.Layout;
+using DevExpress.ExpressApp.Model.NodeGenerators;
+using DevExpress.ExpressApp.SystemModule;
+using DevExpress.ExpressApp.Templates;
+using DevExpress.ExpressApp.Utils;
+using DevExpress.Persistent.Base;
+using DevExpress.Persistent.Validation;
+using DevExpress.ExpressApp.Xpo;
+using DevExpress.Xpo;
+using Nuvolar.Module.Win;
+
+namespace Nuvolar.Module.BusinessObjects
+{
+ // For more typical usage scenarios, be sure to check out https://documentation.devexpress.com/eXpressAppFramework/clsDevExpressExpressAppViewControllertopic.aspx.
+
+ public partial class PriceFixCustomers_VC : ViewController
+ {
+ private WaitFormClass _WaitFormClass;
+ public PriceFixCustomers_VC()
+ {
+ InitializeComponent();
+ // Target required Views (via the TargetXXX properties) and create their Actions.
+ }
+ protected override void OnActivated()
+ {
+ base.OnActivated();
+ if (View.Id == "PriceFixCustomers_ListView")
+ {
+ _WaitFormClass = new WaitFormClass();
+ Load_PriceFixCustomers_ListView();
+ }
+ // Perform various tasks depending on the target View.
+ }
+ protected override void OnViewControlsCreated()
+ {
+ base.OnViewControlsCreated();
+ // Access and customize the target View control.
+ }
+ protected override void OnDeactivated()
+ {
+ // Unsubscribe from previously subscribed events and release other references and resources.
+ base.OnDeactivated();
+ }
+
+ private void aViewPriceFixCustomers_Execute(object sender, SimpleActionExecuteEventArgs e)
+ {
+ XPObjectSpace _onew = (XPObjectSpace)Application.CreateObjectSpace();
+ CollectionSource _CS = new CollectionSource(_onew, typeof(PriceFixCustomers));
+
+ e.ShowViewParameters.CreatedView = Application.CreateListView("PriceFixCustomers_ListView", _CS, false);
+ e.ShowViewParameters.NewWindowTarget = NewWindowTarget.MdiChild;
+ e.ShowViewParameters.TargetWindow = TargetWindow.NewWindow;
+ }
+ private void Load_PriceFixCustomers_ListView()
+ {
+ XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace;
+ ListView _ListView = View as ListView;
+
+ XPCollection _CurrencyRate_Collection = new XPCollection(_ocur.Session, CriteriaOperator.Parse("IsMNB=True And GetDate(DateValid)=?", DateTime.Now.Date));
+
+
+
+
+ XPCollection _Customers_Collection = new XPCollection(_ocur.Session, CriteriaOperator.Parse("IsNull(Pricing)=False"));
+
+
+ _WaitFormClass.Initwork(1, 1, _Customers_Collection.Count);
+ foreach (Customers _Customers in _Customers_Collection)
+ {
+ _WaitFormClass.DoWork();
+ foreach (PricingFix _PricingFix in _Customers.Pricing.PricingFix)
+ {
+ PriceFixCustomers _PriceFixCustomers = new PriceFixCustomers(_ocur.Session);
+ _PriceFixCustomers.Customers = _Customers;
+ _PriceFixCustomers.CurrencyName = _PricingFix.CurrencyName;
+ _PriceFixCustomers.Products = _PricingFix.Products;
+ if (_PricingFix.CurrencyName.ShortName == "HUF")
+ {
+ _PriceFixCustomers.PriceNettoHUF = _PricingFix.PriceNetto;
+ _PriceFixCustomers.PriceNettoDEV = 0;
+ }
+ else
+ {
+ foreach (CurrencyRate _CurrencyRate in _CurrencyRate_Collection)
+ {
+ if (_CurrencyRate.CurrencyName.ShortName == _PricingFix.CurrencyName.ShortName)
+ {
+ _PriceFixCustomers.PriceNettoHUF = _PricingFix.PriceNetto * _CurrencyRate.RateAverage;
+ _PriceFixCustomers.CurrencyRateValue = _CurrencyRate.RateAverage;
+ }
+ }
+ _PriceFixCustomers.PriceNettoDEV = _PricingFix.PriceNetto;
+ }
+ _PriceFixCustomers.CurrencyName = _PricingFix.CurrencyName;
+
+
+
+ XPCollection _DeliveryNoteInRRFC_Collection = new XPCollection(_ocur.Session, CriteriaOperator.Parse("IsNull(RegistryRowsFinancialControlling)=False And DeliveryNoteInRows.DeliveryNoteInHeader.IsEditable=False And DeliveryNoteInRows.Products=?", _PricingFix.Products));
+
+ _DeliveryNoteInRRFC_Collection.Sorting.Add(new SortProperty("RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution", DevExpress.Xpo.DB.SortingDirection.Descending));
+
+ if (_DeliveryNoteInRRFC_Collection.Count > 0)
+ {
+ _PriceFixCustomers.DateValid = _DeliveryNoteInRRFC_Collection[0].RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution;
+ if (_DeliveryNoteInRRFC_Collection[0].RegistryRowsFinancialControlling.RegistryHeader.F_CurrencyName.ShortName == "HUF")
+ {
+ _PriceFixCustomers.PriceAverageNettoDEV = 0;
+ _PriceFixCustomers.PriceAverageNettoHUF = (_DeliveryNoteInRRFC_Collection[0].DeliveryNoteInRows.SumPriceHUF) / _DeliveryNoteInRRFC_Collection[0].DeliveryNoteInRows.QTT;
+ }
+ else
+ {
+ _PriceFixCustomers.PriceAverageNettoDEV = _DeliveryNoteInRRFC_Collection[0].DeliveryNoteInRows.SumPriceDEV / _DeliveryNoteInRRFC_Collection[0].DeliveryNoteInRows.QTT;
+ _PriceFixCustomers.PriceAverageNettoHUF = (_DeliveryNoteInRRFC_Collection[0].DeliveryNoteInRows.SumPriceDEV * _DeliveryNoteInRRFC_Collection[0].RegistryRowsFinancialControlling.RegistryHeader.F_CurrencyRate) / _DeliveryNoteInRRFC_Collection[0].DeliveryNoteInRows.QTT;
+ }
+ }
+
+ if (_PriceFixCustomers.PriceNettoHUF!=0)
+ {
+ if (_PriceFixCustomers.CurrencyName.ShortName == "HUF")
+ {
+ _PriceFixCustomers.MarginPercent = (_PriceFixCustomers.PriceNettoHUF - _PriceFixCustomers.PriceAverageNettoHUF) / _PriceFixCustomers.PriceNettoHUF * 100;
+ }
+ else {
+ _PriceFixCustomers.MarginPercent = (_PriceFixCustomers.PriceNettoDEV - _PriceFixCustomers.PriceAverageNettoDEV) / _PriceFixCustomers.PriceNettoDEV * 100;
+ }
+ }
+
+
+ _ListView.CollectionSource.Add(_PriceFixCustomers);
+ }
+
+ }
+ _WaitFormClass.FinalWork();
+
+ }
+ }
+}
diff --git a/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.resx b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.resx
new file mode 100644
index 0000000..c0567b0
--- /dev/null
+++ b/Nuvolar.Module.CSharp/BusinessObjects/PriceFixCustomers_VC.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ 17, 17
+
+
+ False
+
+
\ No newline at end of file
diff --git a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs
new file mode 100644
index 0000000..983635a
--- /dev/null
+++ b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs
@@ -0,0 +1,57 @@
+namespace Nuvolar.Module.Controllers
+{
+ partial class StorageOut_VC
+ {
+ ///
+ /// 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 Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.aCreateDeliveryNoteOutfromStorageOut = new DevExpress.ExpressApp.Actions.PopupWindowShowAction(this.components);
+ //
+ // aCreateDeliveryNoteOutfromStorageOut
+ //
+ this.aCreateDeliveryNoteOutfromStorageOut.AcceptButtonCaption = null;
+ this.aCreateDeliveryNoteOutfromStorageOut.CancelButtonCaption = null;
+ this.aCreateDeliveryNoteOutfromStorageOut.Caption = "aCreate Delivery Note Outfrom Storage Out";
+ this.aCreateDeliveryNoteOutfromStorageOut.ConfirmationMessage = null;
+ this.aCreateDeliveryNoteOutfromStorageOut.Id = "aCreateDeliveryNoteOutfromStorageOut";
+ 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);
+ //
+ // StorageOut_VC
+ //
+ this.Actions.Add(this.aCreateDeliveryNoteOutfromStorageOut);
+
+ }
+
+ #endregion
+
+ private DevExpress.ExpressApp.Actions.PopupWindowShowAction aCreateDeliveryNoteOutfromStorageOut;
+ }
+}
diff --git a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs
new file mode 100644
index 0000000..398fe92
--- /dev/null
+++ b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DevExpress.Data.Filtering;
+using DevExpress.ExpressApp;
+using DevExpress.ExpressApp.Actions;
+using DevExpress.ExpressApp.Editors;
+using DevExpress.ExpressApp.Layout;
+using DevExpress.ExpressApp.Model.NodeGenerators;
+using DevExpress.ExpressApp.SystemModule;
+using DevExpress.ExpressApp.Templates;
+using DevExpress.ExpressApp.Utils;
+using DevExpress.Persistent.Base;
+using DevExpress.Persistent.Validation;
+
+namespace Nuvolar.Module.Controllers
+{
+ // For more typical usage scenarios, be sure to check out https://documentation.devexpress.com/eXpressAppFramework/clsDevExpressExpressAppViewControllertopic.aspx.
+ public partial class StorageOut_VC : ViewController
+ {
+ public StorageOut_VC()
+ {
+ InitializeComponent();
+ // Target required Views (via the TargetXXX properties) and create their Actions.
+ }
+ protected override void OnActivated()
+ {
+ base.OnActivated();
+ // Perform various tasks depending on the target View.
+ }
+ protected override void OnViewControlsCreated()
+ {
+ base.OnViewControlsCreated();
+ // Access and customize the target View control.
+ }
+ protected override void OnDeactivated()
+ {
+ // Unsubscribe from previously subscribed events and release other references and resources.
+ base.OnDeactivated();
+ }
+ }
+}
diff --git a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx
new file mode 100644
index 0000000..a3fac4e
--- /dev/null
+++ b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ 17, 17
+
+
+ False
+
+
\ No newline at end of file
diff --git a/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs b/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs
new file mode 100644
index 0000000..91c6fa2
--- /dev/null
+++ b/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs
@@ -0,0 +1,36 @@
+using DevExpress.ExpressApp.Xpo;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nuvolar.Module.Helpers
+{
+ public static class BusinessDocumentHelper
+ {
+
+ #region DeliveryNoteOut
+ ///
+ /// Új kimenő szállítólevél fejlécet készít
+ ///
+ public static DeliveryNoteOutHeader CreateNewDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace)
+ {
+ DeliveryNoteOutHeader _DeliveryNoteOutHeader = _ObjectSpace.CreateObject();
+
+ return _DeliveryNoteOutHeader;
+ }
+
+ public static bool AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader)
+ {
+ return true;
+ }
+ public static bool FinalizeDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader)
+ {
+ return true;
+ }
+ #endregion
+ #region Invoice
+
+ #endregion
+ }
+}
diff --git a/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml
index 4f67088..d0d04c8 100644
--- a/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml
+++ b/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml
@@ -28,6 +28,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml b/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml
index 9ee4d36..79738a1 100644
--- a/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml
+++ b/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml
@@ -2,12 +2,14 @@
+
+
@@ -30,6 +32,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -63,10 +77,10 @@
-
+
-
+
@@ -565,6 +579,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj
index 3351eea..206cbf3 100644
--- a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj
+++ b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj
@@ -220,9 +220,16 @@
+
+
+ Component
+
+
+ PriceFixCustomers_VC.cs
+
Component
@@ -278,6 +285,12 @@
ReportV2_VC.cs
+
+ Component
+
+
+ StorageOut_VC.cs
+
Component
@@ -286,6 +299,7 @@
+
Component
@@ -302,6 +316,9 @@
+
+ PriceFixCustomers_VC.cs
+
AuditTrailVCC.cs
@@ -329,6 +346,9 @@
ReportV2_VC.cs
+
+ StorageOut_VC.cs
+
StoragePDACollectionHeader_VC.cs
@@ -409,6 +429,10 @@
+
+ {98539DCF-BF11-4158-AEC0-4B008A404A0E}
+ Nuvolar.Module.Win
+
{60bf693f-7dea-4cf6-85bd-ea96829d79dd}
Nuvolar.Module
diff --git a/Nuvolar.Module.CSharp/Properties/licenses.licx b/Nuvolar.Module.CSharp/Properties/licenses.licx
index 91398ef..293aa7a 100644
--- a/Nuvolar.Module.CSharp/Properties/licenses.licx
+++ b/Nuvolar.Module.CSharp/Properties/licenses.licx
@@ -1 +1,3 @@
DevExpress.ExpressApp.ViewController, DevExpress.ExpressApp.v16.2, Version=16.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v16.2, Version=16.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
\ No newline at end of file
diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.Designer.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.Designer.vb
index 755ca19..065e3d5 100644
--- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.Designer.vb
+++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.Designer.vb
@@ -21,11 +21,11 @@
'Required by the Component Designer
Private components As System.ComponentModel.IContainer
- 'NOTE: The following procedure is required by the Component Designer
- 'It can be modified using the Component Designer.
- 'Do not modify it using the code editor.
- _
- Private Sub InitializeComponent()
+ 'NOTE: The following procedure is required by the Component Designer
+ 'It can be modified using the Component Designer.
+ 'Do not modify it using the code editor.
+
+ Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.aBackToRowEdit_GLAccounts = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components)
Me.aImportReceivables = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components)
@@ -44,6 +44,7 @@
Me.aGenerateOpenClosePCIRecord = New DevExpress.ExpressApp.Actions.PopupWindowShowAction(Me.components)
Me.aGenerateOpenClosePCIRecord_Storno = New DevExpress.ExpressApp.Actions.PopupWindowShowAction(Me.components)
Me.aRestoreDeletedRecord_GLAccounts = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components)
+ Me.aGetCurrencyRateGLAccounts = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components)
'
'aBackToRowEdit_GLAccounts
'
@@ -227,6 +228,38 @@
Me.aRestoreDeletedRecord_GLAccounts.TargetObjectType = GetType(Nuvolar.[Module].GLAccounts)
Me.aRestoreDeletedRecord_GLAccounts.TargetViewId = "GLAccounts_ListView_Deleted"
Me.aRestoreDeletedRecord_GLAccounts.ToolTip = Nothing
+ '
+ 'aGetCurrencyRateGLAccounts
+ '
+ Me.aGetCurrencyRateGLAccounts.Caption = "aGet Currency Rate GLAccounts"
+ Me.aGetCurrencyRateGLAccounts.Category = "aGetCurrencyRateGLAccounts"
+ Me.aGetCurrencyRateGLAccounts.ConfirmationMessage = Nothing
+ Me.aGetCurrencyRateGLAccounts.Id = "aGetCurrencyRateGLAccounts"
+ Me.aGetCurrencyRateGLAccounts.TargetObjectType = GetType(Nuvolar.[Module].GLAccounts)
+ Me.aGetCurrencyRateGLAccounts.TargetViewType = DevExpress.ExpressApp.ViewType.DetailView
+ Me.aGetCurrencyRateGLAccounts.ToolTip = Nothing
+ Me.aGetCurrencyRateGLAccounts.TypeOfView = GetType(DevExpress.ExpressApp.DetailView)
+ '
+ 'GLAccountsVC
+ '
+ Me.Actions.Add(Me.aBackToRowEdit_GLAccounts)
+ Me.Actions.Add(Me.aImportReceivables)
+ Me.Actions.Add(Me.aGetRegistryNumber_GLAccounts)
+ Me.Actions.Add(Me.aCloneGLAccounts)
+ Me.Actions.Add(Me.aToTable_GLAccounts)
+ Me.Actions.Add(Me.aMakeEditable_GLAccounts)
+ Me.Actions.Add(Me.aFinal_GLAccounts)
+ Me.Actions.Add(Me.aFinalAndNew_GLAccounts)
+ Me.Actions.Add(Me.aToTableD_GLAccounts)
+ Me.Actions.Add(Me.aViewPCIDW_GLAccounts)
+ Me.Actions.Add(Me.aOpenAccountsPdf)
+ Me.Actions.Add(Me.aPCICheckGLAccounts)
+ Me.Actions.Add(Me.aCreateMixedPCI_GLAccount)
+ Me.Actions.Add(Me.aToTable_GLAccounts_Telephone)
+ Me.Actions.Add(Me.aGenerateOpenClosePCIRecord)
+ Me.Actions.Add(Me.aGenerateOpenClosePCIRecord_Storno)
+ Me.Actions.Add(Me.aRestoreDeletedRecord_GLAccounts)
+ Me.Actions.Add(Me.aGetCurrencyRateGLAccounts)
End Sub
Friend WithEvents aToTable_GLAccounts As DevExpress.ExpressApp.Actions.SimpleAction
@@ -246,5 +279,5 @@
Friend WithEvents aGenerateOpenClosePCIRecord As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aGenerateOpenClosePCIRecord_Storno As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aRestoreDeletedRecord_GLAccounts As DevExpress.ExpressApp.Actions.SimpleAction
-
+ Friend WithEvents aGetCurrencyRateGLAccounts As DevExpress.ExpressApp.Actions.SimpleAction
End Class
diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.resx b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.resx
index fee27a3..be7d1b6 100644
--- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.resx
+++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.resx
@@ -118,55 +118,58 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 17, 173
+ 17, 251
- 17, 290
+ 17, 680
17, 641
- 17, 602
+ 17, 329
- 17, 329
+ 17, 602
17, 563
- 17, 485
-
-
17, 524
-
- 17, 446
-
-
- 17, 407
-
-
+
17, 368
+
+ 17, 485
+
+
+ 17, 446
+
+
+ 17, 407
+
- 17, 56
+ 17, 212
- 17, 251
+ 17, 290
- 17, 134
+ 17, 173
17, 95
- 17, 212
+ 17, 134
- 190, 56
+ 17, 56
+
+
+ 742, 134
False
diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb
index c15cdb9..b832a6e 100644
--- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb
+++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb
@@ -25,7 +25,7 @@ Public Class GLAccountsVC
Protected selection As ArrayList
Public Event InitWork(ByVal _Minimum As Long, ByVal _Step As Long, ByVal _Maximum As Long)
Public Event DoWork()
- Public Event FinalWork
+ Public Event FinalWork()
Public Sub New()
MyBase.New()
selection = New ArrayList()
@@ -226,12 +226,12 @@ Public Class GLAccountsVC
_GLRows.CreditAmountHUF = _NettoHUF
_GLRows.CreditAmountDEV = _NettoDEV
End If
- _GLRows.AddGLRows(_GLHeader, _GLHeader.row_DebitChartOfAccounts, _GLHeader.row_CreditChartOfAccounts, _
- _NettoDEV, _NettoHUF, _GLHeader.row_LiquidAssets, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _GLHeader.row_VAT, _
- _GLHeader.row_NoteRows, _GLHeader.row_UniqueObjects, _
- _GLHeader.row_Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _GLHeader.row_DebitChartOfAccounts, _GLHeader.row_CreditChartOfAccounts,
+ _NettoDEV, _NettoHUF, _GLHeader.row_LiquidAssets,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _GLHeader.row_VAT,
+ _GLHeader.row_NoteRows, _GLHeader.row_UniqueObjects,
+ _GLHeader.row_Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
'-- Létrehoz egy sort az ÁFÁ-ra ---------------------------------------------------------------------------------------------------
If _GLAccounts.row_VAT IsNot Nothing Then
@@ -261,11 +261,11 @@ Public Class GLAccountsVC
_GLRows.CreditAmountDEV = _VATDEV
End If
- _GLRows.AddGLRows(_GLHeader, _GLHeader.row_DebitChartOfAccounts, _GLHeader.row_CreditChartOfAccounts, _
- _VATDEV, _VATHUF, _GLHeader.row_LiquidAssets, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _GLHeader.row_VAT, _GLHeader.row_NoteRows, _
- _GLHeader.row_UniqueObjects, _GLHeader.row_Controlling, _GLHeader.row_JobNumberObjects, _
- _GLHeader.row_CostPlace, _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, _
+ _GLRows.AddGLRows(_GLHeader, _GLHeader.row_DebitChartOfAccounts, _GLHeader.row_CreditChartOfAccounts,
+ _VATDEV, _VATHUF, _GLHeader.row_LiquidAssets,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _GLHeader.row_VAT, _GLHeader.row_NoteRows,
+ _GLHeader.row_UniqueObjects, _GLHeader.row_Controlling, _GLHeader.row_JobNumberObjects,
+ _GLHeader.row_CostPlace, _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo,
eGLRowsTypeVAT.eVATRow, _GUID, eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
End If
_ocur.CommitChanges()
@@ -481,7 +481,7 @@ Public Class GLAccountsVC
Dim _GLAccounts As GLAccounts
For Each _InvoiceHeader In View.SelectedObjects
- _GLRows = _ocur.FindObject(Of GLRows)(CriteriaOperator.Parse("GLHeader.CustomersFrom=? and Customers=? and GLHeader.DocumentNumber=? and PartnerType=0", _
+ _GLRows = _ocur.FindObject(Of GLRows)(CriteriaOperator.Parse("GLHeader.CustomersFrom=? and Customers=? and GLHeader.DocumentNumber=? and PartnerType=0",
_InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, _InvoiceHeader.DocumentNumber), True)
If _GLRows Is Nothing Then
_GLAccounts = _ocur.CreateObject(Of GLAccounts)()
@@ -492,15 +492,15 @@ Public Class GLAccountsVC
'-- Nettó sorok könyvleése LINQ-kel !!!
Dim invoices = New XPQuery(Of InvoiceRows)(_ocur.Session)
- Dim query = From invoice In invoices Where invoice.InvoiceHeader.Oid = _InvoiceHeader.Oid _
- Group invoice By invoice.Controlling, invoice.CostHolder, invoice.UniqueObjects, _
- invoice.JobNumberObjects, invoice.Controlling.ChartOfAccounts Into g = Group _
- Select New With {Key .Controlling = Controlling,
- Key .CostHolder = CostHolder,
- Key .UniqueObjects = UniqueObjects,
- Key .JobNumberObjects = JobNumberObjects,
- Key .AmountNettoHUF = g.Sum(Function(inv) (inv.ListPriceHUF - inv.DiscountPriceHUF) * inv.QTT), _
- Key .AmountNettoDEV = g.Sum(Function(inv) (inv.ListPriceDEV - inv.DiscountPriceDEV) * inv.QTT)}
+ Dim query = From invoice In invoices Where invoice.InvoiceHeader.Oid = _InvoiceHeader.Oid
+ Group invoice By invoice.Controlling, invoice.CostHolder, invoice.UniqueObjects,
+ invoice.JobNumberObjects, invoice.Controlling.ChartOfAccounts Into g = Group
+ Select New With {Key .Controlling = Controlling,
+ Key .CostHolder = CostHolder,
+ Key .UniqueObjects = UniqueObjects,
+ Key .JobNumberObjects = JobNumberObjects,
+ Key .AmountNettoHUF = g.Sum(Function(inv) (inv.ListPriceHUF - inv.DiscountPriceHUF) * inv.QTT),
+ Key .AmountNettoDEV = g.Sum(Function(inv) (inv.ListPriceDEV - inv.DiscountPriceDEV) * inv.QTT)}
For Each item In query
Next
@@ -560,8 +560,8 @@ Public Class GLAccountsVC
Dim _GLAccounts As GLAccounts = TryCast(View.SelectedObjects(0), GLAccounts)
If _GLAccounts IsNot Nothing Then
- ViewPDCI.ViewPDCIDetail(_onew, Application, e, _GLAccounts.CustomersFrom, _
- _GLAccounts.Customers, _GLAccounts.PartnerType, _
+ ViewPDCI.ViewPDCIDetail(_onew, Application, e, _GLAccounts.CustomersFrom,
+ _GLAccounts.Customers, _GLAccounts.PartnerType,
_GLAccounts.DocumentNumber)
End If
End Sub
@@ -636,7 +636,7 @@ Public Class GLAccountsVC
GLFunctions.ReconfigurePCI(_uow, _GLAccounts.CustomersFrom, _GLAccounts.Customers, _GLAccounts.PartnerType, _GLAccounts.ConnectInfo)
End If
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
Frame.GetController(Of RefreshController).RefreshAction.DoExecute()
End Sub
@@ -736,8 +736,8 @@ Public Class GLAccountsVC
For Each _GLAccounts In View.SelectedObjects
RaiseEvent DoWork()
_GLAccounts = _onew.GetObjectByKey(Of GLAccounts)(_GLAccounts.Oid)
- If _GLAccounts.PartnerType = ePartnerType.eReceivables And _
- _GLAccounts.PaymentOption.PayMode = ePayMode.InCash And _
+ If _GLAccounts.PartnerType = ePartnerType.eReceivables And
+ _GLAccounts.PaymentOption.PayMode = ePayMode.InCash And
_GLAccountMixedPCI.ChartOfAccounts.Children.Count = 0 Then
_PCIGroup = _onew.FindObject(Of PCIGroup)(CriteriaOperator.Parse("PartnerType=? and CustomersFrom=? and Customers=? and ConnectInfo=?", _GLAccounts.PartnerType, _GLAccounts.CustomersFrom, _GLAccounts.Customers, _GLAccounts.ConnectInfo))
@@ -761,10 +761,10 @@ Public Class GLAccountsVC
_GLMixedRows.InAmountHUF = _GLAccounts.AmountHUFBrutto
_GLMixedRows.InAmountDEV = _GLAccounts.AmountDEVBrutto
_GUID = Guid.NewGuid
- _GLMixedRows.AddGLRows(_GLHeader, _onew.GetObject(_GLAccountMixedPCI.ChartOfAccounts), _GLRows.DebitChartOfAccounts, _
- _GLAccounts.AmountDEVBrutto, _GLAccounts.AmountHUFBrutto, Nothing, _
- _GLAccounts.Customers, _GLAccounts.DateExecution, Nothing, _
- "", Nothing, Nothing, Nothing, Nothing, Nothing, _
+ _GLMixedRows.AddGLRows(_GLHeader, _onew.GetObject(_GLAccountMixedPCI.ChartOfAccounts), _GLRows.DebitChartOfAccounts,
+ _GLAccounts.AmountDEVBrutto, _GLAccounts.AmountHUFBrutto, Nothing,
+ _GLAccounts.Customers, _GLAccounts.DateExecution, Nothing,
+ "", Nothing, Nothing, Nothing, Nothing, Nothing,
_GLAccounts.ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, eTransactionType.ePartnerCredit, eCashType.eNormal, ePartnerType.eReceivables)
_onew.CommitChanges()
@@ -779,7 +779,7 @@ Public Class GLAccountsVC
End If
Next
_onew.CommitChanges()
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End Sub
Private Sub aToTable_GLAccounts_Telephone_CustomizePopupWindowParams(sender As Object, e As CustomizePopupWindowParamsEventArgs) Handles aToTable_GLAccounts_Telephone.CustomizePopupWindowParams
@@ -845,7 +845,7 @@ Public Class GLAccountsVC
If _ListView IsNot Nothing Then
Frame.GetController(Of Validation.PersistenceValidationController).Active.SetItemValue("", False)
-
+
For Each _RegistryTelephone In _ListView.CollectionSource.List
''//Először az ÁFÁ-s tételek rögzítése
If _RegistryTelephone.Amount_Brutto_INTERNET > 0 Then
@@ -861,20 +861,20 @@ Public Class GLAccountsVC
_Controlling = _ocur.GetObject(_RegistryTelephone.RegistryTelephoneParameters.Controlling_INTERNET)
_DebitChartOfAccounts = _Controlling.GetChartOfAccounts(_GLAccounts.DateExecution.Year, False)
'// Nettó sor
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, _UniqueObjects, _
- _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, _UniqueObjects,
+ _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
'//ÁFA sor
_DebitChartOfAccounts = _VAT.GetChartOfAccounts(_GLAccounts.row_DateVAT.Year, eVATMode.eIn)
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, Nothing, _
- Nothing, Nothing, Nothing, _
- Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, Nothing,
+ Nothing, Nothing, Nothing,
+ Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
End If
If _RegistryTelephone.Amount_Brutto_OTHER_DEFAULTVAT > 0 Then
@@ -890,20 +890,20 @@ Public Class GLAccountsVC
_Controlling = _ocur.GetObject(_RegistryTelephone.RegistryTelephoneParameters.Controlling_OTHER_DEFAULTVAT)
_DebitChartOfAccounts = _Controlling.GetChartOfAccounts(_GLAccounts.DateExecution.Year, False)
'// Nettó sor
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, _UniqueObjects, _
- _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, _UniqueObjects,
+ _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
'//ÁFA sor
_DebitChartOfAccounts = _VAT.GetChartOfAccounts(_GLAccounts.row_DateVAT.Year, eVATMode.eIn)
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, Nothing, _
- Nothing, Nothing, Nothing, _
- Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, Nothing,
+ Nothing, Nothing, Nothing,
+ Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
End If
If _RegistryTelephone.Amount_Brutto_OTHER_NOVAT > 0 Then
@@ -919,20 +919,20 @@ Public Class GLAccountsVC
_Controlling = _ocur.GetObject(_RegistryTelephone.RegistryTelephoneParameters.Controlling_OTHER_NOVAT)
_DebitChartOfAccounts = _Controlling.GetChartOfAccounts(_GLAccounts.DateExecution.Year, False)
'// Nettó sor
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, _UniqueObjects, _
- _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, _UniqueObjects,
+ _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
'//ÁFA sor
_DebitChartOfAccounts = _VAT.GetChartOfAccounts(_GLAccounts.row_DateVAT.Year, eVATMode.eIn)
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, Nothing, _
- Nothing, Nothing, Nothing, _
- Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, Nothing,
+ Nothing, Nothing, Nothing,
+ Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
End If
If _RegistryTelephone.Amount_Brutto_PARKING > 0 Then
@@ -948,20 +948,20 @@ Public Class GLAccountsVC
_Controlling = _ocur.GetObject(_RegistryTelephone.RegistryTelephoneParameters.Controlling_PARKING)
_DebitChartOfAccounts = _Controlling.GetChartOfAccounts(_GLAccounts.DateExecution.Year, False)
'// Nettó sor
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, _UniqueObjects, _
- _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, _UniqueObjects,
+ _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
'//ÁFA sor
_DebitChartOfAccounts = _VAT.GetChartOfAccounts(_GLAccounts.row_DateVAT.Year, eVATMode.eIn)
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, Nothing, _
- Nothing, Nothing, Nothing, _
- Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, Nothing,
+ Nothing, Nothing, Nothing,
+ Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
End If
If _RegistryTelephone.Amount_Brutto_TELEPHON > 0 Then
@@ -975,11 +975,11 @@ Public Class GLAccountsVC
_UniqueObjects = _ocur.GetObject(_RegistryTelephone.UniqueObjects)
_DebitChartOfAccounts = _VAT.GetChartOfAccounts(_GLAccounts.row_DateVAT.Year, eVATMode.eIn)
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, Nothing, _
- Nothing, Nothing, Nothing, _
- Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _VATHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, Nothing,
+ Nothing, Nothing, Nothing,
+ Nothing, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eVATRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
_GLRows = _ocur.CreateObject(Of GLRows)()
@@ -990,11 +990,11 @@ Public Class GLAccountsVC
_Controlling = _ocur.GetObject(_RegistryTelephone.RegistryTelephoneParameters.Controlling_TELEPHON_80)
_DebitChartOfAccounts = _Controlling.GetChartOfAccounts(_GLAccounts.DateExecution.Year, False)
'// Nettó sor
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, _UniqueObjects, _
- _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, _UniqueObjects,
+ _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
_GLRows = _ocur.CreateObject(Of GLRows)()
@@ -1005,11 +1005,11 @@ Public Class GLAccountsVC
_Controlling = _ocur.GetObject(_RegistryTelephone.RegistryTelephoneParameters.Controlling_TELEPHON_20)
_DebitChartOfAccounts = _Controlling.GetChartOfAccounts(_GLAccounts.DateExecution.Year, False)
'// Nettó sor
- _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing, _
- _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT, _
- _GLHeader.row_NoteRows, _UniqueObjects, _
- _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace, _
- _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID, _
+ _GLRows.AddGLRows(_GLHeader, _DebitChartOfAccounts, _CreditChartOfAccounts, 0, _NettoHUF, Nothing,
+ _GLAccounts.Customers, _GLHeader.row_DateVAT, _VAT,
+ _GLHeader.row_NoteRows, _UniqueObjects,
+ _Controlling, _GLHeader.row_JobNumberObjects, _GLHeader.row_CostPlace,
+ _GLHeader.row_CostHolder, _GLHeader.row_ConnectInfo, eGLRowsTypeVAT.eNettoRow, _GUID,
eTransactionType.eNotSet, eCashType.ePartner, _GLAccounts.PartnerType)
End If
Next
@@ -1040,7 +1040,7 @@ Public Class GLAccountsVC
RaiseEvent DoWork()
MakeOpenClosePCI(_uow, _GLAccounts.CustomersFrom, _GLAccounts.Customers, _GLAccounts.PartnerType, _GLAccounts.ConnectInfo, _GLAccountsOpenClosePCIPopup.YearClose, _GLAccountsOpenClosePCIPopup.GLRowsTypeSelect)
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End Sub
Public Sub MakeOpenClosePCI(_uow As UnitOfWork, _CustomersFrom As CustomersFrom, _Customers As Customers, _PartnerType As ePartnerType, _ConnectInfo As String, _YearClose As Long, _GLRowsTypeSelect As eGLRowsTypeSelect)
@@ -1249,7 +1249,7 @@ Public Class GLAccountsVC
RaiseEvent DoWork()
RemoveOpenClosePCI(_uow, _GLAccounts.CustomersFrom, _GLAccounts.Customers, _GLAccounts.PartnerType, _GLAccounts.ConnectInfo, _GLAccountsOpenClosePCIPopup.YearClose)
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End Sub
Private Sub aRestoreDeletedRecord_GLAccounts_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aRestoreDeletedRecord_GLAccounts.Execute
@@ -1263,6 +1263,28 @@ Public Class GLAccountsVC
_GLAccounts.SetMemberValue("GCRecord", Nothing)
Next
_ocur.CommitChanges()
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
+ End Sub
+
+ Private Sub aGetCurrencyRateGLAccounts_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aGetCurrencyRateGLAccounts.Execute
+ Dim _ocur As Xpo.XPObjectSpace = TryCast(View.ObjectSpace, Xpo.XPObjectSpace)
+ Dim _GLAccounts As GLAccounts = TryCast(View.SelectedObjects(0), GLAccounts)
+ Dim _LiquidAssets As LiquidAssets = _ocur.CreateObject(Of LiquidAssets)
+
+ If _GLAccounts IsNot Nothing Then
+ Dim _CurrencyRate_MNB_Collection = New XPCollection(Of CurrencyRate)(_ocur.Session,
+ CriteriaOperator.Parse("CurrencyName=? and IsMNB=True and GetDate(DateValid)<=?",
+ _GLAccounts.CurrencyName, _GLAccounts.DateExecution))
+ _CurrencyRate_MNB_Collection.Sorting.Add(New SortProperty("DateValid", DB.SortingDirection.Descending))
+ If _CurrencyRate_MNB_Collection.Count > 0 Then
+ For Each _CurrencyRate_MNB In _CurrencyRate_MNB_Collection
+ If _CurrencyRate_MNB.DateValid.Date = _GLAccounts.DateExecution.Date Then
+ _GLAccounts.CurrencyRate = _CurrencyRate_MNB.RateAverage
+ Exit For
+ End If
+ Exit For
+ Next
+ End If
+ End If
End Sub
End Class
diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/CurrencyRateVC.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/CurrencyRateVC.vb
index 72d3950..6b84a26 100644
--- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/CurrencyRateVC.vb
+++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/CurrencyRateVC.vb
@@ -38,7 +38,7 @@ Public Class CurrencyRateVC
Dim _CurrencyRate_Collection As XPCollection(Of CurrencyRate) = New XPCollection(Of CurrencyRate)(_uow, CriteriaOperator.Parse("Active=True"))
Dim _CurrencyRate As CurrencyRate
- Dim _BeginDate As Date = "2011-01-01"
+ Dim _BeginDate As Date = "2006-01-01"
Dim _StartDate As Date
Dim _EndDate As Date = String.Format("{0}-{1}-{2}", Now.Year, Now.Month, Now.Day)
diff --git a/Nuvolar.Win.Lite/WinApplication_DB.vb b/Nuvolar.Win.Lite/WinApplication_DB.vb
index ad482a7..5f3f454 100644
--- a/Nuvolar.Win.Lite/WinApplication_DB.vb
+++ b/Nuvolar.Win.Lite/WinApplication_DB.vb
@@ -71,7 +71,7 @@ Partial Public Class NuvolarWindowsFormsApplication
_connectionString = DevExpress.Xpo.DB.MySqlConnectionProvider.GetConnectionString(_ChangeLogon.SQLServer, "bf614abf4c83ef", "edbc0ac0", "trevor")
Case "84.1.95.74"
_connectionString = DevExpress.Xpo.DB.MySqlConnectionProvider.GetConnectionString(_ChangeLogon.SQLServer, "root", "malomko10", _ChangeLogon.DBConnection)
- Case "192.168.100.182"
+ Case "192.168.100.182", "localhost"
_connectionString = DevExpress.Xpo.DB.MySqlConnectionProvider.GetConnectionString(_ChangeLogon.SQLServer, "root", "M1cr0s0ft!12345", _ChangeLogon.DBConnection)
Case "81.183.209.96"
_connectionString = DevExpress.Xpo.DB.MySqlConnectionProvider.GetConnectionString(_ChangeLogon.SQLServer, "root", "M1cr0s0ft!", _ChangeLogon.DBConnection)