Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,38 @@ report 114 "Salesperson - Sales Statistics"
{
layout(RDLCLayout)
{
Caption = 'Salesperson Sales Statistics Excel';
Comment thread
MSlenejennum marked this conversation as resolved.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Existing APAC layout name changed from RDLC to Excel. The layout RDLCLayout was RDLC and now becomes Type = Excel with an .xlsx file, and a new layout named RDLC is added. Report 114 still has DefaultRenderingLayout = RDLCLayout, so APAC users get Excel output by default instead of RDLC, and any saved layout selection that points to RDLCLayout also switches. Please keep RDLCLayout as the RDLC layout and add only the new body layout.

Type = Excel;
LayoutFile = './Sales/Reports/SalespersonSalesStatistics.xlsx';
Summary = 'Report layout primarily made for data analysis. Use an Excel editor to modify the layout.';
}
layout(Word)
{
Caption = 'Salesperson Sales Statistics Word';
Type = Word;
LayoutFile = './Sales/Reports/SalespersonSalesStatistics.docx';
Summary = 'Report layout made for print. Use a Word editor to modify the layout.';
ObsoleteState = Pending;
ObsoleteReason = 'This Word layout will be replaced by the Document Report Experience. Use the corresponding composite (body) layout instead. It will be removed in a future release.';
ObsoleteTag = '30.0';
}
#if not CLEAN27
layout(RDLC)
{
Caption = 'Salesperson Sales Statistics RDLC';
Type = RDLC;
LayoutFile = './Sales/Reports/SalespersonSalesStatistics.rdlc';
Summary = 'Report layout made in the legacy RDLC format. Use an RDLC editor to modify the layout.';
}
#endif
layout(WordBody)
{
Type = Word;
Subtype = Body;
LayoutFile = './Sales/Reports/SalespersonSalesStatisticsBody.docx';
Caption = 'Body-only: Salesperson Sales Statistics Word';
Summary = 'Landscape orientated. Shows sales, profit, and adjusted profit in LCY and as a percentage for each salesperson, together with invoice discount, payment discount given, and payment tolerance. Includes column totals.';
}
}

labels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@ report 107 "Customer - Order Summary"
LayoutFile = '.\Sales\Reports\CustomerOrderSummary.docx';
Type = Word;
Summary = 'Built in layout for the Customer Order Summary word report.';
ObsoleteState = Pending;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Obsoleted Word layout is still referenced, so Clean builds fail. RU report 107 keeps DefaultRenderingLayout = Word while this PR marks that Word layout ObsoleteState = Pending. The Clean pipelines for about 20 countries fail with AS0105 The ReportLayout 'Word' cannot be referenced ... ObsoleteTag '30.0'. Please move the default to a layout that is not obsolete, so no object references the obsoleted layout.

ObsoleteReason = 'This Word layout will be replaced by the Document Report Experience. Use the corresponding composite (body) layout instead. It will be removed in a future release.';
ObsoleteTag = '30.0';
}
#if not CLEAN27
layout(RDLC)
Expand All @@ -481,6 +484,14 @@ report 107 "Customer - Order Summary"
Summary = 'Report layout made in the legacy RDLC format. Use an RDLC editor to modify the layout.';
}
#endif
layout(WordBody)
{
Type = Word;
Subtype = Body;
LayoutFile = '.\Sales\Reports\CustomerOrderSummaryBody.docx';
Caption = 'Body-only: Customer Order Summary Word';
Summary = 'Landscape orientated. Groups outstanding sales order amounts by customer and currency, split across the periods before, within, and after the date range. Shows a total for each line and overall totals, in LCY.';
}
}
labels
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,9 @@ report 107 "Customer - Order Summary"
LayoutFile = '.\Sales\Reports\CustomerOrderSummary.docx';
Type = Word;
Summary = 'Built in layout for the Customer Order Summary word report.';
ObsoleteState = Pending;
ObsoleteReason = 'This Word layout will be replaced by the Document Report Experience. Use the corresponding composite (body) layout instead. It will be removed in a future release.';
ObsoleteTag = '30.0';
}
#if not CLEAN27
layout(RDLC)
Expand All @@ -480,6 +483,14 @@ report 107 "Customer - Order Summary"
Summary = 'Report layout made in the legacy RDLC format. Use an RDLC editor to modify the layout.';
}
#endif
layout(WordBody)
{
Type = Word;
Subtype = Body;
LayoutFile = '.\Sales\Reports\CustomerOrderSummaryBody.docx';
Caption = 'Body-only: Customer Order Summary Word';
Summary = 'Landscape orientated. Groups outstanding sales order amounts by customer and currency, split across the periods before, within, and after the date range. Shows a total for each line and overall totals, in LCY.';
}
}
labels
{
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,9 @@ report 115 "Salesperson - Commission"
Type = Word;
LayoutFile = './Sales/Reports/SalespersonCommission.docx';
Summary = 'Report layout made for print. Use a Word editor to modify the layout.';
ObsoleteState = Pending;
ObsoleteReason = 'This Word layout will be replaced by the Document Report Experience. Use the corresponding composite (body) layout instead. It will be removed in a future release.';
ObsoleteTag = '30.0';
}
#if not CLEAN27
layout(RDLC)
Expand All @@ -469,6 +472,14 @@ report 115 "Salesperson - Commission"
Summary = 'Report layout made in the legacy RDLC format. Use an RDLC editor to modify the layout.';
}
#endif
layout(WordBody)
{
Type = Word;
Subtype = Body;
LayoutFile = './Sales/Reports/SalespersonCommissionBody.docx';
Caption = 'Body-only: Salesperson Commission Word';
Summary = 'Landscape orientated. Lists each entry for a salesperson with posting date, document, and customer number, followed by sales, profit, and adjusted profit with the matching commission amounts. Includes subtotals and totals, in LCY.';
}
}

labels
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ report 114 "Salesperson - Sales Statistics"
Type = Word;
LayoutFile = './Sales/Reports/SalespersonSalesStatistics.docx';
Summary = 'Report layout made for print. Use a Word editor to modify the layout.';
ObsoleteState = Pending;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR description does not match the code. It says ObsoleteTag = '32.0' behind #if not CLEAN32 and that the default rendering layout stays Excel, but the code uses ObsoleteTag = '30.0', has no CLEAN guard, and the RU and APAC defaults are not Excel. Please update the description and confirm the obsolete tag matches the target release.

ObsoleteReason = 'This Word layout will be replaced by the Document Report Experience. Use the corresponding composite (body) layout instead. It will be removed in a future release.';
ObsoleteTag = '30.0';
}
#if not CLEAN27
layout(RDLC)
Expand All @@ -272,6 +275,14 @@ report 114 "Salesperson - Sales Statistics"
Summary = 'Report layout made in the legacy RDLC format. Use an RDLC editor to modify the layout.';
}
#endif
layout(WordBody)
{
Type = Word;
Subtype = Body;
LayoutFile = './Sales/Reports/SalespersonSalesStatisticsBody.docx';
Caption = 'Body-only: Salesperson Sales Statistics Word';
Summary = 'Landscape orientated. Shows sales, profit, and adjusted profit in LCY and as a percentage for each salesperson, together with invoice discount, payment discount given, and payment tolerance. Includes column totals.';
}
}

labels
Expand Down
Binary file not shown.
Loading