Skip to content

[main] bug 640380 - Add Word layout and email body support for Purchase Quote and Sales Shipment #9564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidHolusa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[main] bug 640380 - Add Word layout and email body support for Purchase Quote and Sales Shipment #9564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...emoDatasetCZ/app/DemoData/Foundation/1. Setup Data/CreateCustomReportLayoutCZ.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,25 @@ codeunit 31294 "Create Custom Report Layout CZ"
local procedure UpdateReportSelections()
begin
UpdateReportLayout(Enum::"Report Selection Usage"::Reminder, '1', Report::"Reminder CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"P.Quote", '1', Report::"Purchase Quote CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"P.Order", '1', Report::"Purchase Order CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"S.Quote", '1', Report::"Sales Quote CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"S.Order", '1', Report::"Sales Order Confirmation CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"S.Invoice", '1', Report::"Sales Invoice CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"S.Cr.Memo", '1', Report::"Sales Credit Memo CZL");
UpdateReportLayout(Enum::"Report Selection Usage"::"S.Shipment", '1', Report::"Sales Shipment CZL");
end;

local procedure UpdateEmailBodySelections()
begin
AddEmailBodyLayout(Report::"Reminder CZL", CZ31182EmailTok);
AddEmailBodyLayout(Report::"Purchase Quote CZL", CZ31184EmailTok);
AddEmailBodyLayout(Report::"Purchase Order CZL", CZ31185EmailTok);
AddEmailBodyLayout(Report::"Sales Quote CZL", CZ31186EmailTok);
AddEmailBodyLayout(Report::"Sales Order Confirmation CZL", CZ31187EmailTok);
AddEmailBodyLayout(Report::"Sales Invoice CZL", CZ31189EmailTok);
AddEmailBodyLayout(Report::"Sales Credit Memo CZL", CZ31190EmailTok);
AddEmailBodyLayout(Report::"Sales Shipment CZL", CZ31191EmailTok);
end;

local procedure UpdateReportLayout(Usage: Enum "Report Selection Usage"; Sequence: Code[10]; ReportID: Integer)
Expand Down Expand Up @@ -75,9 +79,11 @@ codeunit 31294 "Create Custom Report Layout CZ"

var
CZ31182EmailTok: Label 'ReminderEmail.docx', Locked = true;
CZ31184EmailTok: Label 'PurchaseQuoteEmail.docx', Locked = true;
CZ31185EmailTok: Label 'PurchaseOrderEmail.docx', Locked = true;
CZ31186EmailTok: Label 'SalesQuoteEmail.docx', Locked = true;
CZ31187EmailTok: Label 'SalesOrderConfirmationEmail.docx', Locked = true;
CZ31189EmailTok: Label 'SalesInvoiceEmail.docx', Locked = true;
CZ31190EmailTok: Label 'SalesCreditMemoEmail.docx', Locked = true;
CZ31191EmailTok: Label 'SalesShipmentEmail.docx', Locked = true;
}
12 changes: 12 additions & 0 deletions src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuote.rdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4466,6 +4466,18 @@ End Function</Code>
<Field Name="VATLbl">
<DataField>VATLbl</DataField>
</Field>
<Field Name="GreetingLbl">
<DataField>GreetingLbl</DataField>
</Field>
<Field Name="BodyLbl">
<DataField>BodyLbl</DataField>
</Field>
<Field Name="ClosingLbl">
<DataField>ClosingLbl</DataField>
</Field>
<Field Name="DocumentNoLbl">
<DataField>DocumentNoLbl</DataField>
</Field>
<Field Name="No_PurchaseHeader">
<DataField>No_PurchaseHeader</DataField>
</Field>
Expand Down
38 changes: 36 additions & 2 deletions src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteCZL.Report.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ using System.Utilities;

report 31184 "Purchase Quote CZL"
{
DefaultLayout = RDLC;
RDLCLayout = './Src/Reports/PurchaseQuote.rdl';
Caption = 'Purchase Quote';
PreviewMode = PrintLayout;
DefaultRenderingLayout = "PurchaseQuote.rdl";
WordMergeDataItem = "Purchase Header";

dataset
{
Expand Down Expand Up @@ -167,6 +167,18 @@ report 31184 "Purchase Quote CZL"
column(VATLbl; VATLbl)
{
}
column(GreetingLbl; GreetingLbl)
{
}
column(BodyLbl; BodyLbl)
{
}
column(ClosingLbl; ClosingLbl)
{
}
column(DocumentNoLbl; DocumentNoLbl)
{
}
column(No_PurchaseHeader; "No.")
{
}
Expand Down Expand Up @@ -512,6 +524,24 @@ report 31184 "Purchase Quote CZL"
LogInteractionEnable := LogInteraction;
end;
}
rendering
{
layout("PurchaseQuote.rdl")
{
Type = RDLC;
LayoutFile = './Src/Reports/PurchaseQuote.rdl';
Caption = 'Purchase Quote (RDL)';
Summary = 'The Purchase Quote (RDL) provides a detailed layout.';
}
layout("PurchaseQuoteEmail.docx")
{
Type = Word;
LayoutFile = './Src/Reports/PurchaseQuoteEmail.docx';
Caption = 'Purchase Quote Email (Word)';
Summary = 'The Purchase Quote Email (Word) provides an email body layout.';
}
}

trigger OnInitReport()
begin
PurchasesPayablesSetup.Get();
Expand Down Expand Up @@ -549,6 +579,10 @@ report 31184 "Purchase Quote CZL"
DiscPercentLbl: Label 'Discount %';
TotalLbl: Label 'total';
VATLbl: Label 'VAT';
GreetingLbl: Label 'Hello';
ClosingLbl: Label 'Sincerely';
BodyLbl: Label 'The purchase quote is attached to this message.';
DocumentNoLbl: Label 'No.';

protected var
PaymentMethod: Record "Payment Method";
Expand Down
Binary file added src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteEmail.docx
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipment.rdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4941,6 +4941,18 @@ End Function</Code>
<Field Name="VATLbl">
<DataField>VATLbl</DataField>
</Field>
<Field Name="GreetingLbl">
<DataField>GreetingLbl</DataField>
</Field>
<Field Name="BodyLbl">
<DataField>BodyLbl</DataField>
</Field>
<Field Name="ClosingLbl">
<DataField>ClosingLbl</DataField>
</Field>
<Field Name="DocumentNoLbl">
<DataField>DocumentNoLbl</DataField>
</Field>
<Field Name="No_SalesShipmentHeader">
<DataField>No_SalesShipmentHeader</DataField>
</Field>
Expand Down
39 changes: 37 additions & 2 deletions src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentCZL.Report.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ using System.Utilities;

report 31191 "Sales Shipment CZL"
{
DefaultLayout = RDLC;
RDLCLayout = './Src/Reports/SalesShipment.rdl';
Caption = 'Sales Shipment';
PreviewMode = PrintLayout;
DefaultRenderingLayout = "SalesShipment.rdl";
WordMergeDataItem = "Sales Shipment Header";

dataset
{
Expand Down Expand Up @@ -156,6 +156,18 @@ report 31191 "Sales Shipment CZL"
column(VATLbl; VATLbl)
{
}
column(GreetingLbl; GreetingLbl)
{
}
column(BodyLbl; BodyLbl)
{
}
column(ClosingLbl; ClosingLbl)
{
}
column(DocumentNoLbl; DocumentNoLbl)
{
}
column(No_SalesShipmentHeader; "No.")
{
}
Expand Down Expand Up @@ -528,6 +540,7 @@ report 31191 "Sales Shipment CZL"
}
}
}

trigger OnInit()
begin
LogInteractionEnable := true;
Expand All @@ -539,6 +552,24 @@ report 31191 "Sales Shipment CZL"
LogInteractionEnable := LogInteraction;
end;
}
rendering
{
layout("SalesShipment.rdl")
{
Type = RDLC;
LayoutFile = './Src/Reports/SalesShipment.rdl';
Caption = 'Sales Shipment (RDL)';
Summary = 'The Sales Shipment (RDL) provides a detailed layout.';
}
layout("SalesShipmentEmail.docx")
{
Type = Word;
LayoutFile = './Src/Reports/SalesShipmentEmail.docx';
Caption = 'Sales Shipment Email (Word)';
Summary = 'The Sales Shipment Email (Word) provides an email body layout.';
}
}

trigger OnPreReport()
begin
if not CurrReport.UseRequestPage then
Expand Down Expand Up @@ -578,6 +609,10 @@ report 31191 "Sales Shipment CZL"
DescriptionCaptionLbl: Label 'Description';
NoCaptionLbl: Label 'No.';
ExpirationDateLbl: Label 'Expiration Date';
GreetingLbl: Label 'Hello';
ClosingLbl: Label 'Sincerely';
BodyLbl: Label 'Thank you for your business. Your shipment is attached to this message.';
DocumentNoLbl: Label 'No.';

protected var
ShipmentMethod: Record "Shipment Method";
Expand Down
Binary file added src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentEmail.docx
View file
Open in desktop
Binary file not shown.
Loading