Skip to content

Commit

Permalink
Syncing with version 26.0.27052.0 (#27662)
Browse files Browse the repository at this point in the history
Co-authored-by: Magnus Hartvig Grønbech <[email protected]>
  • Loading branch information
Groenbech96 and Magnus Hartvig Grønbech authored Nov 21, 2024
1 parent 449bcbe commit 07aa6c5
Show file tree
Hide file tree
Showing 38 changed files with 191 additions and 172 deletions.
2 changes: 1 addition & 1 deletion .github/AL-Go-Settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"runs-on": "windows-latest",
"cacheImageName": "",
"UsePsSession": false,
"artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/26.0.26951.0/base",
"artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/26.0.27052.0/base",
"country": "base",
"useProjectDependencies": true,
"repoVersion": "26.0",
Expand Down
5 changes: 5 additions & 0 deletions Apps/IN/INGST/app/GSTBase/src/Page/GSTPostingSetup.page.al
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ page 18003 "GST Posting Setup"
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies state-wise GST TDS receivable account for each component. ';
}
field("GST TDS Payable Account"; Rec."GST TDS Payable Account")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies state-wise GST TDS payable account for each component. ';
}
field("GST TCS Receivable Account"; Rec."GST TCS Receivable Account")
{
ApplicationArea = Basic, Suite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ codeunit 18011 "GST TDS TCS Tax Type Setup"
"{81E6747B-B7CE-4A75-BEE5-F630FF17C687}Lbl": Label 'GST Use Cases';
"{c34d7e4b-1538-4d41-9e72-71dfcf6fc94d}Lbl": Label 'GST Use Cases';
"{5430a349-b6ae-4ca1-a7d9-6884d93da5ef}Lbl": Label 'GST Use Cases';
"{7c83d9d2-7b73-48c6-ab6f-3e2e7221b1d8}Lbl": Label 'GST Use Cases';
"{88bbce88-a277-47a7-ac40-ed384c9224e8}Lbl": Label 'GST Use Cases';
begin
Handled := true;

Expand All @@ -91,6 +93,10 @@ codeunit 18011 "GST TDS TCS Tax Type Setup"
exit("{c34d7e4b-1538-4d41-9e72-71dfcf6fc94d}Lbl");
'{5430a349-b6ae-4ca1-a7d9-6884d93da5ef}':
exit("{5430a349-b6ae-4ca1-a7d9-6884d93da5ef}Lbl");
'{7c83d9d2-7b73-48c6-ab6f-3e2e7221b1d8}':
exit("{7c83d9d2-7b73-48c6-ab6f-3e2e7221b1d8}Lbl");
'{88bbce88-a277-47a7-ac40-ed384c9224e8}':
exit("{88bbce88-a277-47a7-ac40-ed384c9224e8}Lbl");
end;

Handled := false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,8 @@ codeunit 18017 "GST Tax Configuration"
UseCases.Add('{874048A6-575B-456F-A2E7-26532DA3F1CA}', 1);
UseCases.Add('{2c3d6b6c-5f5b-4728-b00f-28df4fa04939}', 1);
UseCases.Add('{e449e955-a401-4c0d-9db6-3920da89d68e}', 1);
UseCases.Add('{7C83D9D2-7B73-48C6-AB6F-3E2E7221B1D8}', 1);
UseCases.Add('{88BBCE88-A277-47A7-AC40-ED384C9224E8}', 1);
end;

var
Expand Down
6 changes: 6 additions & 0 deletions Apps/IN/INGST/app/GSTBase/src/table/GSTPostingSetup.table.al
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ table 18007 "GST Posting Setup"
DataClassification = CustomerContent;
TableRelation = "G/L Account" where(Blocked = const(false), "Account Type" = filter(Posting));
}
field(17; "GST TDS Payable Account"; code[20])
{
Caption = 'GST TDS Payable Account';
DataClassification = CustomerContent;
TableRelation = "G/L Account";
}
}

keys
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ using Microsoft.Inventory.Ledger;
using Microsoft.Inventory.Posting;
using Microsoft.Inventory.Tracking;
using Microsoft.Manufacturing.Document;
using Microsoft.Warehouse.Request;
using Microsoft.Purchases.Document;
using Microsoft.Purchases.History;
using Microsoft.Purchases.Posting;
using Microsoft.Purchases.Vendor;
using Microsoft.Warehouse.Journal;

codeunit 18466 "Subcontracting Post"
{
Expand Down Expand Up @@ -205,12 +207,16 @@ codeunit 18466 "Subcontracting Post"
TempTrackingSpecification: Record "Tracking Specification" temporary;
ItemJnlPostLine: Codeunit "Item Jnl.-Post Line";
ItemJnlPostBatch: Codeunit "Item Jnl.-Post Batch";
OriginalQty: Decimal;
OriginalQtyBase: Decimal;
begin
if ItemJnlLine."Value Entry Type" <> ItemJnlLine."Value Entry Type"::Revaluation then begin
OriginalQty := ItemJnlLine.Quantity;
OriginalQtyBase := ItemJnlLine."Quantity (Base)";
if not ItemJnlPostLine.RunWithCheck(ItemJnlLine) then
ItemJnlPostLine.CheckItemTracking();
ItemJnlPostLine.CollectTrackingSpecification(TempTrackingSpecification);
ItemJnlPostBatch.PostWhseJnlLine(ItemJnlLine, ItemJnlLine.Quantity, ItemJnlLine."Quantity (Base)", TempTrackingSpecification);
ItemJnlPostBatch.PostWhseJnlLine(ItemJnlLine, OriginalQty, OriginalQtyBase, TempTrackingSpecification);
Clear(ItemJnlPostLine);
Clear(ItemJnlPostBatch);
end;
Expand Down Expand Up @@ -2550,6 +2556,25 @@ codeunit 18466 "Subcontracting Post"
IsHandled := true;
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"WMS Management", 'OnAfterCreateWhseJnlLine', '', false, false)]
local procedure UpdateSourceDocument(var WhseJournalLine: Record "Warehouse Journal Line"; ItemJournalLine: Record "Item Journal Line")
var
PurchaseLine: Record "Purchase Line";
WhseManagement: Codeunit "Whse. Management";
begin
if not (ItemJournalLine."Order Type" = ItemJournalLine."Order Type"::Production) then
exit;

PurchaseLine.SetRange("Prod. Order No.", ItemJournalLine."Order No.");
PurchaseLine.SetRange("Prod. Order Line No.", ItemJournalLine."Order Line No.");
PurchaseLine.SetRange(Subcontracting, true);
if PurchaseLine.IsEmpty then
exit;

WhseJournalLine.SetSource(Database::"Item Journal Line", 1, ItemJnlLine."Document No.", ItemJnlLine."Line No.", 0);
WhseJournalLine."Source Document" := WhseManagement.GetWhseJnlSourceDocument(WhseJournalLine."Source Type", WhseJournalLine."Source Subtype");
end;

[IntegrationEvent(false, false)]
local procedure OnAfterModifyApplyDeliveryChallan(var AppliedDeliveryChallan: Record "Applied Delivery Challan"; SubOrderCompVend: Record "Sub Order Comp. List Vend")
begin
Expand Down
12 changes: 12 additions & 0 deletions Apps/IN/INGST/app/Translations/India GST.en-GB.xlf

Large diffs are not rendered by default.

Loading

0 comments on commit 07aa6c5

Please sign in to comment.