Skip to content

2026 r1 #167

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
stevenh-ACM wants to merge 9 commits into
base: 2025R2
Choose a base branch
from
Open

2026 r1 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8610a46
EDU-9384: replacing numbering sequence in code
k-s-popova Dec 16, 2025
e851179
EDU-9384: changing version in readme
k-s-popova Dec 16, 2025
b8c70f2
EDU-9384: updated versions of nuget packages
k-s-popova Dec 16, 2025
0e9a895
EDU-9384: library versions replaced
k-s-popova Dec 16, 2025
7887726
EDU-9384: resubmitting T210 project
k-s-popova Dec 18, 2025
0868b9e
EDU-9384: T210 customization project issue fixed in T220, T230
k-s-popova Dec 19, 2025
5c56ce2
Merge remote-tracking branch 'remotes/origin/2025R2' into 2026R1
k-s-popova Dec 19, 2025
4a5aff1
Merge remote-tracking branch 'remotes/origin/2025R2' into 2026R1
k-s-popova Dec 29, 2025
4df84dd
AC-339091: SignalR example updated
k-s-popova Dec 29, 2025
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
4 changes: 2 additions & 2 deletions ...BarcodeDrivenEngine/PhoneRepairShop_Code/PhoneRepairShop_Code/PhoneRepairShop_Code.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>9.0.2</Version>
<Version>10.0.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
<Version>6.0.0</Version>
<Version>6.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Customization/T190/SourceFiles/PhoneRepairShop/InputData/RSSVSetup.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CompanyID;NumberingID;WalkInCustomerID;DefaultEmployee;PrepaymentPercent;CreatedByID;CreatedByScreenID;CreatedDateTime;LastModifiedByID;LastModifiedByScreenID;LastModifiedDateTime;tstamp;NoteID
2;WORKORDER;5441;12411;10.000000;B5344897-037E-4D58-B5C3-1BDFD0F47BF9;RS101000;2020-05-12 09:23:04.893;B5344897-037E-4D58-B5C3-1BDFD0F47BF9;RS101000;2020-05-12 09:23:04.893;0x00000000000518D8;0A00DE05-3294-EA11-9FEE-E0D55E1F4D34
2;RSSVWORDER;5441;12411;10.000000;B5344897-037E-4D58-B5C3-1BDFD0F47BF9;RS101000;2020-05-12 09:23:04.893;B5344897-037E-4D58-B5C3-1BDFD0F47BF9;RS101000;2020-05-12 09:23:04.893;0x00000000000518D8;0A00DE05-3294-EA11-9FEE-E0D55E1F4D34
2 changes: 1 addition & 1 deletion Customization/T190/SourceFiles/PhoneRepairShop_Code/PhoneRepairShop_Code/DAC/RSSVSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class RSSVSetup : PXBqlTable, IBqlTable
{
#region NumberingID
[PXDBString(10, IsUnicode = true)]
[PXDefault("WORKORDER")]
[PXDefault("RSSVWORDER")]
[PXUIField(DisplayName = "Numbering Sequence")]
[PXSelector(typeof(Numbering.numberingID), DescriptionField = typeof(Numbering.descr))]
public virtual string? NumberingID { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions ...on/T190/SourceFiles/PhoneRepairShop_Code/PhoneRepairShop_Code/PhoneRepairShop_Code.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>9.0.2</Version>
<Version>10.0.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
<Version>6.0.0</Version>
<Version>6.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Customization/T200/CodeSnippets/Step1.9.2/PhoneRepairShop_Code.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>9.0.2</Version>
<Version>10.0.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
<Version>6.0.0</Version>
<Version>6.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Customization/T200/PhoneRepairShop_Code/PhoneRepairShop_Code/PhoneRepairShop_Code.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>9.0.2</Version>
<Version>10.0.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
<Version>6.0.0</Version>
<Version>6.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
63 changes: 0 additions & 63 deletions Customization/T210/CodeSnippets/Step2.1.4/RS203000.aspx
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions Customization/T210/CodeSnippets/Step2.2.1/RS203000.aspx
View file
Open in desktop

This file was deleted.

Binary file modified Customization/T210/PhoneRepairShop/Bin/PhoneRepairShop_code.dll
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...en/src/development/screens/IN/IN202500/extensions/IN202500_PhoneRepairShop_generated.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<field name="ItemSettings.UsrRepairItem" after="#fsItemDefaults-General FIELD[name='ItemType']"></field>
<field name="ItemSettings.UsrRepairItemType" after="#fsItemDefaults-General FIELD[name='ItemSettings.UsrRepairItem']"></field>
<qp-tab id="tab-CompatibleDevices" caption="Compatible Devices" after="#tab-PriceCost">
<qp-grid id="grid-CompatibleDevices" view.bind="CompatibleDevices">
</qp-grid>
</qp-tab>
<qp-grid id="grid-CompatibleDevices" view.bind="CompatibleDevices">
</qp-grid>
</qp-tab>
</template>
4 changes: 2 additions & 2 deletions .../PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS201000/RS201000.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<template>
<qp-grid id="grid-RepairService" view.bind="RepairService"></qp-grid>
</template>
<qp-grid id="grid-RepairService" view.bind="RepairService"></qp-grid>
</template>
2 changes: 1 addition & 1 deletion ...10/PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS201000/RS201000.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import {
PXScreen, graphInfo, createCollection,
PXView, PXFieldState,
Expand All @@ -15,6 +14,7 @@ export class RS201000 extends PXScreen {
RepairService = createCollection(RSSVRepairService);
}

// View
@gridConfig({
preset: GridPreset.Primary
})
Expand Down
18 changes: 9 additions & 9 deletions .../PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS202000/RS202000.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<qp-template id="form-ServDevices" name="1-1">
<qp-fieldset id="fsColumnA" slot="A" view.bind="ServDevices">
<field name="DeviceCD"></field>
<field name="Description"></field>
<field name="Active"></field>
<field name="AvgComplexityOfRepair"></field>
</qp-fieldset>
</qp-template>
</template>
<qp-template id="form-ServDevices" name="1-1">
<qp-fieldset id="fsColumnA" slot="A" view.bind="ServDevices">
<field name="DeviceCD"></field>
<field name="Description"></field>
<field name="Active"></field>
<field name="AvgComplexityOfRepair"></field>
</qp-fieldset>
</qp-template>
</template>
32 changes: 0 additions & 32 deletions Customization/T210/PhoneRepairShop/Pages/RS/RS202000.aspx
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Customization/T210/PhoneRepairShop/Pages/RS/RS202000.aspx.cs
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions Customization/T210/PhoneRepairShop/_project/GenericInquiryScreen_Services_and_Prices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<GenericInquiryScreen>
<data-set>
<relations format-version="4" relations-version="20250701" main-table="GIDesign" stable-sharing="True" file-name="(Name)" unique-key="GIDesign (Name)">
<relations format-version="4" relations-version="20250922" main-table="GIDesign" stable-sharing="True" file-name="(Name)" unique-key="GIDesign (Name)">
<link from="GIFilter (DesignID)" to="GIDesign (DesignID)" unique-key="GIFilter (DesignID, Name, IsActive)" />
<link from="GIGroupBy (DesignID)" to="GIDesign (DesignID)" />
<link from="GIMassAction (DesignID)" to="GIDesign (DesignID)" />
Expand All @@ -11,6 +11,7 @@
<link from="GIOn (DesignID, RelationNbr)" to="GIRelation (DesignID, LineNbr)" />
<link from="GIRecordDefault (DesignID)" to="GIDesign (DesignID)" />
<link from="GIRelation (DesignID, ParentTable)" to="GITable (DesignID, Alias)" />
<link from="GIMLGroups (DesignID)" to="GIDesign (DesignID)" />
<link from="GIRelation (DesignID, ChildTable)" to="GITable (DesignID, Alias)" />
<link from="GIResult (DesignID)" to="GIDesign (DesignID)" />
<link from="GIResult (ObjectName, DesignID)" to="GITable (Alias, DesignID)" />
Expand Down Expand Up @@ -65,6 +66,7 @@
<table name="GINavigationCondition" uplink="(DesignID, LineNbr) = (DesignID, NavigationScreenLineNbr)" />
</table>
<table name="GIRecordDefault" uplink="(DesignID) = (DesignID)" />
<table name="GIMLGroups" uplink="(DesignID) = (DesignID)" />
<table name="GISort" uplink="(DesignID) = (DesignID)">
<table name="Note" uplink="(NoteID) = (NoteID)" />
</table>
Expand Down Expand Up @@ -169,8 +171,8 @@
</layout>
<data>
<GIDesign>
<row DesignID="134b2979-46f9-452f-ad39-57b3be8e4958" Name="Services and Prices" FilterColCount="3" PageSize="0" ExportTop="0" PrimaryScreenIDNew="RS203000" NewRecordCreationEnabled="1" MassDeleteEnabled="0" AutoConfirmDelete="0" MassRecordsUpdateEnabled="0" MassActionsOnRecordsEnabled="0" ExposeViaOData="0" ExposeViaMobile="0" ShowDeletedRecords="0" ShowArchivedRecords="0" MLDetectionEnabled="0" SkipEmptyGroups="0">
<GINavigationScreen Link="RS203000" LineNbr="1" SortOrder="1" WindowMode="I" IsActive="1" NoteID="2046d02e-aea3-401b-9291-723f2f8a68f7">
<row DesignID="134b2979-46f9-452f-ad39-57b3be8e4958" Name="Services and Prices" FilterColCount="3" PageSize="0" ExportTop="0" PrimaryScreenIDNew="RS203000" NewRecordCreationEnabled="1" MassDeleteEnabled="0" AutoConfirmDelete="0" MassRecordsUpdateEnabled="0" MassActionsOnRecordsEnabled="0" ExposeViaOData="0" ExposeViaMobile="0" ShowDeletedRecords="0" ShowArchivedRecords="0" DisableCountsAndTotals="0" MLDetectionEnabled="0" SkipEmptyGroups="0">
<GINavigationScreen Link="RS203000" LineNbr="1" SortOrder="1" WindowMode="I" IsActive="1" NoteID="3468b661-66e7-4f20-ba01-3d73dc4f3221">
<GINavigationParameter LineNbr="2" FieldName="DeviceID" ParameterName="RepairPrice.DeviceID" IsExpression="0" />
<GINavigationParameter LineNbr="1" FieldName="ServiceID" ParameterName="RepairPrice.ServiceID" IsExpression="0" />
</GINavigationScreen>
Expand All @@ -188,7 +190,7 @@
</row>
</SiteMap>
<SiteMap linkname="to1Screen">
<row Position="21520" Title="Services and Prices" Url="~/Scripts/Screens/RS203000.html" NodeID="a889a31c-f526-47fb-80c9-e79ffbe5d5ff" ParentID="00000000-0000-0000-0000-000000000000" SelectedUI="D">
<row Position="21520" Title="Services and Prices" Url="~/Scripts/Screens/RS203000.html" NodeID="09d652c6-ade9-4dba-9955-971d128d15f1" ParentID="00000000-0000-0000-0000-000000000000" SelectedUI="D">
<MUIScreen IsPortal="0" WorkspaceID="57c3382a-54f3-4da8-b6e5-ccfb130972b7" Order="40" SubcategoryID="1669bef9-e982-485c-a48b-80ce30193385">
<MUIPinnedScreen IsPortal="0" Username="" IsPinned="1" />
</MUIScreen>
Expand Down
2 changes: 1 addition & 1 deletion Customization/T210/PhoneRepairShop/_project/IN202500.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<EditorUpdatedFields ScreenId="IN202500"><![CDATA[{"Views":{"ItemSettings":{"Action":"None","BaseDacClassName":"ItemSettings","DacClassName":"ItemSettings_PhoneRepairShop3_generated","FileContainingExtendingView":"src/screens/IN/IN202500/IN202500","IsGrid":null,"IsTree":null,"Preset":null,"DisplayName":null,"CustomAttributes":null,"Fields":{"UsrRepairItem":{"Action":"Add","CommitChanges":false,"CustomAttributes":"@fieldInfo({ commitChanges: true })\r\n"},"UsrRepairItemType":{"Action":"Add","CommitChanges":false,"CustomAttributes":null}}},"CompatibleDevices":{"Action":"Add","BaseDacClassName":null,"DacClassName":"RSSVStockItemDevice","FileContainingExtendingView":null,"IsGrid":true,"IsTree":false,"Preset":"Details","DisplayName":"Compatible Devices","CustomAttributes":null,"Fields":{"DeviceID":{"Action":"Add","CommitChanges":false,"CustomAttributes":"@fieldInfo({ commitChanges: true })\r\n"}}}}}]]></EditorUpdatedFields>
<EditorUpdatedFields ScreenId="IN202500"><![CDATA[{"Views":{"ItemSettings":{"Action":"None","BaseDacClassName":"ItemSettings","DacClassName":"ItemSettings_PhoneRepairShop_generated","FileContainingExtendingView":"src/screens/IN/IN202500/IN202500","IsGrid":null,"IsTree":null,"Preset":null,"DisplayName":null,"CustomAttributes":null,"Fields":{"UsrRepairItem":{"Action":"Add","CommitChanges":false,"CustomAttributes":null}}}}}]]></EditorUpdatedFields>
2 changes: 1 addition & 1 deletion Customization/T210/PhoneRepairShop/_project/ScreenWithRights_RS201000.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<row Rolename="CR Viewer" ApplicationName="/" Descr="Read-only access to marketing, sales and support forms" Guest="0" />
<row Rolename="CS Admin" ApplicationName="/" Descr="Access to system functions and configuration items" Guest="0" />
<row Rolename="Customer Data Manager" ApplicationName="/" Descr="Full access to data entry forms related to customers" Guest="0" />
<row Rolename="Customizer" ApplicationName="/" Descr="Customizer" Guest="0" />
<row Rolename="DashboardDesigner" ApplicationName="/" Descr="Dashboard Designer" Guest="0" />
<row Rolename="Data Privacy Controller" ApplicationName="/" Descr="Data Privacy Controller" Guest="0" />
<row Rolename="DR Admin" ApplicationName="/" Descr="Access to DR functions and settings" Guest="0" />
Expand Down Expand Up @@ -120,6 +119,7 @@
<row Rolename="Vendor Data Manager" ApplicationName="/" Descr="Full access to data entry forms related to vendors" Guest="0" />
<row Rolename="Wiki Admin" ApplicationName="/" Descr="Wiki Administrator to set other users access rights to Wiki" Guest="0" />
<row Rolename="Wiki Author" ApplicationName="/" Descr="Role provides access rights for creating Wiki articles" Guest="0" />
<row Rolename="Customizer" ApplicationName="/" Descr="Customizer" Guest="0" />
</Roles>
</data>
</data-set>
Expand Down
2 changes: 1 addition & 1 deletion Customization/T210/PhoneRepairShop/_project/ScreenWithRights_RS203000.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</layout>
<data>
<SiteMap>
<row Position="21520" Title="Services and Prices" Url="~/Pages/RS/RS203000.aspx" ScreenID="RS203000" NodeID="a889a31c-f526-47fb-80c9-e79ffbe5d5ff" ParentID="00000000-0000-0000-0000-000000000000" SelectedUI="D">
<row Position="21520" Title="Services and Prices" Url="~/Pages/RS/RS203000.aspx" ScreenID="RS203000" NodeID="09d652c6-ade9-4dba-9955-971d128d15f1" ParentID="00000000-0000-0000-0000-000000000000" SelectedUI="D">
<RolesInGraph Rolename="Customizer" ApplicationName="/" Accessrights="4" />
</row>
</SiteMap>
Expand Down
Loading