ivanszabo/Nuvolar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HA bemutatóra előkészítés

Browse Source
This commit is contained in:
ivanszabo
2018-04-22 22:20:16 +02:00
parent 5b333614ae
commit 714241c3a0
30 changed files with 418 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.Designer.vb
Generated
+1 -2
View File
@@ -531,7 +531,6 @@ Partial Class OrderInVC
Friend WithEvents aOrderIn_ChangeRows As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aOrderInOther_ChangeRows As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aOrderInStorageOutDeliveryNoteOut As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aOrderInStorageOutDeliveryNoteOutInvoice As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aORI_Storno_Invoice As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aORI_Storno_DeliveryNoteOut As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aORI_Storno_StorageOut As DevExpress.ExpressApp.Actions.SimpleAction
@@ -551,5 +550,5 @@ Partial Class OrderInVC
Friend WithEvents aGenerateInvoiceFromOrderInFinal As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aORI_RegenerateValues As DevExpress.ExpressApp.Actions.PopupWindowShowAction
Friend WithEvents aORI_RecalculateTotalBrutto As DevExpress.ExpressApp.Actions.SimpleAction
Public WithEvents aOrderInStorageOutDeliveryNoteOutInvoice As DevExpress.ExpressApp.Actions.PopupWindowShowAction
End Class
Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.resx
+32 -32
View File
@@ -118,100 +118,100 @@
<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>17, 212</value>
<value>620, 212</value>
</metadata>
<metadata name="aStornoOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1313, 173</value>
<value>760, 212</value>
</metadata>
<metadata name="aToTable_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1165, 173</value>
<value>251, 251</value>
</metadata>
<metadata name="aToTableD_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1038, 17</value>
<value>410, 56</value>
</metadata>
<metadata name="aUp_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1044, 173</value>
<value>776, 251</value>
</metadata>
<metadata name="aDown_OrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>907, 173</value>
<value>639, 251</value>
</metadata>
<metadata name="aGenerateStorageOutFromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>667, 173</value>
<value>399, 251</value>
</metadata>
<metadata name="aGenerateInvoicefromOrderIn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>206, 56</value>
<value>788, 173</value>
</metadata>
<metadata name="aReCalculatePricing_OrderInRows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>433, 173</value>
<value>17, 251</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>
<value>896, 212</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>
<value>578, 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>
<value>355, 212</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>
<value>151, 212</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>
<value>17, 212</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>
<value>1002, 173</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>
<value>179, 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>818, 134</value>
<value>601, 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>612, 134</value>
<value>395, 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>17, 134</value>
<value>723, 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>
<value>17, 173</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>
<value>890, 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>
<value>516, 134</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>
<value>286, 134</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>
<value>17, 134</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>
<value>839, 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>
<value>399, 95</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>
<value>224, 95</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>
<value>17, 95</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>
<value>860, 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>
<value>567, 56</value>
</metadata>
<metadata name="aOrderIn_RecalculateDEV.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
<value>221, 56</value>
</metadata>
<metadata name="aOrderInInvoiceAdvanceAsk.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1195, 17</value>
<value>17, 56</value>
</metadata>
<metadata name="aOrderInInvoiceAdvance.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>853, 17</value>
Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.vb
+12 -9
View File
@@ -1928,7 +1928,7 @@ CheckError:
#End Region
#Region "Transactions"
'// Invoice customization
Private Sub InvoiceCustomization(sender As Object, e As CustomizePopupWindowParamsEventArgs) _
Public Overridable Sub InvoiceCustomization(sender As Object, e As CustomizePopupWindowParamsEventArgs) _
Handles aORI_Create_DeliveryInvoice.CustomizePopupWindowParams,
aOrderInStorageOutDeliveryNoteOutInvoice.CustomizePopupWindowParams,
aORI_Create_Invoice.CustomizePopupWindowParams,
@@ -2370,7 +2370,7 @@ CheckError:
End Try
End Sub
Private Sub aOrderInStorageOutDeliveryNoteOutInvoice_Execute(sender As Object, e As PopupWindowShowActionExecuteEventArgs) Handles aOrderInStorageOutDeliveryNoteOutInvoice.Execute
Public Overridable Sub aOrderInStorageOutDeliveryNoteOutInvoice_Execute(sender As Object, e As PopupWindowShowActionExecuteEventArgs) Handles aOrderInStorageOutDeliveryNoteOutInvoice.Execute
'// Kitárolás + kiszállítás + számla egyben
Dim _onew As Xpo.XPObjectSpace = Application.CreateObjectSpace
Dim _uow_lock As New UnitOfWork(_onew.Session.DataLayer)
@@ -2791,19 +2791,22 @@ CheckError:
_onew.CommitChanges()
_InvoiceHeader.RecalculateInvoice(_InvoiceHeader, _onew)
_onew.CommitChanges()
Frame.GetController(Of RefreshController).RefreshAction.DoExecute()
If _ORI_Invoice_Popup.IsLiquidAssets AndAlso _ORI_Invoice_Popup.PaymentOption.PayMode = ePayMode.InCash And _ORI_Invoice_Popup.IsFinalInvoice Then
CreateGLCassa(_InvoiceHeader, _onew, _ORI_Invoice_Popup)
End If
'--==Nyomtatványok==--
'____________________________________________________________________________________________________________________
Dim _XAFPrintHelper_D As New XAFPrintHelper(_onew, Frame, _DeliveryNoteOutHeader.DeliveryNoteOutType.ReportDataV2, CriteriaOperator.Parse("DeliveryNoteOutHeader.Oid = ?", _DeliveryNoteOutHeader.Oid))
_XAFPrintHelper_D.ShowPreviewV2()
Application.ShowViewStrategy.ShowMessage("Sikeres tranzakció !", InformationType.Success, 3000, InformationPosition.Bottom)
Dim _XAFPrintHelper_I As New XAFPrintHelper(_onew, Frame, _InvoiceHeader.InvoiceType.ReportDataV2, CriteriaOperator.Parse("InvoiceHeader.Oid = ?", _InvoiceHeader.Oid))
_XAFPrintHelper_I.ShowPreviewV2()
Frame.GetController(Of RefreshController).RefreshAction.DoExecute()
'--==Nyomtatványok==--
''____________________________________________________________________________________________________________________
'Dim _XAFPrintHelper_D As New XAFPrintHelper(_onew, Frame, _DeliveryNoteOutHeader.DeliveryNoteOutType.ReportDataV2, CriteriaOperator.Parse("DeliveryNoteOutHeader.Oid = ?", _DeliveryNoteOutHeader.Oid))
'_XAFPrintHelper_D.ShowPreviewV2()
'Dim _XAFPrintHelper_I As New XAFPrintHelper(_onew, Frame, _InvoiceHeader.InvoiceType.ReportDataV2, CriteriaOperator.Parse("InvoiceHeader.Oid = ?", _InvoiceHeader.Oid))
'_XAFPrintHelper_I.ShowPreviewV2()
End If
Nuvolar.Module/Images/Images.Logo.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.0 KiB

Nuvolar.Module/Images/Images.momo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

Nuvolar.Module/Nuvolar.Module.vbproj
+1 -1
View File
@@ -2817,6 +2817,7 @@
<EmbeddedResource Include="Images\Images.word_icon_32x32.png" />
<EmbeddedResource Include="Images\Images.barcode.png" />
<EmbeddedResource Include="Images\Images.barcode_32x32.png" />
<EmbeddedResource Include="Images\Images.momo.png" />
<Content Include="Images\iOK.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -5287,7 +5288,6 @@
<EmbeddedResource Include="Images\Images.edit_32x32.png" />
<EmbeddedResource Include="Images\Images.key1_preferences.png" />
<EmbeddedResource Include="Images\Images.key1_preferences_32x32.png" />
<EmbeddedResource Include="Images\Images.Logo.png" />
<EmbeddedResource Include="Images\Images.excel.png" />
<EmbeddedResource Include="Images\Images.excel_32x32.png" />
<EmbeddedResource Include="Images\Images.step_add.png" />