Skip to content

Commit 4ce8184

Browse files
TrudAXTrudAX
committed
Import PO from PDF, compile error fixes
1 parent 6630d2f commit 4ce8184

8 files changed

Lines changed: 48 additions & 28 deletions

‎DEVTutorial/DEVExternalIntegration/AxForm/DEVIntegMessageTypeTableOutbound.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,6 @@ public class DEVIntegMessageTypeTableOutbound extends FormRun
392392
<AxFormDataSourceField>
393393
<DataField>IsFullExport</DataField>
394394
</AxFormDataSourceField>
395-
<AxFormDataSourceField>
396-
<DataField>IsIncludeHeader</DataField>
397-
<Visible>No</Visible>
398-
</AxFormDataSourceField>
399395
<AxFormDataSourceField>
400396
<DataField>IsSendEmail</DataField>
401397
</AxFormDataSourceField>
@@ -962,15 +958,6 @@ public class DEVIntegMessageTypeTableOutbound extends FormRun
962958
<DataField>IsSkipEmptyMessages</DataField>
963959
<DataSource>DEVIntegMessageTypeTableOutbound</DataSource>
964960
</AxFormControl>
965-
<AxFormControl xmlns=""
966-
i:type="AxFormCheckBoxControl">
967-
<Name>ExportParameters_IsIncludeHeader</Name>
968-
<Type>CheckBox</Type>
969-
<FormControlExtension
970-
i:nil="true" />
971-
<DataField>IsIncludeHeader</DataField>
972-
<DataSource>DEVIntegMessageTypeTableOutbound</DataSource>
973-
</AxFormControl>
974961
</Controls>
975962
<Breakable>No</Breakable>
976963
<DataGroup>ExportParameters</DataGroup>

‎DEVTutorial/DEVExternalIntegrationSamples/AxClass/DEVIntegTutorialImportLedgerJournal.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class DEVIntegTutorialImportLedgerJournal extends DEVIntegProcessMessageBase
149149
DEVDimensionHelper::CostCenter(), tutorialLedgerJourLinesStaging.CostCenter ] );
150150
151151
ledgerJournalTrans.LedgerDimension = LedgerDimensionFacade::serviceCreateLedgerDimension(
152-
LedgerDefaultAccountHelper::getDefaultAccountFromMainAccountId(tutorialLedgerJourLinesStaging.MainAccount), dim);
152+
LedgerDefaultAccountHelper::getDefaultAccountFromMainAccountIdAndCOA(tutorialLedgerJourLinesStaging.MainAccount, LedgerChartOfAccounts::current()), dim);
153153
154154
if (!ledgerJournalTrans.LedgerDimension)
155155
{
@@ -235,7 +235,7 @@ class DEVIntegTutorialImportLedgerJournal extends DEVIntegProcessMessageBase
235235
where tutorialLedgerJourLinesStaging.HeaderRefRecId == tutorialLedgerJourHeaderStaging.RecId
236236
{
237237
isValidLine = true;
238-
if (! MainAccount::findByMainAccountId(tutorialLedgerJourLinesStaging.MainAccount))
238+
if (! MainAccount::findByMainAccountIdAndCOA(tutorialLedgerJourLinesStaging.MainAccount, LedgerChartOfAccounts::current()))
239239
{
240240
isValidLine = checkFailed(strFmt("Line %1. Maint account %2 doesn't exist", tutorialLedgerJourLinesStaging.LineNumber,
241241
tutorialLedgerJourLinesStaging.MainAccount));

‎DEVTutorial/DEVExternalIntegrationSamples/AxClass/DEVIntegTutorialPurchOrderOCRProcess.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class DEVIntegTutorialPurchOrderOCRProcess extends DEVIntegProcessMessage
2323
void processMessage(DEVIntegMessageTable _messageTable, DEVIntegMessageProcessResult _messageProcessResult)
2424
{
2525
CompanyId companyId;
26-
DEVIntegParametersPerCompany integParametersPerCompany = integParametersPerCompany::find();
26+
DEVIntegParametersPerCompany integParametersPerCompany = DEVIntegParametersPerCompany::find();
2727
;
2828
messageTable = _messageTable;
2929
messageProcessResult = _messageProcessResult;
@@ -107,8 +107,7 @@ public class DEVIntegTutorialPurchOrderOCRProcess extends DEVIntegProcessMessage
107107
warning(strFmt("Purch pool %1 not found", integStagingPurchHeader.PurchPoolIdFile));
108108
messageProcessResult.incErrorCount();
109109
}
110-
DEVIntegTutorialPurchOrderOCRStagingLine integStagingPurchLineNext;
111-
110+
112111
while select forupdate integStagingPurchLine
113112
order by LineNumberFile
114113
where integStagingPurchLine.HeaderRecId == integStagingPurchHeader.RecId
@@ -144,10 +143,9 @@ public class DEVIntegTutorialPurchOrderOCRProcess extends DEVIntegProcessMessage
144143
145144
InventDim inventDim;
146145
147-
TaxGroupData taxGroupData;
148146
boolean isNeedPOConfirm;
149147
PurchFormLetter purchFormLetter;
150-
DEVIntegParametersPerCompany integParametersPerCompany = integParametersPerCompany::find();
148+
DEVIntegParametersPerCompany integParametersPerCompany = DEVIntegParametersPerCompany::find();
151149
;
152150
153151
ttsBegin;
@@ -258,7 +256,7 @@ public class DEVIntegTutorialPurchOrderOCRProcess extends DEVIntegProcessMessage
258256
public void createMarkupTrans(PurchTable _purchTable)
259257
{
260258
MarkupTrans markupTrans;
261-
DEVIntegParametersPerCompany integParametersPerCompany = integParametersPerCompany::find();
259+
DEVIntegParametersPerCompany integParametersPerCompany = DEVIntegParametersPerCompany::find();
262260
MarkupCode markupCode;
263261
;
264262

‎DEVTutorial/DEVExternalIntegrationSamples/AxForm/DEVIntegTutorialPurchOrderOCRStaging.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,6 @@ public class DEVIntegTutorialPurchOrderOCRStaging extends FormRun
723723
<ElementPosition>1431655764</ElementPosition>
724724
<FilterExpression>%1</FilterExpression>
725725
<HeightMode>Auto</HeightMode>
726-
<Skip>Yes</Skip>
727726
<Type>Button</Type>
728727
<VerticalSpacing>-1</VerticalSpacing>
729728
<WidthMode>Auto</WidthMode>
@@ -739,7 +738,6 @@ public class DEVIntegTutorialPurchOrderOCRStaging extends FormRun
739738
<ElementPosition>1789569705</ElementPosition>
740739
<FilterExpression>%1</FilterExpression>
741740
<HeightMode>Auto</HeightMode>
742-
<Skip>Yes</Skip>
743741
<Type>Button</Type>
744742
<VerticalSpacing>-1</VerticalSpacing>
745743
<WidthMode>Auto</WidthMode>

‎DEVTutorial/DEVExternalIntegrationSamples/AxMenuItemDisplay/DEVIntegTutorialPurchOrderOCRStaging.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<Name>DEVIntegTutorialPurchOrderOCRStaging</Name>
44
<HelpText>Tutorial Purchase orders OCR Staging form</HelpText>
55
<Label>Tutorial Purchase orders OCR Staging</Label>
6-
<Object>FIEIntegPurchOrderOCRStaging</Object>
6+
<Object>DEVIntegTutorialPurchOrderOCRStaging</Object>
77
</AxMenuItemDisplay>

‎DEVTutorial/DEVExternalIntegrationSamples/AxSecurityPrivilege/DEVIntegTutorialPurchOrderOCRManualImportMaintain.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
</AxSecurityEntryPointReference>
2121
<AxSecurityEntryPointReference>
2222
<Name>DEVIntegTutorialPurchOrderOCRStaging</Name>
23-
<Grant>
23+
<GrantCurrentData>
2424
<Correct>Allow</Correct>
2525
<Create>Allow</Create>
2626
<Delete>Allow</Delete>
2727
<Read>Allow</Read>
2828
<Update>Allow</Update>
29-
</Grant>
29+
</GrantCurrentData>
3030
<ObjectName>DEVIntegTutorialPurchOrderOCRStaging</ObjectName>
3131
<ObjectType>MenuItemDisplay</ObjectType>
3232
<Forms>
3333
<AxSecurityEntryPointReferenceForm>
34-
<Name>FIEIntegPurchOrderOCRStaging</Name>
34+
<Name>DEVIntegTutorialPurchOrderOCRStaging</Name>
3535
<Controls />
3636
<DataSources />
3737
</AxSecurityEntryPointReferenceForm>

‎DEVTutorial/DEVExternalIntegrationSamples/AxTable/DEVIntegParametersPerCompany.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,42 @@ public class DEVIntegParametersPerCompany extends common
423423
</AxTableRelationConstraint>
424424
</Constraints>
425425
</AxTableRelation>
426+
<AxTableRelation xmlns=""
427+
i:type="AxTableRelationForeignKey">
428+
<Name>MarkupTablePOInvoice</Name>
429+
<Cardinality>ZeroMore</Cardinality>
430+
<OnDelete>Restricted</OnDelete>
431+
<RelatedTable>MarkupTable</RelatedTable>
432+
<RelatedTableCardinality>ZeroOne</RelatedTableCardinality>
433+
<RelationshipType>Association</RelationshipType>
434+
<Constraints>
435+
<AxTableRelationConstraint xmlns=""
436+
i:type="AxTableRelationConstraintField">
437+
<Name>POInvoiceImportAdminMarkup</Name>
438+
<SourceEDT>PurchMarkupCode</SourceEDT>
439+
<Field>POInvoiceImportAdminMarkup</Field>
440+
<RelatedField>MarkupCode</RelatedField>
441+
</AxTableRelationConstraint>
442+
</Constraints>
443+
</AxTableRelation>
444+
<AxTableRelation xmlns=""
445+
i:type="AxTableRelationForeignKey">
446+
<Name>TaxItemGroupHeadingPOInvoice</Name>
447+
<Cardinality>ZeroMore</Cardinality>
448+
<OnDelete>Restricted</OnDelete>
449+
<RelatedTable>TaxItemGroupHeading</RelatedTable>
450+
<RelatedTableCardinality>ZeroOne</RelatedTableCardinality>
451+
<RelationshipType>Association</RelationshipType>
452+
<Constraints>
453+
<AxTableRelationConstraint xmlns=""
454+
i:type="AxTableRelationConstraintField">
455+
<Name>POInvoiceZeroGSTGroup</Name>
456+
<SourceEDT>TaxItemGroup</SourceEDT>
457+
<Field>POInvoiceZeroGSTGroup</Field>
458+
<RelatedField>TaxItemGroup</RelatedField>
459+
</AxTableRelationConstraint>
460+
</Constraints>
461+
</AxTableRelation>
426462
</Relations>
427463
<StateMachines />
428464
</AxTable>

‎DEVTutorial/DEVExternalIntegrationSamples/AxTable/DEVIntegTutorialPurchOrderOCRStagingLine.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ public class DEVIntegTutorialPurchOrderOCRStagingLine extends common
210210
<Name>HeaderRecId</Name>
211211
<AllowEdit>No</AllowEdit>
212212
<AllowEditOnCreate>No</AllowEditOnCreate>
213-
<ExtendedDataType>FIEIntegPurchOrderOCRStagingRefRecId</ExtendedDataType>
213+
<ExtendedDataType>DEVIntegTutorialPurchOrderOCRStagingRefRecId</ExtendedDataType>
214+
<IgnoreEDTRelation>Yes</IgnoreEDTRelation>
214215
<Mandatory>Yes</Mandatory>
215216
</AxTableField>
216217
<AxTableField xmlns=""

0 commit comments

Comments
 (0)