tin-spa 20.3.4 → 20.3.6

package/fesm2022/tin-spa.mjs

@@ -1532,6 +1532,7 @@ class DataServiceLib {
         this.capTransactionTypes = new CapItem;
         this.capTransactions = new CapItem;
         this.capAccountingInvoices = new CapItem;
+        this.capInvoicing = new CapItem; // Added: Capability for invoicing view
         this.capLoans = new CapItem;
         this.capLoanProducts = new CapItem;
         this.capLoansMain = new CapItem;
@@ -2223,8 +2224,7 @@ class DataServiceLib {
         this.capAccounting.name = "cap27";
         this.capAccounting.display = "Accounting";
         this.capAccounting.icon = "account_balance";
-        this.capAccounting.capSubItems = [this.capAccounts, this.capTransactions, this.capAggregates, this.capTransactionTypes, this.capAccountingInvoices,
-            this.capAging, this.capAccountingOutstandingInvoices]; // Added: capAging to submenu
+        this.capAccounting.capSubItems = [this.capAccounts, this.capTransactions, this.capAggregates, this.capTransactionTypes,];
         this.capAccounts.name = "cap52"; // Changed: Fixed conflict with capBrands (was cap14)
         this.capAccounts.display = "Accounts";
         this.capAccounts.link = "home/admin/accounting-accounts";
@@ -2233,10 +2233,6 @@ class DataServiceLib {
         this.capAggregates.display = "Aggregates";
         this.capAggregates.link = "home/admin/accounting-aggregates";
         this.capAggregates.icon = "bar_chart";
-        this.capAging.name = "cap58"; // Added: Aging capability
-        this.capAging.display = "Aging Report";
-        this.capAging.link = "home/admin/accounting-aging";
-        this.capAging.icon = "schedule";
         this.capTransactionTypes.name = "cap28";
         this.capTransactionTypes.display = "Transaction Types";
         this.capTransactionTypes.link = "home/admin/accounting-transaction-types";
@@ -2245,14 +2241,22 @@ class DataServiceLib {
         this.capTransactions.display = "Transactions";
         this.capTransactions.link = "home/admin/accounting-transactions";
         this.capTransactions.icon = "receipt_long";
-        this.capAccountingInvoices.name = "cap53"; // Changed: Fixed conflict with capInventory (was cap34)
+        this.capInvoicing.name = "cap53";
+        this.capInvoicing.display = "Invoicing";
+        this.capInvoicing.icon = "receipt_long";
+        this.capInvoicing.capSubItems = [this.capAccountingInvoices, this.capAging, this.capAccountingOutstandingInvoices];
+        this.capAccountingInvoices.name = "cap53";
         this.capAccountingInvoices.display = "Invoices";
         this.capAccountingInvoices.link = "home/admin/accounting-invoices";
         this.capAccountingInvoices.icon = "receipt_long";
-        this.capAccountingOutstandingInvoices.name = "cap54"; // Changed: Fixed conflict with capInventoryDashboard (was cap35)
+        this.capAccountingOutstandingInvoices.name = "cap54";
         this.capAccountingOutstandingInvoices.display = "Outstanding Invoices";
         this.capAccountingOutstandingInvoices.link = "home/admin/accounting-outstanding-invoices";
         this.capAccountingOutstandingInvoices.icon = "account_balance_wallet";
+        this.capAging.name = "cap58";
+        this.capAging.display = "Aging Report";
+        this.capAging.link = "home/admin/accounting-aging";
+        this.capAging.icon = "schedule";
         this.capLoans.name = "cap30";
         this.capLoans.display = "Loans";
         this.capLoans.icon = "payments";
@@ -2272,9 +2276,12 @@ class DataServiceLib {
         this.capInventory.name = "cap34";
         this.capInventory.display = "Inventory";
         this.capInventory.icon = "inventory";
-        this.capInventory.capSubItems = [this.capSales, this.capInventoryReceipts, this.capProducts, this.capServiceItems, this.capBundleProducts, this.capInventoryStock, this.capInventoryTransactions, this.capInventoryItems,
+        this.capInventory.capSubItems = [this.capSales, this.capInventoryReceipts, this.capProducts, this.capServiceItems,
+            this.capBundleProducts, this.capInventoryStock, this.capInventoryTransactions, this.capInventoryItems,
             this.capPurchaseOrders, this.capSalesOrders, this.capRequisitions, this.capInventoryAdjustments,
-            this.capInventoryReturns, this.capRequisitionReturns, this.capProductionRecipes, this.capProductionOrders, this.capInventoryDashboard]; // Changed: Added capServiceItems to inventory menu 
+            this.capInventoryReturns, this.capRequisitionReturns, this.capProductionRecipes, this.capProductionOrders,
+            this.capInventoryDashboard
+        ];
         this.capInventoryDashboard.name = "cap35";
         this.capInventoryDashboard.display = "Dashboard";
         this.capInventoryDashboard.link = "home/admin/inventory-dashboard";
@@ -2849,10 +2856,32 @@ class AccountingService {
                 { name: 'description', type: 'text', required: true, alias: 'Description', span: true }, // Changed: Description field (backend will populate for Product/Service)
                 { name: 'quantity', type: 'number', required: true, defaultValue: 1 },
                 { name: 'unitPrice', type: 'money', alias: 'Unit Price', required: true }, // Changed: Unit price field (backend will populate for Product/Service)
+                { name: 'poNumber', type: 'text', alias: 'PO Number', hint: 'Purchase Order Number' }, // Added: PO Number for invoice bundling
             ],
             loadAction: { url: 'invoiceitems/id/{invoiceItemID}' },
             heroField: 'invoiceItemID',
         };
+        // Added: Move item form configuration - select destination invoice
+        this.invoiceMoveItemFormConfig = {
+            title: 'Move Item',
+            fixedTitle: true,
+            fields: [
+                { name: 'invoiceItemID', type: 'number', hidden: true },
+                { name: 'description', type: 'label', alias: 'Item', readonly: true, span: true },
+                { name: 'invoiceID', type: 'select', alias: 'Move to Invoice', required: true, span: true, loadAction: { url: 'invoiceitems/list/draft-invoices' } }
+            ],
+            loadAction: { url: 'invoiceitems/id/{invoiceItemID}' },
+            heroField: 'invoiceItemID'
+        };
+        // Added: Move item details dialog config
+        this.invoiceMoveItemDetailsConfig = {
+            formConfig: this.invoiceMoveItemFormConfig,
+            heroField: 'invoiceItemID',
+            mode: 'edit',
+            buttons: [
+                { name: 'move', display: 'Move Item', icon: { name: 'swap_horiz', color: 'blue' }, inDialog: true, action: { url: 'invoiceitems?action=move', method: 'post', successMessage: 'Item moved successfully' } }
+            ]
+        };
         // Invoice items table for manual line item entry
         this.invoiceItemsTableConfig = {
             tabTitle: 'Invoice Items',
@@ -2862,22 +2891,16 @@ class AccountingService {
             columns: [
                 { name: 'invoiceItemID', type: 'number', alias: 'ID', hiddenCondition: () => true },
                 { name: 'description', type: 'text', alias: 'Description' },
+                { name: 'poNumber', type: 'text', alias: 'PO#' }, // Added: Purchase Order Number column
                 { name: 'quantity', type: 'number', alias: 'Qty' },
                 { name: 'unitPrice', type: 'money', alias: 'Unit Price' },
                 { name: 'amount', type: 'money', alias: 'Amount' }
             ],
             buttons: [
-                { name: 'create', display: 'Add Item', dialog: true, action: { url: 'invoiceitems?action=create', method: 'post' },
-                    disabled: x => x.status != InvoiceStatus.Draft
-                },
-                { name: 'edit', dialog: true, action: { url: 'invoiceitems?action=edit', method: 'post' },
-                    disabled: x => x.status != InvoiceStatus.Draft
-                },
-                { name: 'delete', inDialog: true, icon: { name: 'delete', color: 'red' }, action: { url: 'invoiceitems?action=delete', method: 'post',
-                        successMessage: 'Deleted' },
-                    confirm: { message: 'Delete this item?' },
-                    disabled: x => x.status != InvoiceStatus.Draft
-                },
+                { name: 'create', display: 'Add Item', dialog: true, action: { url: 'invoiceitems?action=create', method: 'post' }, disabled: x => x.status != InvoiceStatus.Draft },
+                { name: 'edit', dialog: true, action: { url: 'invoiceitems?action=edit', method: 'post' }, disabled: x => x.status != InvoiceStatus.Draft },
+                { name: 'move', display: 'Move', dialog: true, icon: { name: 'swap_horiz' }, detailsConfig: this.invoiceMoveItemDetailsConfig, disabled: x => x.status != InvoiceStatus.Draft }, // Added: Move item button
+                { name: 'delete', inDialog: true, icon: { name: 'delete', color: 'red' }, action: { url: 'invoiceitems?action=delete', method: 'post', successMessage: 'Deleted' }, confirm: { message: 'Delete this item?' }, disabled: x => x.status != InvoiceStatus.Draft },
             ],
             loadAction: { url: 'invoiceitems/x/x' }, loadCriteria: 'invoice', loadIDField: 'invoiceID',
             formConfig: this.invoiceItemsFormConfig // Changed: Reference extracted form config
@@ -2898,7 +2921,7 @@ class AccountingService {
             visible: x => x.status == InvoiceStatus.Draft,
             disabled: x => x.totalAmount == 0
         };
-        this.invoiceEditButton = { name: 'edit', dialog: true, action: { url: 'invoices?action=edit', method: 'post', },
+        this.invoiceEditButton = { name: 'edit', display: 'Save', dialog: true, action: { url: 'invoices?action=edit', method: 'post', },
             confirm: { message: 'Proceed ?' },
             visible: x => x.status == InvoiceStatus.Draft // Changed: Draft only
         };
@@ -2908,7 +2931,12 @@ class AccountingService {
             formConfig: this.invoiceFormConfig,
             tableConfigs: [this.invoiceItemsTableConfig, this.invoicePaymentsTableConfig],
             heroField: 'invoiceID',
-            buttons: [this.invoiceSubmitButton, this.invoiceRecordPaymentButton, this.invoiceDiscardButton, this.invoiceEditButton]
+            buttons: [
+                this.invoiceSubmitButton,
+                this.invoiceRecordPaymentButton,
+                this.invoiceDiscardButton,
+                this.invoiceEditButton
+            ]
         };
         this.invoiceViewButton = { name: 'view', dialog: true, detailsConfig: this.invoiceDetailsDialogConfig };
         // Invoice summary tiles
@@ -3920,9 +3948,9 @@ class InventoryService {
             includeAudit: true,
             fields: [
                 { name: 'name', type: 'text', required: true, alias: 'Service Name' },
+                { name: 'isActive', type: 'checkbox', alias: 'Active', defaultValue: true },
                 { name: 'description', type: 'text', alias: 'Description' },
                 { name: 'unitPrice', type: 'money', required: true, alias: 'Unit Price' },
-                { name: 'isActive', type: 'checkbox', alias: 'Active', defaultValue: true }
             ],
             loadAction: { url: 'serviceitems/id' },
             heroField: 'serviceItemID'