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

Egyéb javítások

Browse Source
This commit is contained in:
ivanszabo
2018-03-28 17:35:45 +02:00
parent 1282db15ca
commit 0ac6bd19e7
8 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRows.vb
+1
View File
@@ -433,6 +433,7 @@ Public Class OrderInRows
End Get
End Property
'// Termeltetési szerződés miatt
<DataSourceCriteria("APCSheetHeader.Customers='@This.OrderInHeader.Customers' and APCSheetHeader.CustomersFrom='@This.OrderInHeader.CustomersFrom' and APCSheetHeader.IsActive = True")>
Property APCSheetByProducts As APCSheetByProducts
Get
Return _APCSheetByProducts
Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb
+1
View File
@@ -380,6 +380,7 @@ Public Class OrderInRowsOther 'Egyéb sorok
End Property
'// Termeltetési szerződés miatt
<DataSourceCriteria("APCSheetHeader.Customers='@This.OrderInHeader.Customers' and APCSheetHeader.CustomersFrom='@This.OrderInHeader.CustomersFrom' and APCSheetHeader.IsActive = True")>
Property APCSheetByProducts As APCSheetByProducts
Get
Return _APCSheetByProducts
Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb
+16 -3
View File
@@ -84,7 +84,12 @@ Public Class StorageDateVC
_StorageDateClearingPrice = New StorageDateClearingPrice(_uow)
_StorageDateClearingPrice.RowIndex = 1
_StorageDateClearingPrice.CustomersFrom = _InvoiceRows.InvoiceHeader.CustomersFrom
_StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
If _InvoiceRows.DeliveryNoteOutRows IsNot Nothing Then
_StorageDateClearingPrice.DateExecution = _InvoiceRows.DeliveryNoteOutRows.DeliveryNoteOutHeader.DateExecution
Else
_StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
End If
_StorageDateClearingPrice.InvoiceRows = _InvoiceRows
_StorageDateClearingPrice.Products = _InvoiceRows.OrderInRows.Products
_StorageDateClearingPrice.QTT_Out = _InvoiceRows.QTT
@@ -213,7 +218,11 @@ Public Class StorageDateVC
_StorageDateClearingPrice = New StorageDateClearingPrice(_uow)
_StorageDateClearingPrice.RowIndex = 1
_StorageDateClearingPrice.CustomersFrom = _InvoiceRows.InvoiceHeader.CustomersFrom
_StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
If _InvoiceRows.DeliveryNoteOutRows IsNot Nothing Then
_StorageDateClearingPrice.DateExecution = _InvoiceRows.DeliveryNoteOutRows.DeliveryNoteOutHeader.DateExecution
Else
_StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
End If
_StorageDateClearingPrice.InvoiceRows = _InvoiceRows
_StorageDateClearingPrice.Products = _InvoiceRows.OrderInRows.Products
_StorageDateClearingPrice.QTT_Out = _InvoiceRows.QTT
@@ -644,7 +653,11 @@ Public Class StorageDateVC
_StorageDateClearingPrice = New StorageDateClearingPrice(_uow)
_StorageDateClearingPrice.RowIndex = 1
_StorageDateClearingPrice.CustomersFrom = _InvoiceRows.InvoiceHeader.CustomersFrom
_StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
If _InvoiceRows.DeliveryNoteOutRows IsNot Nothing Then
_StorageDateClearingPrice.DateExecution = _InvoiceRows.DeliveryNoteOutRows.DeliveryNoteOutHeader.DateExecution
Else
_StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
End If
_StorageDateClearingPrice.InvoiceRows = _InvoiceRows
_StorageDateClearingPrice.Products = _InvoiceRows.OrderInRows.Products
_StorageDateClearingPrice.QTT_Out = _InvoiceRows.QTT
Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb
+3 -3
View File
@@ -437,13 +437,13 @@ Public Class RegistryHeader '-- iktatórendszer
<RuleRequiredField("RegistryHeader.DocumentFile_If_Financial_Registry", "RegistryNextStep_Context", TargetCriteria:="DeliveryType<>'ePhone'")>
<Aggregated(), ExpandObjectMembers(ExpandObjectMembers.Never)>
<Aggregated(), ExpandObjectMembers(ExpandObjectMembers.Never), Delayed(True)>
Property DocumentFile() As FileData
Get
Return _DocumentFile
Return GetDelayedPropertyValue(Of FileData)("DocumentFile")
End Get
Set(ByVal value As FileData)
SetPropertyValue("DocumentFile", _DocumentFile, value)
SetDelayedPropertyValue(Of FileData)("DocumentFile", value)
End Set
End Property
Property IsEditable As Boolean
Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
+2 -2
View File
@@ -5615,9 +5615,9 @@
<Member Name="PCIDetail" Caption="Nyitott p.ü. teljesítések" />
<Member Name="PermissionAllowed" Caption="Engedélyezett" />
<Member Name="QualityOption" Caption="Minőségi opció" />
<Member Name="row_APCSheetByProducts" Caption="Term. szerződés*" />
<Member Name="row_APCSheetByProducts" Caption="Term. szerződés (t)*" />
<Member Name="row_DiscountPercent" Caption="Kedv.%*" />
<Member Name="row_o_APCSheetByProducts" Caption="Term. szerződés*" />
<Member Name="row_o_APCSheetByProducts" Caption="Term. szerződés (e)*" />
<Member Name="row_o_CustomsTariffs" Caption="VTSZ./ SZJ.*" />
<Member Name="row_o_Description" Caption="Leírás*" />
<Member Name="row_o_DiscountPercent" Caption="Kedv. %*" />
Nuvolar.Module/Model.DesignedDiffs.xafml
+1 -1
View File
@@ -19463,8 +19463,8 @@
<LayoutGroup Id="Main" RelativeSize="100" ImageName="">
<LayoutGroup Id="SimpleEditors" RelativeSize="11" ImageName="">
<LayoutGroup Id="JobNumberObjects" RelativeSize="100" ImageName="">
<LayoutItem Id="ParentObject" SizeConstraintsType="Default" RelativeSize="51" ViewItem="ParentObject" />
<LayoutItem Id="Name" ViewItem="Name" SizeConstraintsType="Default" Index="1" RelativeSize="48" IsNewNode="True" />
<LayoutItem Id="ParentObject" SizeConstraintsType="Default" RelativeSize="51" ViewItem="ParentObject" />
</LayoutGroup>
<LayoutGroup Id="HCategory" RelativeSize="8" ImageName="" Direction="Horizontal" Removed="True">
<LayoutItem Id="Name" ViewItem="Name" Removed="True" />