incr: add ledger links

- fix sidebar issue
- show grand total

models/helpers.ts

@@ -7,11 +7,11 @@ import { safeParseFloat } from 'utils/index';
 import { Router } from 'vue-router';
 import {
   AccountRootType,
-  AccountRootTypeEnum
+  AccountRootTypeEnum,
 } from './baseModels/Account/types';
 import {
   Defaults,
-  numberSeriesDefaultsMap
+  numberSeriesDefaultsMap,
 } from './baseModels/Defaults/Defaults';
 import { InvoiceStatus, ModelNameEnum } from './types';
 
@@ -60,15 +60,27 @@ export function getInvoiceActions(
   ];
 }
 
-export function getLedgerLinkAction(fyo: Fyo): Action {
+export function getLedgerLinkAction(
+  fyo: Fyo,
+  isStock: boolean = false
+): Action {
+
+  let label = fyo.t`Ledger Entries`;
+  let reportClassName = 'GeneralLedger';
+
+  if (isStock) {
+    label = fyo.t`Stock Entries`;
+    reportClassName = 'StockLedger';
+  }
+
   return {
-    label: fyo.t`Ledger Entries`,
+    label,
     condition: (doc: Doc) => doc.isSubmitted,
     action: async (doc: Doc, router: Router) => {
       router.push({
         name: 'Report',
         params: {
-          reportClassName: 'GeneralLedger',
+          reportClassName,
           defaultFilters: JSON.stringify({
             referenceType: doc.schemaName,
             referenceName: doc.name,

models/inventory/StockMovement.ts

@@ -1,10 +1,12 @@
+import { Fyo } from 'fyo';
 import {
+  Action,
   DefaultMap,
   FiltersMap,
   FormulaMap,
-  ListViewSettings,
+  ListViewSettings
 } from 'fyo/model/types';
-import { getDocStatusListColumn } from 'models/helpers';
+import { getDocStatusListColumn, getLedgerLinkAction } from 'models/helpers';
 import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { ModelNameEnum } from 'models/types';
 import { Money } from 'pesa';
@@ -63,4 +65,8 @@ export class StockMovement extends Transfer {
       toLocation: row.toLocation,
     }));
   }
+
+  static getActions(fyo: Fyo): Action[] {
+    return [getLedgerLinkAction(fyo, true)];
+  }
 }

models/inventory/StockTransfer.ts

@@ -1,10 +1,10 @@
-import { t } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { Attachment } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
-import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
+import { Action, DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
-import { NotFoundError, ValidationError } from 'fyo/utils/errors';
+import { ValidationError } from 'fyo/utils/errors';
 import { Defaults } from 'models/baseModels/Defaults/Defaults';
-import { getNumberSeries } from 'models/helpers';
+import { getLedgerLinkAction, getNumberSeries } from 'models/helpers';
 import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { ModelNameEnum } from 'models/types';
 import { Money } from 'pesa';
@@ -100,7 +100,7 @@ export abstract class StockTransfer extends Transfer {
       await posting.credit(stockReceivedButNotBilled, amount);
     }
 
-    await posting.makeRoundOffEntry()
+    await posting.makeRoundOffEntry();
     return posting;
   }
 
@@ -133,4 +133,8 @@ export abstract class StockTransfer extends Transfer {
       throw new ValidationError(messages.join(' '));
     }
   }
+
+  static getActions(fyo: Fyo): Action[] {
+    return [getLedgerLinkAction(fyo, false), getLedgerLinkAction(fyo, true)];
+  }
 }

reports/GeneralLedger/GeneralLedger.ts

@@ -17,6 +17,8 @@ type ReferenceType =
   | ModelNameEnum.PurchaseInvoice
   | ModelNameEnum.Payment
   | ModelNameEnum.JournalEntry
+  | ModelNameEnum.Shipment
+  | ModelNameEnum.PurchaseReceipt
   | 'All';
 
 export class GeneralLedger extends LedgerReport {
@@ -272,17 +274,25 @@ export class GeneralLedger extends LedgerReport {
   }
 
   getFilters() {
+    const refTypeOptions = [
+      { label: t`All`, value: 'All' },
+      { label: t`Sales Invoices`, value: 'SalesInvoice' },
+      { label: t`Purchase Invoices`, value: 'PurchaseInvoice' },
+      { label: t`Payments`, value: 'Payment' },
+      { label: t`Journal Entries`, value: 'JournalEntry' },
+    ];
+
+    if (this.fyo.store.appFlags.isInventoryEnabled) {
+      refTypeOptions.push(
+        { label: t`Shipment`, value: 'Shipment' },
+        { label: t`Purchase Receipt`, value: 'PurchaseReceipt' }
+      );
+    }
+
     return [
       {
         fieldtype: 'Select',
-        options: [
+        options: refTypeOptions,
-          { label: t`All`, value: 'All' },
-          { label: t`Sales Invoices`, value: 'SalesInvoice' },
-          { label: t`Purchase Invoices`, value: 'PurchaseInvoice' },
-          { label: t`Payments`, value: 'Payment' },
-          { label: t`Journal Entries`, value: 'JournalEntry' },
-        ],
-
         label: t`Ref Type`,
         fieldname: 'referenceType',
         placeholder: t`Ref Type`,

reports/inventory/StockLedger.ts

@@ -11,6 +11,12 @@ import { isNumeric } from 'src/utils';
 import { getRawStockLedgerEntries, getStockLedgerEntries } from './helpers';
 import { ComputedStockLedgerEntry } from './types';
 
+type ReferenceType =
+  | ModelNameEnum.StockMovement
+  | ModelNameEnum.Shipment
+  | ModelNameEnum.PurchaseReceipt
+  | 'All';
+
 export class StockLedger extends Report {
   static title = t`Stock Ledger`;
   static reportName = 'stock-ledger';
@@ -25,6 +31,9 @@ export class StockLedger extends Report {
   fromDate?: string;
   toDate?: string;
   ascending?: boolean;
+  referenceType?: ReferenceType = 'All';
+  referenceName?: string;
+
   groupBy: 'none' | 'item' | 'location' = 'none';
 
   constructor(fyo: Fyo) {
@@ -101,6 +110,17 @@ export class StockLedger extends Report {
         continue;
       }
 
+      if (
+        this.referenceType !== 'All' &&
+        row.referenceType !== this.referenceType
+      ) {
+        continue;
+      }
+
+      if (this.referenceName && row.referenceName !== this.referenceName) {
+        continue;
+      }
+
       row.name = ++i;
       filteredRawData.push(row);
     }
@@ -265,14 +285,14 @@ export class StockLedger extends Report {
 
   getFilters(): Field[] {
     return [
-      /*
       {
         fieldtype: 'Select',
         options: [
           { label: t`All`, value: 'All' },
           { label: t`Stock Movements`, value: 'StockMovement' },
+          { label: t`Shipment`, value: 'Shipment' },
+          { label: t`Purchase Receipt`, value: 'PurchaseReceipt' },
         ],
-
         label: t`Ref Type`,
         fieldname: 'referenceType',
         placeholder: t`Ref Type`,
@@ -285,7 +305,6 @@ export class StockLedger extends Report {
         emptyMessage: t`Change Ref Type`,
         fieldname: 'referenceName',
       },
-      */
       {
         fieldtype: 'Link',
         target: 'Item',

src/components/Sidebar.vue

@@ -208,11 +208,18 @@ export default {
       }
     },
     isItemActive(item) {
-      let { path: currentRoute, params } = this.$route;
+      const { path: currentRoute, params } = this.$route;
-      let routeMatch = currentRoute === item.route;
+      const routeMatch = currentRoute === item.route;
-      let schemaNameMatch =
+
+      const schemaNameMatch =
         item.schemaName && params.schemaName === item.schemaName;
-      return routeMatch || schemaNameMatch;
+
+      const isMatch = routeMatch || schemaNameMatch;
+      if (params.name && item.schemaName && !isMatch) {
+        return currentRoute.includes(`${item.schemaName}/${params.name}`);
+      }
+
+      return isMatch;
     },
     isGroupActive(group) {
       return this.activeGroup && group.label === this.activeGroup.label;

src/pages/GeneralForm.vue

@@ -28,7 +28,7 @@
       <hr />
 
       <div>
-        <!-- Invoice Form Data Entry -->
+        <!-- Form Data Entry -->
         <div class="m-4 grid grid-cols-3 gap-4">
           <FormControl
             input-class="font-semibold"
@@ -66,7 +66,7 @@
         </div>
         <hr />
 
-        <!-- Invoice Items Table -->
+        <!-- Items Table -->
         <Table
           class="text-base"
           :df="getField('items')"
@@ -79,8 +79,7 @@
         />
       </div>
 
-      <!-- Invoice Form Footer -->
+      <!-- Form Footer -->
-
       <div v-if="doc.items?.length ?? 0" class="mt-auto">
         <hr />
         <div class="flex justify-between text-base m-4 gap-12">
@@ -96,6 +95,21 @@
               :read-only="doc?.submitted"
             />
           </div>
+          <div class="w-1/2" v-if="doc.grandTotal">
+            <!-- Grand Total -->
+            <div
+              class="
+                flex
+                justify-between
+                text-green-600
+                font-semibold
+                text-base
+              "
+            >
+              <div>{{ t`Grand Total` }}</div>
+              <div>{{ formattedValue('grandTotal') }}</div>
+            </div>
+          </div>
         </div>
       </div>
     </template>
@@ -119,6 +133,7 @@
 </template>
 <script>
 import { computed } from '@vue/reactivity';
+import { t } from 'fyo';
 import { getDocStatus } from 'models/helpers';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
@@ -235,7 +250,7 @@ export default {
         message,
         buttons: [
           {
-            label: this.t`Yes`,
+            label: t`Yes`,
             async action() {
               try {
                 await ref.doc.submit();
@@ -245,7 +260,7 @@ export default {
             },
           },
           {
-            label: this.t`No`,
+            label: t`No`,
             action() {},
           },
         ],