Néhány fordítás + WIN-WEB keveredés ...

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