diff --git a/src/Apps/CZ/ContosoCoffeeDemoDatasetCZ/app/DemoData/Foundation/1. Setup Data/CreateCustomReportLayoutCZ.Codeunit.al b/src/Apps/CZ/ContosoCoffeeDemoDatasetCZ/app/DemoData/Foundation/1. Setup Data/CreateCustomReportLayoutCZ.Codeunit.al
index d4ade39a9b..f09a43c7b0 100644
--- a/src/Apps/CZ/ContosoCoffeeDemoDatasetCZ/app/DemoData/Foundation/1. Setup Data/CreateCustomReportLayoutCZ.Codeunit.al
+++ b/src/Apps/CZ/ContosoCoffeeDemoDatasetCZ/app/DemoData/Foundation/1. Setup Data/CreateCustomReportLayoutCZ.Codeunit.al
@@ -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)
@@ -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;
}
diff --git a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuote.rdl b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuote.rdl
index efaa7eaa9a..373a91c9c6 100644
--- a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuote.rdl
+++ b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuote.rdl
@@ -4466,6 +4466,18 @@ End Function
VATLbl
+
+ GreetingLbl
+
+
+ BodyLbl
+
+
+ ClosingLbl
+
+
+ DocumentNoLbl
+
No_PurchaseHeader
diff --git a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteCZL.Report.al b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteCZL.Report.al
index c728edc641..4aad77fb0f 100644
--- a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteCZL.Report.al
+++ b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteCZL.Report.al
@@ -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
{
@@ -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.")
{
}
@@ -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();
@@ -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";
diff --git a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteEmail.docx b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteEmail.docx
new file mode 100644
index 0000000000..1b40a9c297
Binary files /dev/null and b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/PurchaseQuoteEmail.docx differ
diff --git a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipment.rdl b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipment.rdl
index 90853f4720..5fbf7daa64 100644
--- a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipment.rdl
+++ b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipment.rdl
@@ -4941,6 +4941,18 @@ End Function
VATLbl
+
+ GreetingLbl
+
+
+ BodyLbl
+
+
+ ClosingLbl
+
+
+ DocumentNoLbl
+
No_SalesShipmentHeader
diff --git a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentCZL.Report.al b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentCZL.Report.al
index d468ffe943..76bdf2ab49 100644
--- a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentCZL.Report.al
+++ b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentCZL.Report.al
@@ -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
{
@@ -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.")
{
}
@@ -528,6 +540,7 @@ report 31191 "Sales Shipment CZL"
}
}
}
+
trigger OnInit()
begin
LogInteractionEnable := true;
@@ -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
@@ -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";
diff --git a/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentEmail.docx b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentEmail.docx
new file mode 100644
index 0000000000..aac3f6a9c2
Binary files /dev/null and b/src/Apps/CZ/CoreLocalizationPack/app/Src/Reports/SalesShipmentEmail.docx differ