From 548f39b802f4943afd4bbe8c70d63fab103fbfbd Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 20 Nov 2024 01:54:49 +0100
Subject: [PATCH 01/11] feat: allow to turn off filtering

---
 schemas/core/SystemSettings.json |  8 ++++
 src/components/Controls/Link.vue | 65 +++++++++++++++++++++-----------
 translations/fr.csv              |  5 ++-
 3 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 39a376016..f55ca4f4f 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -64,6 +64,14 @@
       "readOnly": true,
       "section": "Default"
     },
+    {
+      "fieldname": "allowFilterBypass",
+      "label": "Allow to bypass filters",
+      "fieldtype": "Check",
+      "default": false,
+      "description": "When linking documents, if no match is found and filtering is in effect, allow to disable filters.",
+      "section": "Default"
+    },
     {
       "fieldname": "locale",
       "label": "Locale",
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index fe48501ce..99af4af5b 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -11,7 +11,7 @@ export default {
   name: 'Link',
   extends: AutoComplete,
   data() {
-    return { results: [] };
+    return { results: [], filtersDisabled: false };
   },
   watch: {
     value: {
@@ -45,7 +45,7 @@ export default {
     getTargetSchemaName() {
       return this.df.target;
     },
-    async getOptions() {
+    async getOptions(filters) {
       const schemaName = this.getTargetSchemaName();
       if (!schemaName) {
         return [];
@@ -56,7 +56,6 @@ export default {
       }
 
       const schema = fyo.schemaMap[schemaName];
-      const filters = await this.getFilters();
 
       const fields = [
         ...new Set(['name', schema.titleField, this.df.groupBy]),
@@ -78,7 +77,8 @@ export default {
         .filter(Boolean));
     },
     async getSuggestions(keyword = '') {
-      let options = await this.getOptions();
+      let filters = this.filtersDisabled ? null : await this.getFilters();
+      let options = await this.getOptions(filters || {});
 
       if (keyword) {
         options = options
@@ -88,21 +88,34 @@ export default {
           .map(({ item }) => item);
       }
 
-      if (this.doc && this.df.create) {
-        options = options.concat(this.getCreateNewOption());
+      if (options.length === 0 && !this.df.emptyMessage) {
+        if (filters && !!fyo.singles.SystemSettings?.allowFilterBypass) {
+          options = [
+            {
+              component: markRaw({
+                template:
+                  '<span class="text-gray-600 dark:text-gray-400">{{ t`No results found, disable filters` }}</span>',
+              }),
+              action: () => this.disableFiltering(),
+              actionOnly: true,
+            },
+          ];
+        } else if (!this.doc || !this.df.create) {
+          options = [
+            {
+              component: markRaw({
+                template:
+                  '<span class="text-gray-600 dark:text-gray-400">{{ t`No results found` }}</span>',
+              }),
+              action: () => {},
+              actionOnly: true,
+            },
+          ];
+        }
       }
 
-      if (options.length === 0 && !this.df.emptyMessage) {
-        return [
-          {
-            component: markRaw({
-              template:
-                '<span class="text-gray-600 dark:text-gray-400">{{ t`No results found` }}</span>',
-            }),
-            action: () => {},
-            actionOnly: true,
-          },
-        ];
+      if (this.doc && this.df.create) {
+        options = options.concat(this.getCreateNewOption());
       }
 
       return options;
@@ -129,6 +142,14 @@ export default {
         }),
       };
     },
+    disableFiltering(keyword) {
+      this.filtersDisabled = true;
+      this.results = [];
+      setTimeout(() => {
+        this.toggleDropdown(true);
+        this.updateSuggestions(keyword);
+      }, 1);
+    },
     async openNewDoc() {
       const schemaName = this.df.target;
       const name =
@@ -155,7 +176,7 @@ export default {
         return createFilters;
       }
 
-      const filters = await this.getFilters();
+      const filters = (await this.getFilters()) ?? {};
       return getCreateFiltersFromListViewFilters(filters);
     },
     async getFilters() {
@@ -163,17 +184,17 @@ export default {
       const getFilters = fyo.models[schemaName]?.filters?.[fieldname];
 
       if (getFilters === undefined) {
-        return {};
+        return null;
       }
 
       if (this.doc) {
-        return (await getFilters(this.doc)) ?? {};
+        return await getFilters(this.doc);
       }
 
       try {
-        return (await getFilters()) ?? {};
+        return await getFilters();
       } catch {
-        return {};
+        return null;
       }
     },
   },
diff --git a/translations/fr.csv b/translations/fr.csv
index a31c5993a..37d07a0b6 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -572,6 +572,7 @@ No,Non,
 "No filters selected","Aucun filtre sélectionné",
 "No linked entries found",,
 "No results found","Aucun résultat trouvé",
+"No results found, disable filters","Aucun résultat trouvé, désactiver les filtres",
 "No rows added. Select a file or add rows.",,
 "No transactions yet","Aucune transaction pour le moment",
 "Non Active Serial Number ${0} cannot be used as Manufacture raw material",,
@@ -1055,4 +1056,6 @@ Yes,Oui,
 "check values and click on","Vérifiez les valeurs et cliquez sur",
 "in Batch ${0}",,
 john@doe.com,,
-"to apply changes","pour appliquer les changements",
\ No newline at end of file
+"to apply changes","pour appliquer les changements",
+"Allow to bypass filters","Autoriser la désactivation des filtres"
+"When linking documents, if no match is found and filtering is in effect, allow to disable filters.","Lors de la sélection d'un document lié, autoriser à désactiver les filtres si aucun résultat n'est trouvé"

From c60a9453f4f0d55b23f6042cf5b78d9a34e2fdcb Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 20 Nov 2024 11:35:58 +0100
Subject: [PATCH 02/11] feat: Add provisional mode where submission can be
 undone

---
 fyo/model/doc.ts                      | 44 +++++++++++++
 fyo/telemetry/types.ts                |  1 +
 models/Transactional/Transactional.ts | 13 ++++
 models/baseModels/Invoice/Invoice.ts  | 30 ++++++++-
 models/baseModels/Payment/Payment.ts  |  5 ++
 models/inventory/StockManager.ts      |  4 ++
 models/inventory/StockMovement.ts     |  5 ++
 models/inventory/StockTransfer.ts     |  7 ++
 models/inventory/Transfer.ts          | 13 ++++
 schemas/core/SystemSettings.json      |  7 ++
 schemas/meta/submittable.json         |  8 +++
 src/components/Sidebar.vue            | 93 ++++++++++++++++++++++++++-
 src/utils/ui.ts                       | 35 +++++++++-
 13 files changed, 260 insertions(+), 5 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index a5b23b6d2..60364ffcd 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -223,6 +223,30 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return true;
   }
 
+  get canUndoSubmit() {
+    if (!this.canCancel) {
+      return false;
+    }
+
+    if (this.fyo.singles.SystemSettings?.provisionalModeSince == null) {
+      return false;
+    }
+
+    const submittedAt: Date = (this.submittedAt || this.created) as Date;
+    if (!submittedAt) {
+      return false;
+    }
+
+    if (
+      submittedAt <
+      (this.fyo.singles.SystemSettings.provisionalModeSince as Date)
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
   get canCancel() {
     if (!this.schema.isSubmittable) {
       return false;
@@ -344,14 +368,17 @@ export class Doc extends Observable<DocValue | Doc[]> {
     value?: DocValue | Doc[] | DocValueMap[]
   ): boolean {
     if (fieldname === 'numberSeries' && !this.notInserted) {
+      // console.log("cannot set %s, numberSeries inserted", fieldname)
       return false;
     }
 
     if (value === undefined) {
+      // console.log("cannot set %s, undefined value", fieldname)
       return false;
     }
 
     if (this.fieldMap[fieldname] === undefined) {
+      // console.log("cannot set %s, no fieldMap", fieldname, this.fieldMap)
       return false;
     }
 
@@ -940,12 +967,27 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
     await this.trigger('beforeSubmit');
     await this.setAndSync('submitted', true);
+    await this.setAndSync('submittedAt', new Date());
     await this.trigger('afterSubmit');
 
     this.fyo.telemetry.log(Verb.Submitted, this.schemaName);
     this.fyo.doc.observer.trigger(`submit:${this.schemaName}`, this.name);
   }
 
+  async submitUndo() {
+    if (!this.schema.isSubmittable || !this.submitted || this.cancelled) {
+      return;
+    }
+
+    await this.trigger('beforeSubmitUndo');
+    await this.setAndSync('submitted', false);
+    await this.setAndSync('submittedAt', null);
+    await this.trigger('afterSubmitUndo');
+
+    this.fyo.telemetry.log(Verb.SubmitUndone, this.schemaName);
+    this.fyo.doc.observer.trigger(`submitUndo:${this.schemaName}`, this.name);
+  }
+
   async cancel() {
     if (!this.schema.isSubmittable || !this.submitted || this.cancelled) {
       return;
@@ -1058,6 +1100,8 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async afterSync() {}
   async beforeSubmit() {}
   async afterSubmit() {}
+  async beforeSubmitUndo() {}
+  async afterSubmitUndo() {}
   async beforeRename() {}
   async afterRename() {}
   async beforeCancel() {}
diff --git a/fyo/telemetry/types.ts b/fyo/telemetry/types.ts
index 79a65222c..42a72100e 100644
--- a/fyo/telemetry/types.ts
+++ b/fyo/telemetry/types.ts
@@ -8,6 +8,7 @@ export enum Verb {
   Created = 'created',
   Deleted = 'deleted',
   Submitted = 'submitted',
+  SubmitUndone = 'submitUndone',
   Cancelled = 'cancelled',
   Imported = 'imported',
   Exported = 'exported',
diff --git a/models/Transactional/Transactional.ts b/models/Transactional/Transactional.ts
index 76337a5d2..b02ee30d4 100644
--- a/models/Transactional/Transactional.ts
+++ b/models/Transactional/Transactional.ts
@@ -56,6 +56,15 @@ export abstract class Transactional extends Doc {
     await posting.post();
   }
 
+  async afterSubmitUndo(): Promise<void> {
+    await super.afterSubmitUndo();
+    if (!this.isTransactional) {
+      return;
+    }
+
+    await this._deletePostings();
+  }
+
   async afterCancel(): Promise<void> {
     await super.afterCancel();
     if (!this.isTransactional) {
@@ -76,6 +85,10 @@ export abstract class Transactional extends Doc {
       return;
     }
 
+    await this._deletePostings();
+  }
+
+  async _deletePostings(): Promise<void> {
     const ledgerEntryIds = (await this.fyo.db.getAll(
       ModelNameEnum.AccountingLedgerEntry,
       {
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 4deca4086..7d436f01d 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -245,9 +245,29 @@ export abstract class Invoice extends Transactional {
     }
   }
 
+  async afterSubmitUndo() {
+    await super.afterSubmitUndo();
+    await this._cancelPayments({ undo: true });
+    await this._updatePartyOutStanding();
+    await this._updateIsItemsReturned();
+    await this._removeLoyaltyPointEntry();
+    this.reduceUsedCountOfCoupons();
+  }
+
+  async _undoPayments() {
+    const paymentIds = await this.getPaymentIds();
+    for (const paymentId of paymentIds) {
+      const paymentDoc = (await this.fyo.doc.getDoc(
+        'Payment',
+        paymentId
+      )) as Payment;
+      await paymentDoc.cancel();
+    }
+  }
+
   async afterCancel() {
     await super.afterCancel();
-    await this._cancelPayments();
+    await this._cancelPayments({ undo: false });
     await this._updatePartyOutStanding();
     await this._updateIsItemsReturned();
     await this._removeLoyaltyPointEntry();
@@ -258,14 +278,18 @@ export abstract class Invoice extends Transactional {
     await removeLoyaltyPoint(this);
   }
 
-  async _cancelPayments() {
+  async _cancelPayments({ undo }: { undo: boolean }) {
     const paymentIds = await this.getPaymentIds();
     for (const paymentId of paymentIds) {
       const paymentDoc = (await this.fyo.doc.getDoc(
         'Payment',
         paymentId
       )) as Payment;
-      await paymentDoc.cancel();
+      if (undo) {
+        await paymentDoc.submitUndo();
+      } else {
+        await paymentDoc.cancel();
+      }
     }
   }
 
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 3f021ec3c..33e626df8 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -442,6 +442,11 @@ export class Payment extends Transactional {
     }
   }
 
+  async afterSubmitUndo() {
+    await super.afterSubmitUndo();
+    await this.revertOutstandingAmount();
+  }
+
   async afterCancel() {
     await super.afterCancel();
     await this.revertOutstandingAmount();
diff --git a/models/inventory/StockManager.ts b/models/inventory/StockManager.ts
index 392d32e1b..da0baffb8 100644
--- a/models/inventory/StockManager.ts
+++ b/models/inventory/StockManager.ts
@@ -46,6 +46,10 @@ export class StockManager {
     await this.#sync();
   }
 
+  async undoTransfers() {
+    await this.cancelTransfers();
+  }
+
   async cancelTransfers() {
     const { referenceName, referenceType } = this.details;
     await this.fyo.db.deleteAll(ModelNameEnum.StockLedgerEntry, {
diff --git a/models/inventory/StockMovement.ts b/models/inventory/StockMovement.ts
index cd24b54b1..bed559bfa 100644
--- a/models/inventory/StockMovement.ts
+++ b/models/inventory/StockMovement.ts
@@ -69,6 +69,11 @@ export class StockMovement extends Transfer {
     await updateSerialNumbers(this, false);
   }
 
+  async afterSubmitUndo(): Promise<void> {
+    await super.afterSubmitUndo();
+    await updateSerialNumbers(this, true);
+  }
+
   async afterCancel(): Promise<void> {
     await super.afterCancel();
     await updateSerialNumbers(this, true);
diff --git a/models/inventory/StockTransfer.ts b/models/inventory/StockTransfer.ts
index 49c6509c8..020b58b29 100644
--- a/models/inventory/StockTransfer.ts
+++ b/models/inventory/StockTransfer.ts
@@ -217,6 +217,13 @@ export abstract class StockTransfer extends Transfer {
     await this._updateItemsReturned();
   }
 
+  async afterSubmitUndo() {
+    await super.afterSubmitUndo();
+    await updateSerialNumbers(this, false, this.isReturn);
+    await this._updateBackReference();
+    await this._updateItemsReturned();
+  }
+
   async afterCancel(): Promise<void> {
     await super.afterCancel();
     await updateSerialNumbers(this, true, this.isReturn);
diff --git a/models/inventory/Transfer.ts b/models/inventory/Transfer.ts
index 567dfd45b..b6ce74897 100644
--- a/models/inventory/Transfer.ts
+++ b/models/inventory/Transfer.ts
@@ -21,6 +21,19 @@ export abstract class Transfer extends Transactional {
     await this._getStockManager().createTransfers(transferDetails);
   }
 
+  async beforeSubmitUndo(): Promise<void> {
+    await super.beforeSubmitUndo();
+    const transferDetails = this._getTransferDetails();
+    const stockManager = this._getStockManager();
+    stockManager.isCancelled = true;
+    await stockManager.validateCancel(transferDetails);
+  }
+
+  async afterSubmitUndo(): Promise<void> {
+    await super.afterSubmitUndo();
+    await this._getStockManager().undoTransfers();
+  }
+
   async beforeCancel(): Promise<void> {
     await super.beforeCancel();
     const transferDetails = this._getTransferDetails();
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index f55ca4f4f..123ceb4d1 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -133,6 +133,13 @@
       "default": false,
       "description": "Sets the theme of the app.",
       "section": "Theme"
+    },
+    {
+      "fieldname": "provisionalModeSince",
+      "label": "Provisional Mode Since",
+      "fieldtype": "Datetime",
+      "description": "Date since the provisional mode is set, or NULL for definitive mode",
+      "hidden": true
     }
   ],
   "quickEditFields": [
diff --git a/schemas/meta/submittable.json b/schemas/meta/submittable.json
index f02772ac5..85c6757bd 100644
--- a/schemas/meta/submittable.json
+++ b/schemas/meta/submittable.json
@@ -9,6 +9,14 @@
       "meta": true,
       "section": "System"
     },
+    {
+      "fieldname": "submittedAt",
+      "label": "Submition Date",
+      "fieldtype": "Datetime",
+      "required": false,
+      "meta": true,
+      "section": "System"
+    },
     {
       "fieldname": "cancelled",
       "label": "Cancelled",
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 800c433b1..ed47d1ec1 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -109,6 +109,32 @@
 
     <!-- Report Issue and DB Switcher -->
     <div class="window-no-drag flex flex-col gap-2 py-2 px-4">
+      <button
+        class="
+          flex
+          text-sm text-gray-600
+          dark:text-gray-500
+          hover:text-gray-800
+          dark:hover:text-gray-400
+          gap-1
+          items-center
+        "
+        @click="toggleProvisionalMode"
+        :title="
+          isProvisionalMode()
+            ? t`Provisional mode since` + ' ' + provisionalModeDate()
+            : ''
+        "
+      >
+        <feather-icon
+          :name="isProvisionalMode() ? 'pause-circle' : 'play-circle'"
+          class="h-4 w-4 flex-shrink-0"
+        />
+        <p>
+          {{ isProvisionalMode() ? t`Provisional mode` : t`Definitive mode` }}
+        </p>
+      </button>
+
       <button
         class="
           flex
@@ -184,7 +210,12 @@
         @click="showDevMode = false"
         title="Open dev tools with Ctrl+Shift+I"
       >
-        dev mode
+        <feather-icon
+          name="hash"
+          class="h-4 w-4 flex-shrink-0"
+          style="display: inline"
+        />
+        hide dev mode
       </p>
     </div>
 
@@ -214,6 +245,7 @@
   </div>
 </template>
 <script lang="ts">
+import { t } from 'fyo';
 import { reportIssue } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
 import { languageDirectionKey, shortcutsKey } from 'src/utils/injectionKeys';
@@ -226,6 +258,7 @@ import router from '../router';
 import Icon from './Icon.vue';
 import Modal from './Modal.vue';
 import ShortcutsHelper from './ShortcutsHelper.vue';
+import { showDialog } from 'src/utils/interactive';
 
 const COMPONENT_NAME = 'Sidebar';
 
@@ -291,6 +324,64 @@ export default defineComponent({
     routeTo,
     reportIssue,
     toggleSidebar,
+    async toggleProvisionalMode() {
+      let title, detail, provisionalModeSince, showUnlimited;
+      if (fyo.singles.SystemSettings?.provisionalModeSince != null) {
+        title = t`Leave provisional mode?`;
+        detail = t`All submissions while provisional mode was effective will be definitive.`;
+        provisionalModeSince = null;
+      } else {
+        title = t`Enter provisional mode?`;
+        detail = t`Documents submission while in provisional mode can be undone.`;
+        provisionalModeSince = new Date();
+        showUnlimited = this.showDevMode;
+      }
+
+      let response = (await showDialog({
+        title,
+        detail,
+        type: 'warning',
+        buttons: [
+          {
+            label: t`Yes`,
+            action() {
+              return true;
+            },
+            isPrimary: true,
+          },
+          {
+            label: t`No`,
+            action() {
+              return false;
+            },
+            isEscape: true,
+          },
+          showUnlimited
+            ? {
+                label: t`Unlimited`,
+                action() {
+                  provisionalModeSince = new Date(0);
+                  return true;
+                },
+                isPrimary: false,
+              }
+            : null,
+        ].filter((x) => x),
+      })) as boolean;
+
+      if (response) {
+        await fyo.singles.SystemSettings?.setAndSync(
+          'provisionalModeSince',
+          provisionalModeSince
+        );
+      }
+    },
+    isProvisionalMode() {
+      return fyo.singles.SystemSettings?.provisionalModeSince != null;
+    },
+    provisionalModeDate() {
+      return fyo.singles.SystemSettings?.provisionalModeSince;
+    },
     openDocumentation() {
       ipc.openLink('https://docs.frappe.io/' + docsPathRef.value);
     },
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index d1a158827..3bc10bcb0 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -193,6 +193,7 @@ export function getActionsForDoc(doc?: Doc): Action[] {
     ...getActions(doc),
     getDuplicateAction(doc),
     getDeleteAction(doc),
+    getSubmitUndoAction(doc),
     getCancelAction(doc),
   ];
 
@@ -234,6 +235,19 @@ export function getGroupedActionsForDoc(doc?: Doc): ActionGroup[] {
   return [grouped, actionsMap['']].flat().filter(Boolean);
 }
 
+function getSubmitUndoAction(doc: Doc): Action {
+  return {
+    label: t`Undo Submit`,
+    component: {
+      template: '<span class="text-red-700">{{ t`Undo Submit` }}</span>',
+    },
+    condition: (doc: Doc) => doc.canUndoSubmit,
+    async action() {
+      await commonDocUndoSubmit(doc);
+    },
+  };
+}
+
 function getCancelAction(doc: Doc): Action {
   return {
     label: t`Cancel`,
@@ -514,6 +528,21 @@ export async function commongDocDelete(
   return true;
 }
 
+export async function commonDocUndoSubmit(doc: Doc): Promise<boolean> {
+  let res = false;
+  try {
+    res = doc.submitUndo();
+  } catch (err) {
+    await handleErrorWithDialog(err as Error, doc);
+  }
+  if (!res) {
+    return false;
+  }
+
+  showActionToast(doc, 'submitUndo');
+  return true;
+}
+
 export async function commonDocCancel(doc: Doc): Promise<boolean> {
   const res = await cancelDocWithPrompt(doc);
   if (!res) {
@@ -726,10 +755,14 @@ function getDocSubmitMessage(doc: Doc): string {
   return details.join(' ');
 }
 
-function showActionToast(doc: Doc, type: 'sync' | 'cancel' | 'delete') {
+function showActionToast(
+  doc: Doc,
+  type: 'submitUndo' | 'sync' | 'cancel' | 'delete'
+) {
   const label = getDocReferenceLabel(doc);
   const message = {
     sync: t`${label} saved`,
+    submitUndo: t`${label} submission undone`,
     cancel: t`${label} cancelled`,
     delete: t`${label} deleted`,
   }[type];

From 0c48611c44278987d05865633db69e2d37a7b44c Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 20 Nov 2024 12:12:56 +0100
Subject: [PATCH 03/11] bugfix: allow vertical scroll in sidebar

---
 src/components/Sidebar.vue | 353 +++++++++++++++++++------------------
 1 file changed, 178 insertions(+), 175 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index ed47d1ec1..e552ba40d 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -14,209 +14,212 @@
       'window-drag': platform !== 'Windows',
     }"
   >
-    <div>
-      <!-- Company name -->
-      <div
-        class="px-4 flex flex-row items-center justify-between mb-4"
-        :class="
-          platform === 'Mac' && languageDirection === 'ltr' ? 'mt-10' : 'mt-2'
-        "
-      >
-        <h6
-          data-testid="company-name"
-          class="
-            font-semibold
-            dark:text-gray-200
-            whitespace-nowrap
-            overflow-auto
-            no-scrollbar
-            select-none
-          "
-        >
-          {{ companyName }}
-        </h6>
-      </div>
-
-      <!-- Sidebar Items -->
-      <div v-for="group in groups" :key="group.label">
+    <div class="flex flex-col justify-between" style="overflow-y: overlay; flex-grow: 1">
+      <div>
+        <!-- Company name -->
         <div
-          class="
-            px-4
-            flex
-            items-center
-            cursor-pointer
-            hover:bg-gray-100
-            dark:hover:bg-gray-875
-            h-10
-          "
+          class="px-4 flex flex-row items-center justify-between mb-4"
           :class="
-            isGroupActive(group) && !group.items
-              ? 'bg-gray-100 dark:bg-gray-875 border-s-4 border-gray-800 dark:border-gray-100'
-              : ''
+            platform === 'Mac' && languageDirection === 'ltr' ? 'mt-10' : 'mt-2'
           "
-          @click="routeToSidebarItem(group)"
         >
-          <Icon
-            class="flex-shrink-0"
-            :name="group.icon"
-            :size="group.iconSize || '18'"
-            :height="group.iconHeight ?? 0"
-            :active="!!isGroupActive(group)"
-            :darkMode="darkMode"
-            :class="isGroupActive(group) && !group.items ? '-ms-1' : ''"
-          />
-          <div
-            class="ms-2 text-lg text-gray-700"
-            :class="
-              isGroupActive(group) && !group.items
-                ? 'text-gray-900 dark:text-gray-25'
-                : 'dark:text-gray-300'
+          <h6
+            data-testid="company-name"
+            class="
+              font-semibold
+              dark:text-gray-200
+              whitespace-nowrap
+              overflow-auto
+              no-scrollbar
+              select-none
             "
           >
-            {{ group.label }}
-          </div>
+            {{ companyName }}
+          </h6>
         </div>
 
-        <!-- Expanded Group -->
-        <div v-if="group.items && isGroupActive(group)">
+        <!-- Sidebar Items -->
+        <div v-for="group in groups" :key="group.label">
           <div
-            v-for="item in group.items"
-            :key="item.label"
             class="
-              text-base
-              h-10
-              ps-10
-              cursor-pointer
+              px-4
               flex
               items-center
+              cursor-pointer
               hover:bg-gray-100
               dark:hover:bg-gray-875
+              h-10
             "
             :class="
-              isItemActive(item)
-                ? 'bg-gray-100 dark:bg-gray-875 text-gray-900 dark:text-gray-100 border-s-4 border-gray-800 dark:border-gray-100'
-                : 'text-gray-700 dark:text-gray-400'
+              isGroupActive(group) && !group.items
+                ? 'bg-gray-100 dark:bg-gray-875 border-s-4 border-gray-800 dark:border-gray-100'
+                : ''
             "
-            @click="routeToSidebarItem(item)"
+            @click="routeToSidebarItem(group)"
           >
-            <p :style="isItemActive(item) ? 'margin-left: -4px' : ''">
-              {{ item.label }}
-            </p>
+            <Icon
+              class="flex-shrink-0"
+              :name="group.icon"
+              :size="group.iconSize || '18'"
+              :height="group.iconHeight ?? 0"
+              :active="!!isGroupActive(group)"
+              :darkMode="darkMode"
+              :class="isGroupActive(group) && !group.items ? '-ms-1' : ''"
+            />
+            <div
+              class="ms-2 text-lg text-gray-700"
+              :class="
+                isGroupActive(group) && !group.items
+                  ? 'text-gray-900 dark:text-gray-25'
+                  : 'dark:text-gray-300'
+              "
+            >
+              {{ group.label }}
+            </div>
+          </div>
+
+          <!-- Expanded Group -->
+          <div v-if="group.items && isGroupActive(group)">
+            <div
+              v-for="item in group.items"
+              :key="item.label"
+              class="
+                text-base
+                h-10
+                ps-10
+                cursor-pointer
+                flex
+                items-center
+                hover:bg-gray-100
+                dark:hover:bg-gray-875
+              "
+              :class="
+                isItemActive(item)
+                  ? 'bg-gray-100 dark:bg-gray-875 text-gray-900 dark:text-gray-100 border-s-4 border-gray-800 dark:border-gray-100'
+                  : 'text-gray-700 dark:text-gray-400'
+              "
+              @click="routeToSidebarItem(item)"
+            >
+              <p :style="isItemActive(item) ? 'margin-left: -4px' : ''">
+                {{ item.label }}
+              </p>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <!-- Report Issue and DB Switcher -->
-    <div class="window-no-drag flex flex-col gap-2 py-2 px-4">
-      <button
-        class="
-          flex
-          text-sm text-gray-600
-          dark:text-gray-500
-          hover:text-gray-800
-          dark:hover:text-gray-400
-          gap-1
-          items-center
-        "
-        @click="toggleProvisionalMode"
-        :title="
-          isProvisionalMode()
-            ? t`Provisional mode since` + ' ' + provisionalModeDate()
-            : ''
-        "
-      >
-        <feather-icon
-          :name="isProvisionalMode() ? 'pause-circle' : 'play-circle'"
-          class="h-4 w-4 flex-shrink-0"
-        />
-        <p>
-          {{ isProvisionalMode() ? t`Provisional mode` : t`Definitive mode` }}
-        </p>
-      </button>
+      <!-- Report Issue and DB Switcher -->
+      <div class="window-no-drag flex flex-col gap-2 py-2 px-4">
+        <button
+          class="
+            flex
+            text-sm text-gray-600
+            dark:text-gray-500
+            hover:text-gray-800
+            dark:hover:text-gray-400
+            gap-1
+            items-center
+          "
+          @click="toggleProvisionalMode"
+          :title="
+            isProvisionalMode()
+              ? t`Provisional mode since` + ' ' + provisionalModeDate()
+              : ''
+          "
+        >
+          <feather-icon
+            :name="isProvisionalMode() ? 'pause-circle' : 'play-circle'"
+            class="h-4 w-4 flex-shrink-0"
+          />
+          <p>
+            {{ isProvisionalMode() ? t`Provisional mode` : t`Definitive mode` }}
+          </p>
+        </button>
 
-      <button
-        class="
-          flex
-          text-sm text-gray-600
-          dark:text-gray-500
-          hover:text-gray-800
-          dark:hover:text-gray-400
-          gap-1
-          items-center
-        "
-        @click="openDocumentation"
-      >
-        <feather-icon name="help-circle" class="h-4 w-4 flex-shrink-0" />
-        <p>
-          {{ t`Help` }}
-        </p>
-      </button>
+        <button
+          class="
+            flex
+            text-sm text-gray-600
+            dark:text-gray-500
+            hover:text-gray-800
+            dark:hover:text-gray-400
+            gap-1
+            items-center
+          "
+          @click="openDocumentation"
+        >
+          <feather-icon name="help-circle" class="h-4 w-4 flex-shrink-0" />
+          <p>
+            {{ t`Help` }}
+          </p>
+        </button>
 
-      <button
-        class="
-          flex
-          text-sm text-gray-600
-          dark:text-gray-500
-          hover:text-gray-800
-          dark:hover:text-gray-400
-          gap-1
-          items-center
-        "
-        @click="viewShortcuts = true"
-      >
-        <feather-icon name="command" class="h-4 w-4 flex-shrink-0" />
-        <p>{{ t`Shortcuts` }}</p>
-      </button>
+        <button
+          class="
+            flex
+            text-sm text-gray-600
+            dark:text-gray-500
+            hover:text-gray-800
+            dark:hover:text-gray-400
+            gap-1
+            items-center
+          "
+          @click="viewShortcuts = true"
+        >
+          <feather-icon name="command" class="h-4 w-4 flex-shrink-0" />
+          <p>{{ t`Shortcuts` }}</p>
+        </button>
 
-      <button
-        data-testid="change-db"
-        class="
-          flex
-          text-sm text-gray-600
-          dark:text-gray-500
-          hover:text-gray-800
-          dark:hover:text-gray-400
-          gap-1
-          items-center
-        "
-        @click="$emit('change-db-file')"
-      >
-        <feather-icon name="database" class="h-4 w-4 flex-shrink-0" />
-        <p>{{ t`Change DB` }}</p>
-      </button>
+        <button
+          data-testid="change-db"
+          class="
+            flex
+            text-sm text-gray-600
+            dark:text-gray-500
+            hover:text-gray-800
+            dark:hover:text-gray-400
+            gap-1
+            items-center
+          "
+          @click="$emit('change-db-file')"
+        >
+          <feather-icon name="database" class="h-4 w-4 flex-shrink-0" />
+          <p>{{ t`Change DB` }}</p>
+        </button>
+
+        <button
+          class="
+            flex
+            text-sm text-gray-600
+            dark:text-gray-500
+            hover:text-gray-800
+            dark:hover:text-gray-400
+            gap-1
+            items-center
+          "
+          @click="() => reportIssue()"
+        >
+          <feather-icon name="flag" class="h-4 w-4 flex-shrink-0" />
+          <p>
+            {{ t`Report Issue` }}
+          </p>
+        </button>
 
-      <button
-        class="
-          flex
-          text-sm text-gray-600
-          dark:text-gray-500
-          hover:text-gray-800
-          dark:hover:text-gray-400
-          gap-1
-          items-center
-        "
-        @click="() => reportIssue()"
-      >
-        <feather-icon name="flag" class="h-4 w-4 flex-shrink-0" />
-        <p>
-          {{ t`Report Issue` }}
+        <p
+          v-if="showDevMode"
+          class="text-xs text-gray-500 select-none cursor-pointer"
+          @click="showDevMode = false"
+          title="Open dev tools with Ctrl+Shift+I"
+        >
+          <feather-icon
+            name="hash"
+            class="h-4 w-4 flex-shrink-0"
+            style="display: inline"
+          />
+          hide dev mode
         </p>
-      </button>
+      </div>
 
-      <p
-        v-if="showDevMode"
-        class="text-xs text-gray-500 select-none cursor-pointer"
-        @click="showDevMode = false"
-        title="Open dev tools with Ctrl+Shift+I"
-      >
-        <feather-icon
-          name="hash"
-          class="h-4 w-4 flex-shrink-0"
-          style="display: inline"
-        />
-        hide dev mode
-      </p>
     </div>
 
     <!-- Hide Sidebar Button -->

From 6e0d9444d76709af38b39bb1264828dc9a2ea466 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 20 Nov 2024 17:02:43 +0100
Subject: [PATCH 04/11] ux: allow to create custom list views

---
 .../baseModels/SidebarEntry/SidebarEntry.ts   | 22 ++++++
 models/index.ts                               |  2 +
 models/types.ts                               |  1 +
 schemas/app/SidebarEntry.json                 | 46 ++++++++++++
 schemas/schemas.ts                            |  2 +
 src/components/Sidebar.vue                    |  6 ++
 src/pages/ListView/ListView.vue               | 19 +++++
 src/utils/sidebarConfig.ts                    | 72 +++++++++++++++++--
 8 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 models/baseModels/SidebarEntry/SidebarEntry.ts
 create mode 100644 schemas/app/SidebarEntry.json

diff --git a/models/baseModels/SidebarEntry/SidebarEntry.ts b/models/baseModels/SidebarEntry/SidebarEntry.ts
new file mode 100644
index 000000000..89d043401
--- /dev/null
+++ b/models/baseModels/SidebarEntry/SidebarEntry.ts
@@ -0,0 +1,22 @@
+import { Doc } from 'fyo/model/doc';
+
+export class SidebarEntry extends Doc {
+  section?: string;
+  route?:   string;
+  model?:   string;
+  filters?: string;
+
+  fullRoute() {
+    switch(this.route) {
+      case '/list':
+        return `/list/${this.model}/${this.name}`;
+      default:
+        return this.route;
+    }
+  }
+
+  parsedFilters() {
+    return JSON.parse(this.filters)
+  }
+}
+
diff --git a/models/index.ts b/models/index.ts
index ed4973b3e..8c06e206e 100644
--- a/models/index.ts
+++ b/models/index.ts
@@ -30,6 +30,7 @@ import { SalesInvoiceItem } from './baseModels/SalesInvoiceItem/SalesInvoiceItem
 import { SalesQuote } from './baseModels/SalesQuote/SalesQuote';
 import { SalesQuoteItem } from './baseModels/SalesQuoteItem/SalesQuoteItem';
 import { SetupWizard } from './baseModels/SetupWizard/SetupWizard';
+import { SidebarEntry } from `./baseModels/SidebarEntry/SidebarEntry`;
 import { Tax } from './baseModels/Tax/Tax';
 import { TaxSummary } from './baseModels/TaxSummary/TaxSummary';
 import { Batch } from './inventory/Batch';
@@ -83,6 +84,7 @@ export const models = {
   SalesQuoteItem,
   SerialNumber,
   SetupWizard,
+  SidebarEntry,
   PrintTemplate,
   Tax,
   TaxSummary,
diff --git a/models/types.ts b/models/types.ts
index 2420b8feb..5cf277ecd 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -23,6 +23,7 @@ export enum ModelNameEnum {
   LoyaltyPointEntry = 'LoyaltyPointEntry',
   CollectionRulesItems = 'CollectionRulesItems',
   CouponCode = 'CouponCode',
+  SidebarEntry = 'SidebarEntry',
 
   AppliedCouponCodes = 'AppliedCouponCodes',
   Payment = 'Payment',
diff --git a/schemas/app/SidebarEntry.json b/schemas/app/SidebarEntry.json
new file mode 100644
index 000000000..c828b0d94
--- /dev/null
+++ b/schemas/app/SidebarEntry.json
@@ -0,0 +1,46 @@
+{
+  "name": "SidebarEntry",
+  "label": "Sidebar Entry",
+  "naming": "manual",
+  "fields": [
+    {
+      "fieldname": "name",
+      "section": "Default",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true,
+      "placeholder": "Entry Name"
+    },
+    {
+      "fieldname": "section",
+      "section": "Default",
+      "label": "Section",
+      "fieldtype": "Data",
+      "required": false
+    },
+    {
+      "fieldname": "route",
+      "section": "Default",
+      "label": "Route",
+      "fieldtype": "Data",
+      "required": true,
+      "default": "/list"
+    },
+    {
+      "fieldname": "model",
+      "section": "Default",
+      "label": "Document Type",
+      "fieldtype": "Data",
+      "required": true,
+      "default": "JournalEntry"
+    },
+    {
+      "fieldname": "filters",
+      "section": "Default",
+      "label": "Filters",
+      "fieldtype": "Data",
+      "required": true,
+      "default": "{}"
+    }
+  ]
+}
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index f3d56c23c..8c8e83f8f 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -48,6 +48,7 @@ import PurchaseReceiptItem from './app/inventory/PurchaseReceiptItem.json';
 import SerialNumber from './app/inventory/SerialNumber.json';
 import Shipment from './app/inventory/Shipment.json';
 import ShipmentItem from './app/inventory/ShipmentItem.json';
+import SidebarEntry from './app/SidebarEntry.json';
 import StockLedgerEntry from './app/inventory/StockLedgerEntry.json';
 import StockMovement from './app/inventory/StockMovement.json';
 import StockMovementItem from './app/inventory/StockMovementItem.json';
@@ -92,6 +93,7 @@ export const appSchemas: Schema[] | SchemaStub[] = [
   SetupWizard as Schema,
   GetStarted as Schema,
   PrintTemplate as Schema,
+  SidebarEntry as Schema,
 
   Color as Schema,
   Currency as Schema,
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index e552ba40d..68801fac7 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -318,6 +318,9 @@ export default defineComponent({
     });
     this.shortcuts?.set(COMPONENT_NAME, ['F1'], () => this.openDocumentation());
 
+    fyo.doc.observer.on('sync:SidebarEntry', async () => await this.refreshSidebar())
+    fyo.doc.observer.on('delete:SidebarEntry', async () => await this.refreshSidebar())
+
     this.showDevMode = this.fyo.store.isDevelopment;
   },
   unmounted() {
@@ -327,6 +330,9 @@ export default defineComponent({
     routeTo,
     reportIssue,
     toggleSidebar,
+    async refreshSidebar(){
+      this.groups = await getSidebarConfig()
+    },
     async toggleProvisionalMode() {
       let title, detail, provisionalModeSince, showUnlimited;
       if (fyo.singles.SystemSettings?.provisionalModeSince != null) {
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 11ce00107..d8723d9f4 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="flex flex-col">
     <PageHeader :title="title">
+      <Button ref="saveViewButton" :icon="false" @click="saveView">
+        {{ t`Save view` }}
+      </Button>
       <Button ref="exportButton" :icon="false" @click="openExportModal = true">
         {{ t`Export` }}
       </Button>
@@ -44,6 +47,8 @@
 </template>
 <script lang="ts">
 import { Field } from 'schemas/types';
+import { ModelNameEnum } from 'models/types';
+import { SidebarEntry } from 'models/baseModels/SidebarEntry/SidebarEntry'
 import Button from 'src/components/Button.vue';
 import ExportWizard from 'src/components/ExportWizard.vue';
 import FilterDropdown from 'src/components/FilterDropdown.vue';
@@ -167,6 +172,20 @@ export default defineComponent({
     applyFilter(filters: QueryFilter) {
       this.list?.updateData(filters);
     },
+    async saveView() {
+      const data = {
+        route: '/list',
+        model: this.schemaName,
+        filters: JSON.stringify(this.listFilters)
+      }
+      let entry = fyo.doc.getNewDoc(ModelNameEnum.SidebarEntry, data) as SidebarEntry;
+
+      const { openQuickEdit } = await import('src/utils/ui');
+      await openQuickEdit({
+        doc: entry,
+        showFields: ['section']
+      });
+    },
   },
 });
 
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 8268e69e8..de009411f 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -3,8 +3,9 @@ import { routeFilters } from 'src/utils/filters';
 import { fyo } from '../initFyo';
 import { SidebarConfig, SidebarItem, SidebarRoot } from './types';
 
-export function getSidebarConfig(): SidebarConfig {
-  const sideBar = getCompleteSidebar();
+export async function getSidebarConfig(): SidebarConfig {
+  let sideBar = await getCompleteSidebar();
+  sideBar = await addCustomSidebarEntries(sideBar);
   return getFilteredSidebar(sideBar);
 }
 
@@ -146,7 +147,7 @@ function getReportSidebar() {
   };
 }
 
-function getCompleteSidebar(): SidebarConfig {
+async function getCompleteSidebar(): SidebarConfig {
   return [
     {
       label: t`Get Started`,
@@ -341,12 +342,75 @@ function getCompleteSidebar(): SidebarConfig {
           hidden: () =>
             !fyo.singles.AccountingSettings?.enableFormCustomization,
         },
+        {
+          label: t`Extra Sidebar Entries`,
+          name: 'sidebar-entries',
+          route: `/list/SidebarEntry`
+        },
         {
           label: t`Settings`,
           name: 'settings',
           route: '/settings',
         },
       ] as SidebarItem[],
-    },
+    }
   ].flat();
 }
+
+async function addCustomSidebarEntries(sidebar: SidebarConfig): SidebarConfig {
+  let entries = await fyo.db.getAll('SidebarEntry', {
+    fields: ['name', 'section', 'route'],
+  })
+
+  for(let [i, _ent] of Object.entries(entries)) {
+    if (_ent.section) continue
+
+    let ent = await fyo.doc.getDoc('SidebarEntry', _ent.name) as SidebarEntry
+
+    sidebar = [{
+      label: ent.name,
+      route: ent.fullRoute() || `/list/JournalEntry/${ent.name}`,
+      name: `section-${i}`,
+      icon: 'common-entries',
+      filters: ent.parsedFilters(),
+      items: [],
+    } as SidebarItem, ...sidebar]
+  }
+
+  for(let [i, _ent] of Object.entries(entries)) {
+    if (!_ent.section) continue
+
+    let ent = await fyo.doc.getDoc('SidebarEntry', _ent.name) as SidebarEntry
+
+    let item: SidebarItem = {
+      label: ent.name,
+      route: ent.fullRoute() || `/list/JournalEntry/${ent.name}`,
+      filters: ent.parsedFilters(),
+    } as SidebarItem
+
+    let inserted = false
+    for (let section of sidebar) {
+      if (section.label == ent.section || section.name == ent.section) {
+        inserted = true
+        item.name = `${section.name}-entry-${i}`
+        section.items = [...section.items, item]
+        continue
+      }
+    }
+
+    if (!inserted) {
+      item.name = `section-${i}-entry-${i}`
+      sidebar = [{
+        label: ent.section,
+        name:  `section-${i}`,
+        icon: 'common-entries',
+        route: item.route,
+        filters: item.filters,
+        items: [ item ]
+      } as SidebarItem, ...sidebar]
+    }
+
+  }
+
+  return sidebar;
+}

From 8357488b88a08da0bd0148b7179123912672cf6a Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 20 Nov 2024 19:43:14 +0100
Subject: [PATCH 05/11] ux: allow to view attached files directly

---
 main.ts                                 | 26 +++++++++++-----
 main/preload.ts                         |  4 +++
 main/registerIpcMainMessageListeners.ts | 41 ++++++++++++++++++++++++-
 src/components/Controls/Attachment.vue  | 20 ++++++++++++
 utils/messages.ts                       |  1 +
 5 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/main.ts b/main.ts
index 23140d29a..7da73673c 100644
--- a/main.ts
+++ b/main.ts
@@ -6,6 +6,7 @@ require('source-map-support').install({
 
 import { emitMainProcessError } from 'backend/helpers';
 import {
+  shell,
   app,
   BrowserWindow,
   BrowserWindowConstructorOptions,
@@ -22,6 +23,17 @@ import registerIpcMainActionListeners from './main/registerIpcMainActionListener
 import registerIpcMainMessageListeners from './main/registerIpcMainMessageListeners';
 import registerProcessListeners from './main/registerProcessListeners';
 
+const EXTENSIONS = {
+  '.js': 'text/javascript',
+  '.css': 'text/css',
+  '.html': 'text/html',
+  '.svg': 'image/svg+xml',
+  '.json': 'application/json',
+  '.pdf': 'application/pdf',
+}
+
+const MIME_TYPES = Object.fromEntries(Object.entries(EXTENSIONS).map(([ext, mime]) => [mime, ext]))
+
 export class Main {
   title = 'Frappe Books';
   icon: string;
@@ -119,6 +131,11 @@ export class Main {
     const options = this.getOptions();
     this.mainWindow = new BrowserWindow(options);
 
+    this.mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+      shell.openExternal(url);
+      return { action: 'deny' };
+    });
+
     if (this.isDevelopment) {
       this.setViteServerURL();
     } else {
@@ -189,14 +206,7 @@ function bufferProtocolCallback(
 
   fs.readFile(filePath, (_, data) => {
     const extension = path.extname(filePath).toLowerCase();
-    const mimeType =
-      {
-        '.js': 'text/javascript',
-        '.css': 'text/css',
-        '.html': 'text/html',
-        '.svg': 'image/svg+xml',
-        '.json': 'application/json',
-      }[extension] ?? '';
+    const mimeType = EXTENSIONS[extension] ?? '';
 
     callback({ mimeType, data });
   });
diff --git a/main/preload.ts b/main/preload.ts
index 0e4892842..7bde21d2b 100644
--- a/main/preload.ts
+++ b/main/preload.ts
@@ -117,6 +117,10 @@ const ipc = {
     ipcRenderer.send(IPC_MESSAGES.OPEN_EXTERNAL, link);
   },
 
+  openDataURL(link: string, filename: string) {
+    ipcRenderer.send(IPC_MESSAGES.OPEN_DATA_URL, {link, filename});
+  },
+
   async deleteFile(filePath: string) {
     return (await ipcRenderer.invoke(
       IPC_ACTIONS.DELETE_FILE,
diff --git a/main/registerIpcMainMessageListeners.ts b/main/registerIpcMainMessageListeners.ts
index 909bc38cf..4b24ca223 100644
--- a/main/registerIpcMainMessageListeners.ts
+++ b/main/registerIpcMainMessageListeners.ts
@@ -1,8 +1,36 @@
-import { ipcMain, Menu, shell } from 'electron';
+import { ipcMain, Menu, shell, app } from 'electron';
+import fs from 'fs';
+import path from 'path';
 import { Main } from '../main';
 import { IPC_MESSAGES } from '../utils/messages';
 import { emitMainProcessError } from 'backend/helpers';
 
+function parseDataURL(url) {
+  const regex = /^data:([a-z]+\/[a-z0-9-+.]+(;[a-z0-9-.!#$%*+.{}|~`]+=[a-z0-9-.!#$%*+.{}()_|~`]+)*)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s<>]*?)$/i;
+
+  const parts = url.trim().match(regex);
+  if (!parts) return null
+
+  const parsed = {};
+
+  parsed.mediaType = (parts[1] || 'text/plain;charset=us-ascii').toLowerCase();
+
+  const mediaTypeParts = parsed.mediaType.split(';').map(x => x.toLowerCase());
+  parsed.contentType = mediaTypeParts[0];
+
+  mediaTypeParts.slice(1).forEach((attribute) => {
+    const p = attribute.split('=');
+    parsed[p[0]] = p[1];
+  });
+
+  parsed.base64   = !!parts[parts.length - 2];
+  parsed.data     = parts[parts.length - 1] || '';
+  parsed.encoding = parsed.base64 ? 'base64' : 'utf8';
+  parsed.buffer   = Buffer.from(parsed.base64 ? parsed.data : decodeURIComponent(parsed.data), parsed.encoding)
+
+  return parsed;
+}
+
 export default function registerIpcMainMessageListeners(main: Main) {
   ipcMain.on(IPC_MESSAGES.OPEN_MENU, (event) => {
     if (event.sender === null) {
@@ -49,6 +77,17 @@ export default function registerIpcMainMessageListeners(main: Main) {
     shell.openExternal(link).catch((err) => emitMainProcessError(err));
   });
 
+  ipcMain.on(IPC_MESSAGES.OPEN_DATA_URL, (_, {link, filename}: {link: string, filename: string}) => {
+    let data = parseDataURL(link)
+    if (data) {
+      const s = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+      const temp = Array.apply(null, Array(16)).map(function() { return s.charAt(Math.floor(Math.random() * s.length)); }).join('');
+      const filepath = path.join(app.getPath("temp"), temp + ' ' + filename)
+      fs.writeFileSync(filepath, data.buffer)
+      shell.openPath(filepath)
+    }
+  });
+
   ipcMain.on(IPC_MESSAGES.SHOW_ITEM_IN_FOLDER, (_, filePath: string) => {
     return shell.showItemInFolder(filePath);
   });
diff --git a/src/components/Controls/Attachment.vue b/src/components/Controls/Attachment.vue
index 06d355a2a..1747b6776 100644
--- a/src/components/Controls/Attachment.vue
+++ b/src/components/Controls/Attachment.vue
@@ -33,6 +33,14 @@
           />
         </button>
 
+        <!-- Open Button -->
+        <button v-if="value" class="p-0.5 rounded" @click="open">
+          <FeatherIcon
+            name="eye"
+            class="h-4 w-4 text-gray-600 dark:text-gray-400"
+          />
+        </button>
+
         <!-- Download Button -->
         <button v-if="value" class="p-0.5 rounded" @click="download">
           <FeatherIcon
@@ -125,6 +133,18 @@ export default defineComponent({
       a.click();
       document.body.removeChild(a);
     },
+    open() {
+      if (!this.value) {
+        return;
+      }
+
+      const { name, data } = this.value;
+      if (!name || !data) {
+        return;
+      }
+
+      ipc.openDataURL(data, name)
+    },
     async selectFile(e: Event) {
       const target = e.target as HTMLInputElement;
       const file = target.files?.[0];
diff --git a/utils/messages.ts b/utils/messages.ts
index 601a94ce6..f52bd87b9 100644
--- a/utils/messages.ts
+++ b/utils/messages.ts
@@ -3,6 +3,7 @@ export enum IPC_MESSAGES {
   OPEN_MENU = 'open-menu',
   OPEN_SETTINGS = 'open-settings',
   OPEN_EXTERNAL = 'open-external',
+  OPEN_DATA_URL = 'open-data-url',
   SHOW_ITEM_IN_FOLDER = 'show-item-in-folder',
   RELOAD_MAIN_WINDOW = 'reload-main-window',
   MINIMIZE_MAIN_WINDOW = 'minimize-main-window',

From 769f73fe555d63766903c24f43b8e3b838338784 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 20 Nov 2024 22:33:33 +0100
Subject: [PATCH 06/11] feat: add opening balances to general ledger report

---
 reports/GeneralLedger/GeneralLedger.ts | 115 +++++++++++++++++++++----
 reports/LedgerReport.ts                |   7 +-
 2 files changed, 102 insertions(+), 20 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 1752c9933..26a1bc437 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -27,6 +27,7 @@ export class GeneralLedger extends LedgerReport {
   usePagination = true;
   loading = false;
 
+  includeOpenings = true;
   ascending = false;
   reverted = false;
   referenceType: ReferenceType = 'All';
@@ -52,7 +53,60 @@ export class GeneralLedger extends LedgerReport {
       sort = false;
     }
 
-    const map = this._getGroupedMap(sort);
+    let reportData = this._rawData
+    let mapOpenings: GroupedMap
+    let openingCredit = 0
+    let openingDebit = 0
+    if (this.fromDate && this.includeOpenings) {
+      let fromDate = new Date(this.fromDate)
+      reportData = []
+      let openingData = []
+      for(let entry of this._rawData) {
+        if (entry.date < fromDate) {
+          openingData.push(entry)
+        } else {
+          reportData.push(entry)
+        }
+      }
+
+      mapOpenings = this._getGroupedMap(sort, null, openingData);
+      this._setIndexOnEntries(mapOpenings);
+      this._getTotalsAndSetBalance(mapOpenings);
+
+      // console.log({rawData: this._rawData, openingData, reportData})
+    }
+
+    const map = this._getGroupedMap(sort, null, reportData);
+
+    if (mapOpenings) {
+      for (const key of mapOpenings.keys()) {
+        let {balance, debit, credit} = this._getBalance(mapOpenings.get(key)!)
+
+        openingDebit += debit
+        openingCredit += credit
+
+        console.log(this.groupBy, key, balance, debit, credit)
+
+        if (this.groupBy !== 'none') {
+          map.get(key)?.unshift({
+            name: -1, // Italics
+            account: t`Opening`,
+            date: null,
+            debit,
+            credit,
+            balance: debit - credit,
+            referenceType: '',
+            referenceName: '',
+            party: '',
+            reverted: false,
+            reverts: '',
+          });
+        }
+      }
+    }
+
+    console.log(map, openingCredit, openingDebit)
+
     this._setIndexOnEntries(map);
     const { totalDebit, totalCredit } = this._getTotalsAndSetBalance(map);
     const consolidated = this._consolidateEntries(map);
@@ -64,6 +118,22 @@ export class GeneralLedger extends LedgerReport {
       this._pushBlankEntry(consolidated);
     }
 
+    if (this.groupBy === 'none') {
+      consolidated.unshift({
+        name: -2, // Bold
+        account: t`Opening`,
+        date: null,
+        debit: openingDebit,
+        credit: openingCredit,
+        balance: openingDebit - openingCredit,
+        referenceType: '',
+        referenceName: '',
+        party: '',
+        reverted: false,
+        reverts: '',
+      })
+    }
+
     /**
      * Set the closing row
      */
@@ -71,9 +141,9 @@ export class GeneralLedger extends LedgerReport {
       name: -2, // Bold
       account: t`Closing`,
       date: null,
-      debit: totalDebit,
-      credit: totalCredit,
-      balance: totalDebit - totalCredit,
+      debit: openingDebit + totalDebit,
+      credit: openingCredit + totalCredit,
+      balance: openingDebit + totalDebit - openingCredit - totalCredit,
       referenceType: '',
       referenceName: '',
       party: '',
@@ -192,23 +262,29 @@ export class GeneralLedger extends LedgerReport {
     });
   }
 
+  _getBalance(entries) {
+    let balance = 0;
+    let debit = 0;
+    let credit = 0;
+
+    for (const entry of entries) {
+      debit += entry.debit!;
+      credit += entry.credit!;
+
+      const diff = entry.debit! - entry.credit!;
+      balance += diff;
+      entry.balance = balance;
+    }
+
+    return {balance, debit, credit}
+  }
+
   _getTotalsAndSetBalance(map: GroupedMap) {
     let totalDebit = 0;
     let totalCredit = 0;
 
     for (const key of map.keys()) {
-      let balance = 0;
-      let debit = 0;
-      let credit = 0;
-
-      for (const entry of map.get(key)!) {
-        debit += entry.debit!;
-        credit += entry.credit!;
-
-        const diff = entry.debit! - entry.credit!;
-        balance += diff;
-        entry.balance = balance;
-      }
+      let {balance, debit, credit} = this._getBalance(map.get(key)!)
 
       /**
        * Total row incase groupBy is used
@@ -261,7 +337,7 @@ export class GeneralLedger extends LedgerReport {
       (filters.date as string[]).push('<=', this.toDate as string);
     }
 
-    if (this.fromDate) {
+    if (!this.includeOpenings && this.fromDate) {
       filters.date ??= [];
       (filters.date as string[]).push('>=', this.fromDate as string);
     }
@@ -352,6 +428,11 @@ export class GeneralLedger extends LedgerReport {
         label: t`Ascending Order`,
         fieldname: 'ascending',
       },
+      {
+        fieldtype: 'Check',
+        label: t`Include Openings`,
+        fieldname: 'includeOpenings',
+      },
     ] as Field[];
   }
 
diff --git a/reports/LedgerReport.ts b/reports/LedgerReport.ts
index fd4b2e9ae..9254bbf76 100644
--- a/reports/LedgerReport.ts
+++ b/reports/LedgerReport.ts
@@ -43,13 +43,14 @@ export abstract class LedgerReport extends Report {
     return groupBy;
   }
 
-  _getGroupedMap(sort: boolean, groupBy?: GroupByKey): GroupedMap {
+  _getGroupedMap(sort: boolean, groupBy?: GroupByKey, data?: LedgerEntry[]): GroupedMap {
     groupBy ??= this._getGroupByKey();
+    data    ??= this._rawData
     /**
      * Sort rows by ascending or descending
      */
     if (sort) {
-      this._rawData.sort((a, b) => {
+      data.sort((a, b) => {
         if (this.ascending) {
           return +a.date! - +b.date!;
         }
@@ -63,7 +64,7 @@ export abstract class LedgerReport extends Report {
      * ∴ presorting maintains grouping order
      */
     const map: GroupedMap = new Map();
-    for (const entry of this._rawData) {
+    for (const entry of data) {
       const groupingKey = entry[groupBy];
       if (!map.has(groupingKey)) {
         map.set(groupingKey, []);

From c3916b4975f2a4d24b5f2aa68768057f05c86fbf Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Thu, 21 Nov 2024 03:44:34 +0100
Subject: [PATCH 07/11] ux: better selection of time periods for reports

---
 reports/AccountReport.ts               | 164 ++++++++++----
 reports/GeneralLedger/GeneralLedger.ts |   4 +
 reports/TrialBalance/TrialBalance.ts   | 185 +++++++++------
 src/components/Controls/DatePeriod.vue | 302 +++++++++++++++++++++++++
 src/pages/Report.vue                   |  22 +-
 5 files changed, 573 insertions(+), 104 deletions(-)
 create mode 100644 src/components/Controls/DatePeriod.vue

diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index ad4e05910..5d057364e 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -47,7 +47,15 @@ export abstract class AccountReport extends LedgerReport {
 
   accountMap?: Record<string, Account>;
 
+  get acceptSingleTimePeriod() {
+    return true;
+  }
+
   async setDefaultFilters(): Promise<void> {
+    if (this.basedOn === 'Period' && !this.toDate) {
+      this.toDate = DateTime.now().plus({ days: 1 }).toISODate();
+    }
+
     if (this.basedOn === 'Until Date' && !this.toDate) {
       this.toDate = DateTime.now().plus({ days: 1 }).toISODate();
     }
@@ -57,6 +65,11 @@ export abstract class AccountReport extends LedgerReport {
       this.toYear = this.fromYear + 1;
     }
 
+    if (this.basedOn === 'Period' && !this.fromDate) {
+      this.fromDate = DateTime.now().plus({ days: 1 }).minus({month: 1}).toISODate();
+      this.count = 3
+    }
+
     await this._setDateRanges();
   }
 
@@ -255,47 +268,90 @@ export abstract class AccountReport extends LedgerReport {
     const fromDate = DateTime.fromISO(endpoints.fromDate);
     const toDate = DateTime.fromISO(endpoints.toDate);
 
-    if (this.consolidateColumns) {
-      return [
+    if (this.basedOn === 'Period') {
+
+      const dateRanges: DateRange[] = [
         {
           toDate,
           fromDate,
         },
       ];
-    }
 
-    const months: number = monthsMap[this.periodicity];
-    const dateRanges: DateRange[] = [
-      {
-        toDate,
-        fromDate: this._fixMonthsJump(toDate, toDate.minus({ months })),
-      },
-    ];
+      const interval = toDate.diff(fromDate, ['years', 'months', 'days'])
+      const count = this.count ?? 1;
+
+      for (let i = 1; i < count; i++) {
+        const lastRange = dateRanges.at(-1)!;
+        dateRanges.push({
+          toDate: lastRange.fromDate,
+          fromDate: this._fixMonthsJump(
+            toDate,
+            lastRange.fromDate.minus(interval)
+          ),
+        });
+      }
 
-    let count = this.count ?? 1;
-    if (this.basedOn === 'Fiscal Year') {
-      count = Math.ceil(((this.toYear! - this.fromYear!) * 12) / months);
-    }
+      if (this.consolidateColumns) {
+        const firstRange = dateRanges.at(0)!;
+        const lastRange = dateRanges.at(-1)!;
+        return [
+          {
+            toDate: firstRange.toDate,
+            fromDate: lastRange.fromDate,
+          },
+        ];
+      }
+
+      return dateRanges
 
-    for (let i = 1; i < count; i++) {
-      const lastRange = dateRanges.at(-1)!;
-      dateRanges.push({
-        toDate: lastRange.fromDate,
-        fromDate: this._fixMonthsJump(
+    } else {
+
+      if (this.consolidateColumns) {
+        return [
+          {
+            toDate,
+            fromDate,
+          },
+        ];
+      }
+
+      const months: number = monthsMap[this.periodicity];
+      const interval = {months}
+      const dateRanges: DateRange[] = [
+        {
           toDate,
-          lastRange.fromDate.minus({ months })
-        ),
-      });
-    }
+          fromDate: this._fixMonthsJump(toDate, toDate.minus(interval)),
+        },
+      ];
+
+      let count = this.count ?? 1;
+      if (this.basedOn === 'Fiscal Year') {
+        count = Math.ceil(((this.toYear! - this.fromYear!) * 12) / months);
+      }
 
-    return dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
+      for (let i = 1; i < count; i++) {
+        const lastRange = dateRanges.at(-1)!;
+        dateRanges.push({
+          toDate: lastRange.fromDate,
+          fromDate: this._fixMonthsJump(
+            toDate,
+            lastRange.fromDate.minus({ months })
+          ),
+        });
+      }
+
+      return dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
+    }
   }
 
   async _getFromAndToDates() {
     let toDate: string;
     let fromDate: string;
 
-    if (this.basedOn === 'Until Date') {
+    if (this.basedOn === 'Period') {
+      toDate = DateTime.fromISO(this.toDate!).plus({ days: 1 }).toISODate();
+      fromDate = this.fromDate;
+    } else if (this.basedOn === 'Until Date') {
       toDate = DateTime.fromISO(this.toDate!).plus({ days: 1 }).toISODate();
       const months = monthsMap[this.periodicity] * Math.max(this.count ?? 1, 1);
       fromDate = DateTime.fromISO(this.toDate!).minus({ months }).toISODate();
@@ -339,24 +395,30 @@ export abstract class AccountReport extends LedgerReport {
         options: [
           { label: t`Fiscal Year`, value: 'Fiscal Year' },
           { label: t`Until Date`, value: 'Until Date' },
+          { label: t`Period`, value: 'Period' },
         ],
         label: t`Based On`,
         fieldname: 'basedOn',
       },
-      {
-        fieldtype: 'Select',
-        options: [
-          { label: t`Monthly`, value: 'Monthly' },
-          { label: t`Quarterly`, value: 'Quarterly' },
-          { label: t`Half Yearly`, value: 'Half Yearly' },
-          { label: t`Yearly`, value: 'Yearly' },
-        ],
-        label: t`Periodicity`,
-        fieldname: 'periodicity',
-      },
-      ,
     ] as Field[];
 
+    let periodicityFilters = [] as Field[];
+    if (this.basedOn !== 'Period') {
+      periodicityFilters = [
+        {
+          fieldtype: 'Select',
+          options: [
+            { label: t`Monthly`, value: 'Monthly' },
+            { label: t`Quarterly`, value: 'Quarterly' },
+            { label: t`Half Yearly`, value: 'Half Yearly' },
+            { label: t`Yearly`, value: 'Yearly' },
+          ],
+          label: t`Periodicity`,
+          fieldname: 'periodicity',
+        },
+      ] as Field[];
+    }
+
     let dateFilters = [
       {
         fieldtype: 'Int',
@@ -376,7 +438,32 @@ export abstract class AccountReport extends LedgerReport {
       },
     ] as Field[];
 
-    if (this.basedOn === 'Until Date') {
+    if (this.basedOn === 'Period') {
+      dateFilters = [
+        {
+          fieldtype: 'Date',
+          fieldname: 'fromDate',
+          placeholder: t`From Date`,
+          label: t`From Date`,
+          required: true,
+        },
+        {
+          fieldtype: 'Date',
+          fieldname: 'toDate',
+          placeholder: t`To Date`,
+          label: t`To Date`,
+          required: true,
+        },
+        {
+          fieldtype: 'Int',
+          fieldname: 'count',
+          minvalue: 1,
+          placeholder: t`Number of periods`,
+          label: t`Number of periods`,
+          required: true,
+        },
+      ] as Field[];
+    } else if (this.basedOn === 'Until Date') {
       dateFilters = [
         {
           fieldtype: 'Date',
@@ -398,6 +485,7 @@ export abstract class AccountReport extends LedgerReport {
 
     return [
       filters,
+      periodicityFilters,
       dateFilters,
       {
         fieldtype: 'Check',
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 26a1bc437..f6ed7bfaa 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -34,6 +34,10 @@ export class GeneralLedger extends LedgerReport {
   groupBy: 'none' | 'party' | 'account' | 'referenceName' = 'none';
   _rawData: LedgerEntry[] = [];
 
+  get acceptSingleTimePeriod() {
+    return true;
+  }
+
   constructor(fyo: Fyo) {
     super(fyo);
   }
diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts
index 24e98cc5c..623ae2f3b 100644
--- a/reports/TrialBalance/TrialBalance.ts
+++ b/reports/TrialBalance/TrialBalance.ts
@@ -35,6 +35,7 @@ export class TrialBalance extends AccountReport {
 
   fromDate?: string;
   toDate?: string;
+  showOnlyBalance = false;
   hideGroupAmounts = false;
   loading = false;
 
@@ -43,6 +44,10 @@ export class TrialBalance extends AccountReport {
 
   accountMap?: Record<string, Account>;
 
+  get acceptSingleTimePeriod() {
+    return true;
+  }
+
   get rootTypes(): AccountRootType[] {
     return [
       AccountRootTypeEnum.Asset,
@@ -165,20 +170,32 @@ export class TrialBalance extends AccountReport {
       const map = al.valueMap?.get(k);
       const hide = this.hideGroupAmounts && al.isGroup;
 
-      return [
-        {
-          rawValue: map?.debit ?? 0,
-          value: hide ? '' : this.fyo.format(map?.debit ?? 0, 'Currency'),
-          align: 'right',
-          width: ACC_BAL_WIDTH,
-        },
-        {
-          rawValue: map?.credit ?? 0,
-          value: hide ? '' : this.fyo.format(map?.credit ?? 0, 'Currency'),
-          align: 'right',
-          width: ACC_BAL_WIDTH,
-        } as ReportCell,
-      ];
+      if (this.showOnlyBalance) {
+        const balance = (map?.debit ?? 0) - (map?.credit ?? 0)
+        return [
+          {
+            rawValue: balance,
+            value: hide ? '' : this.fyo.format(balance, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          } as ReportCell,
+        ];
+      } else {
+        return [
+          {
+            rawValue: map?.debit ?? 0,
+            value: hide ? '' : this.fyo.format(map?.debit ?? 0, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          },
+          {
+            rawValue: map?.credit ?? 0,
+            value: hide ? '' : this.fyo.format(map?.credit ?? 0, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          } as ReportCell,
+        ];
+      }
     });
 
     return {
@@ -231,61 +248,99 @@ export class TrialBalance extends AccountReport {
         fieldtype: 'Check',
         label: t`Hide Group Amounts`,
         fieldname: 'hideGroupAmounts',
+      },
+      {
+        fieldtype: 'Check',
+        label: t`Show Balance`,
+        fieldname: 'showOnlyBalance',
       } as Field,
     ] as Field[];
   }
 
   getColumns(): ColumnField[] {
-    return [
-      {
-        label: t`Account`,
-        fieldtype: 'Link',
-        fieldname: 'account',
-        align: 'left',
-        width: ACC_NAME_WIDTH,
-      },
-      {
-        label: t`Opening (Dr)`,
-        fieldtype: 'Data',
-        fieldname: 'openingDebit',
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      },
-      {
-        label: t`Opening (Cr)`,
-        fieldtype: 'Data',
-        fieldname: 'openingCredit',
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      },
-      {
-        label: t`Debit`,
-        fieldtype: 'Data',
-        fieldname: 'debit',
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      },
-      {
-        label: t`Credit`,
-        fieldtype: 'Data',
-        fieldname: 'credit',
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      },
-      {
-        label: t`Closing (Dr)`,
-        fieldtype: 'Data',
-        fieldname: 'closingDebit',
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      },
-      {
-        label: t`Closing (Cr)`,
-        fieldtype: 'Data',
-        fieldname: 'closingCredit',
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      },
-    ] as ColumnField[];
+    if (this.showOnlyBalance) {
+      return [
+        {
+          label: t`Account`,
+          fieldtype: 'Link',
+          fieldname: 'account',
+          align: 'left',
+          width: ACC_NAME_WIDTH,
+        },
+        {
+          label: t`Opening`,
+          fieldtype: 'Data',
+          fieldname: 'openingBalance',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Balance`,
+          fieldtype: 'Data',
+          fieldname: 'balance',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Closing`,
+          fieldtype: 'Data',
+          fieldname: 'closingBalance',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+      ] as ColumnField[];
+    } else {
+      return [
+        {
+          label: t`Account`,
+          fieldtype: 'Link',
+          fieldname: 'account',
+          align: 'left',
+          width: ACC_NAME_WIDTH,
+        },
+        {
+          label: t`Opening (Dr)`,
+          fieldtype: 'Data',
+          fieldname: 'openingDebit',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Opening (Cr)`,
+          fieldtype: 'Data',
+          fieldname: 'openingCredit',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Debit`,
+          fieldtype: 'Data',
+          fieldname: 'debit',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Credit`,
+          fieldtype: 'Data',
+          fieldname: 'credit',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Closing (Dr)`,
+          fieldtype: 'Data',
+          fieldname: 'closingDebit',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          label: t`Closing (Cr)`,
+          fieldtype: 'Data',
+          fieldname: 'closingCredit',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+      ] as ColumnField[];
+    }
   }
 }
diff --git a/src/components/Controls/DatePeriod.vue b/src/components/Controls/DatePeriod.vue
new file mode 100644
index 000000000..921d723d7
--- /dev/null
+++ b/src/components/Controls/DatePeriod.vue
@@ -0,0 +1,302 @@
+<style scoped>
+  .dropdown1 :deep(button) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .dropdown2 :deep(button), .btn-left :deep(button), .date-start :deep(.rounded), .date-stop :deep(.rounded) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .btn-right :deep(button) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .date-start, .date-stop {
+    width: 8rem;
+  }
+  .date-start :deep(input + div), .date-stop :deep(input + div),
+  .date-start :deep(input), .date-stop :deep(input) {
+    height: 2rem;
+    --tw-text-opacity: 1;
+    color: rgba(82, 82, 82, var(--tw-text-opacity));
+    --tw-bg-opacity: 1;
+    background-color: rgba(237, 237, 237, var(--tw-bg-opacity));
+  }
+
+</style>
+<template>
+  <div style="
+      display: flex;
+      "
+    class = "
+      flex
+      "
+    >
+    <div class="dropdown1">
+      <Dropdown ref="dropdownPeriod" class="text-sm" :items="periodOptions" right>
+        <template
+          #default="{
+            toggleDropdown,
+            highlightItemUp,
+            highlightItemDown,
+            selectHighlightedItem,
+          }"
+          >
+          <Button icon
+            @click="toggleDropdown()"
+            @keydown.down="highlightItemDown"
+            @keydown.up="highlightItemUp"
+            @keydown.enter="selectHighlightedItem"
+            >
+            {{ periodSelectorMap?.[value] ?? value }}
+            <feather-icon name="chevron-down" class="ms-1 w-3 h-3" />
+          </Button>
+        </template>
+      </Dropdown>
+    </div>
+    <div class="dropdown2"
+      :value="value"
+      :class="{
+        'hidden': value == 'custom'
+      }"
+      >
+      <Dropdown ref="dropdownAnchor" class="text-sm" :items="anchorOptions" right>
+        <template
+          #default="{
+            toggleDropdown,
+            highlightItemUp,
+            highlightItemDown,
+            selectHighlightedItem,
+          }"
+          >
+          <Button icon
+            @click="toggleDropdown()"
+            @keydown.down="highlightItemDown"
+            @keydown.up="highlightItemUp"
+            @keydown.enter="selectHighlightedItem"
+            >
+            {{ anchorSelectorMap?.[anchorValue] ?? anchorValue }}
+            <feather-icon name="chevron-down" class="ms-1 w-3 h-3" />
+          </Button>
+        </template>
+      </Dropdown>
+    </div>
+    <div class="btn-left">
+      <Button icon @click="prev"><feather-icon name="chevron-left" class="ms-1 w-3 h-3" /></Button>
+    </div>
+    <div class="date-start">
+      <DateComp :df="startDateField" :value="startDate.toISODate()" @change="changeStartDate"></DateComp>
+    </div>
+    <div class="date-stop">
+      <DateComp :df="stopDateField" :value="stopDate.minus({days: 1}).toISODate()" @change="changeStopDate"></DateComp>
+    </div>
+    <div class="btn-right">
+      <Button icon @click="next"><feather-icon name="chevron-right" class="ms-1 w-3 h-3" /></Button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { t } from 'fyo';
+import { fyo } from 'src/initFyo';
+import { DateTime } from 'luxon';
+import { ModelNameEnum } from 'models/types';
+import Button from 'src/components/Button.vue';
+import Dropdown from 'src/components/Dropdown.vue';
+import DateComp from 'src/components/Controls/Date.vue';
+import { PeriodKey } from 'src/utils/types';
+import { PropType } from 'vue';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  name: 'DatePeriod',
+  components: {
+    Dropdown,
+    Button,
+    DateComp,
+  },
+  props: {
+  },
+  emits: ['change'],
+  data() {
+    return {
+      value: 'M',
+      anchorValue: 'civil',
+      periodSelectorMap: {} as Record<PeriodKey | '', string>,
+      anchorSelectorMap: {} as Record<PeriodKey | '', string>,
+      anchorOptions: [],
+      periodOptions: [] as { label: string; action: () => void }[],
+      startDateField: {
+          name: 'startDate',
+          label: '',
+      },
+      stopDateField: {
+          name: 'stopDate',
+          label: '',
+      },
+      startDate: this.startDate || DateTime.now().startOf('day'),
+      stopDate:  this.stopDate  || DateTime.now().startOf('day'),
+    };
+  },
+  mounted() {
+    this.anchorSelectorMap = {
+      civil:   t`Civil`,
+      fiscal:  t`Fiscal`,
+      to_date: t`To Date`,
+      custom:  t`Custom`,
+    };
+
+    this.anchorOptions = Object.keys(this.anchorSelectorMap).map((option) => {
+      if (option == 'custom') return null
+
+      let label = this.anchorSelectorMap[option] ?? option;
+
+      return {
+        label,
+        action: () => this.selectAnchor(option),
+      };
+    }).filter(x => x);
+
+    this.periodSelectorMap = {
+      Y:      t`Year`,
+      S:      t`Semester`,
+      Q:      t`Quarter`,
+      M:      t`Month`,
+      custom: t`Custom`,
+    };
+
+    this.periodOptions = Object.keys(this.periodSelectorMap).map((option) => {
+      let label = this.periodSelectorMap[option] ?? option;
+
+      return {
+        label,
+        action: () => this.selectOption(option),
+      };
+    });
+
+    this.stopDate  = DateTime.now().startOf('day').plus({days: 1});
+    this.startDate = this.stopDate.minus(this.period(this.value, 1));
+    this.emitChanged()
+  },
+  methods: {
+    async selectAnchor(value: PeriodKey) {
+      this.anchorValue = value
+
+      if (this.value == 'custom') return
+
+      if(this.anchorValue == 'to_date') {
+        this.stopDate  = DateTime.now().startOf('day').plus({days: 1});
+        this.startDate = this.stopDate.minus(this.period(this.value, 1));
+      } else if (this.anchorValue == 'civil') {
+        this.startDate = DateTime.now().startOf('day');
+        switch(this.value) {
+          case 'Y': this.startDate = this.startDate.startOf('year'); break;
+          case 'S': this.startDate = this.startDate.startOf('month').set({
+                      month: this.startDate.month<7 ? 1 : 7})
+                    break;
+          case 'Q': this.startDate = this.startDate.startOf('quarter'); break;
+          case 'M': this.startDate = this.startDate.startOf('month'); break;
+        }
+        this.stopDate = this.startDate.plus(this.period(this.value, 1))
+      } else if (this.anchorValue == 'fiscal') {
+        const fys = DateTime.fromJSDate(await fyo.getValue(ModelNameEnum.AccountingSettings, 'fiscalYearStart'))
+        const fye = DateTime.fromJSDate(await fyo.getValue(ModelNameEnum.AccountingSettings, 'fiscalYearEnd'))
+        const duration = fye.plus({days: 1}).diff(fys, ['years', 'months', 'days'])
+
+        const today = DateTime.now().startOf('day')
+        this.startDate = DateTime.now().startOf('day').set({
+          month: fys.month,
+          day: fys.day
+        })
+
+        if (this.startDate.toJSDate() > today.toJSDate()) {
+          this.startDate = this.startDate.minus({years: 1})
+        }
+
+        for (let i = 12; i > 0 && this.startDate.plus(this.period(this.value, 1)).toJSDate() < today.toJSDate(); i--) {
+          this.startDate = this.startDate.plus(this.period(this.value, 1))
+        }
+
+        this.stopDate = this.startDate.plus(this.value == 'Y' ? duration : this.period(this.value, 1))
+      }
+
+      this.emitChanged();
+      (this.$refs.dropdownAnchor as InstanceType<typeof Dropdown>).toggleDropdown(
+        false
+      );
+    },
+    selectOption(value: PeriodKey) {
+      this.value = value
+      if (this.value != 'custom') {
+        this.stopDate = this.startDate.plus(this.period(this.value, 1))
+        this.selectAnchor(this.anchorValue)
+      } else {
+        this.emitChanged();
+      }
+
+      (this.$refs.dropdownPeriod as InstanceType<typeof Dropdown>).toggleDropdown(
+        false
+      );
+    },
+    changeStartDate(d) {
+      this.startDate = DateTime.fromJSDate(d)
+      this.anchorValue = 'custom'
+      if (this.value != 'custom') {
+        this.stopDate = this.startDate.plus(this.period(this.value, 1))
+      }
+      this.emitChanged();
+    },
+    changeStopDate(d) {
+      this.stopDate = DateTime.fromJSDate(d).plus({days: 1})
+      this.anchorValue = 'custom'
+      if (this.value != 'custom') {
+        this.startDate = this.stopDate.minus(this.period(this.value, 1))
+      }
+      this.emitChanged();
+    },
+    emitChanged() {
+      console.log('emit change')
+      this.$emit('change', {
+        start: this.startDate,
+        stop: this.stopDate,
+        last: this.stopDate.minus({day: 1}),
+      })
+    },
+    prev(){
+      if (this.value != 'custom') {
+        this.startDate = this.startDate.minus(this.period(this.value, 1))
+        this.stopDate  = this.stopDate.minus(this.period(this.value, 1))
+      } else {
+        let interval   = this.interval()
+        this.stopDate  = this.startDate
+        this.startDate = this.stopDate.minus(interval)
+      }
+      this.emitChanged()
+    },
+    next(){
+      if (this.value != 'custom') {
+        this.startDate = this.startDate.plus(this.period(this.value, 1))
+        this.stopDate  = this.stopDate.plus(this.period(this.value, 1))
+      } else {
+        let interval   = this.interval()
+        this.startDate = this.stopDate
+        this.stopDate  = this.startDate.plus(interval)
+      }
+      this.emitChanged()
+    },
+    period(val, n) {
+      switch(val) {
+        case 'Y': return {years: n}
+        case 'S': return {months: n * 6}
+        case 'Q': return {months: n * 3}
+        case 'M': return {months: n}
+      }
+    },
+    interval(){
+      return this.stopDate.diff(this.startDate, ['years', 'months', 'days'])
+    }
+  },
+});
+</script>
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 02d94de17..cebade190 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="flex flex-col w-full h-full">
     <PageHeader :title="title">
+      <div v-if="report?.acceptSingleTimePeriod">
+        <DatePeriod @change="periodChanged"></DatePeriod>
+      </div>
       <DropdownWithActions
         v-for="group of groupedActions"
         :key="group.label"
@@ -27,7 +30,7 @@
       class="grid grid-cols-5 gap-4 p-4 border-b dark:border-gray-800"
     >
       <FormControl
-        v-for="field in report.filters"
+        v-for="field in reportFilters()"
         :key="field.fieldname + '-filter'"
         :border="true"
         size="small"
@@ -51,6 +54,7 @@ import { reports } from 'reports';
 import { Report } from 'reports/Report';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
+import DatePeriod from 'src/components/Controls/DatePeriod.vue'
 import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import ListReport from 'src/components/Report/ListReport.vue';
@@ -65,6 +69,7 @@ import { PropType, computed, defineComponent, inject } from 'vue';
 export default defineComponent({
   components: {
     PageHeader,
+    DatePeriod,
     FormControl,
     ListReport,
     DropdownWithActions,
@@ -155,12 +160,27 @@ export default defineComponent({
         this.report = await getReport(this.reportClassName);
       }
 
+      if (this.report.acceptSingleTimePeriod && this.report?.basedOn != null) await this.report?.set('basedOn', 'Period')
+
       if (!this.report.reportData.length) {
         await this.report.setReportData();
       } else if (this.report.shouldRefresh) {
         await this.report.setReportData(undefined, true);
       }
     },
+    reportFilters() {
+      let filters = this.report.filters
+      if (this.report.acceptSingleTimePeriod) {
+        filters = filters.filter(field => ! ['fromDate', 'toDate', 'basedOn'].includes(field.fieldname))
+      }
+      return filters
+    },
+    async periodChanged({start, stop, last}){
+      console.log('periodChanged', start.toISODate(), stop.toISODate(), last.toISODate())
+      await this.report?.set('fromDate', start.toISODate())
+      await this.report?.set('toDate', last.toISODate())
+      if (this.report?.basedOn != null) await this.report?.set('basedOn', 'Period')
+    },
   },
 });
 </script>

From 25e59d0d2dc796ab21b9ab326d3408a36c6004f3 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Thu, 21 Nov 2024 11:40:35 +0100
Subject: [PATCH 08/11] feat: show totals in closing column for Trial Balance

---
 reports/TrialBalance/TrialBalance.ts | 48 ++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts
index 623ae2f3b..191498c2b 100644
--- a/reports/TrialBalance/TrialBalance.ts
+++ b/reports/TrialBalance/TrialBalance.ts
@@ -37,6 +37,7 @@ export class TrialBalance extends AccountReport {
   toDate?: string;
   showOnlyBalance = false;
   hideGroupAmounts = false;
+  showTotal = false
   loading = false;
 
   _rawData: LedgerEntry[] = [];
@@ -149,11 +150,11 @@ export class TrialBalance extends AccountReport {
         toDate: fromDate,
       },
       { fromDate, toDate },
-      {
+      this.showTotal ? null : {
         fromDate: toDate,
         toDate: DateTime.fromISO('9999-12-31'),
       },
-    ];
+    ].filter(x => x);
   }
 
   getRowFromAccountListNode(al: AccountListNode) {
@@ -166,9 +167,14 @@ export class TrialBalance extends AccountReport {
       indent: al.level ?? 0,
     } as ReportCell;
 
+    let totalDebit = 0, totalCredit = 0
+    const hide = this.hideGroupAmounts && al.isGroup;
+
     const balanceCells = this._dateRanges!.map((k) => {
       const map = al.valueMap?.get(k);
-      const hide = this.hideGroupAmounts && al.isGroup;
+
+      totalDebit += map?.debit ?? 0
+      totalCredit += map?.credit ?? 0
 
       if (this.showOnlyBalance) {
         const balance = (map?.debit ?? 0) - (map?.credit ?? 0)
@@ -198,6 +204,35 @@ export class TrialBalance extends AccountReport {
       }
     });
 
+    if (this.showTotal) {
+      if (this.showOnlyBalance) {
+        const balance = totalDebit - totalCredit
+        balanceCells.push([
+          {
+            rawValue: balance,
+            value: hide ? '' : this.fyo.format(balance, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          } as ReportCell,
+        ]);
+      } else {
+        balanceCells.push([
+          {
+            rawValue: totalDebit,
+            value: hide ? '' : this.fyo.format(totalDebit, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          },
+          {
+            rawValue: totalCredit,
+            value: hide ? '' : this.fyo.format(totalCredit, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          } as ReportCell,
+        ]);
+      }
+    }
+
     return {
       cells: [nameCell, balanceCells].flat(2),
       level: al.level,
@@ -226,6 +261,8 @@ export class TrialBalance extends AccountReport {
     }
 
     await this._setDateRanges();
+
+    console.log('_dateRanges', this._dateRanges)
   }
 
   getFilters(): Field[] {
@@ -249,6 +286,11 @@ export class TrialBalance extends AccountReport {
         label: t`Hide Group Amounts`,
         fieldname: 'hideGroupAmounts',
       },
+      {
+        fieldtype: 'Check',
+        label: t`Show totals`,
+        fieldname: 'showTotal',
+      },
       {
         fieldtype: 'Check',
         label: t`Show Balance`,

From d3384aaf23a3f8071b7f50adee5895f6e77538b8 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Thu, 21 Nov 2024 12:15:34 +0100
Subject: [PATCH 09/11] fix AccountReport

---
 reports/AccountReport.ts | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index 5d057364e..a807f434a 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -264,13 +264,13 @@ export abstract class AccountReport extends LedgerReport {
   }
 
   async _getDateRanges(): Promise<DateRange[]> {
-    const endpoints = await this._getFromAndToDates();
-    const fromDate = DateTime.fromISO(endpoints.fromDate);
-    const toDate = DateTime.fromISO(endpoints.toDate);
+    let dateRanges: DateRange[]
 
     if (this.basedOn === 'Period') {
+      const toDate   = DateTime.fromISO(this.toDate!).plus({ days: 1 });
+      const fromDate = DateTime.fromISO(this.fromDate);
 
-      const dateRanges: DateRange[] = [
+      dateRanges = [
         {
           toDate,
           fromDate,
@@ -302,10 +302,12 @@ export abstract class AccountReport extends LedgerReport {
         ];
       }
 
-      return dateRanges
-
     } else {
 
+      const endpoints = await this._getFromAndToDates();
+      const fromDate = DateTime.fromISO(endpoints.fromDate);
+      const toDate = DateTime.fromISO(endpoints.toDate);
+
       if (this.consolidateColumns) {
         return [
           {
@@ -317,7 +319,7 @@ export abstract class AccountReport extends LedgerReport {
 
       const months: number = monthsMap[this.periodicity];
       const interval = {months}
-      const dateRanges: DateRange[] = [
+      dateRanges = [
         {
           toDate,
           fromDate: this._fixMonthsJump(toDate, toDate.minus(interval)),
@@ -339,9 +341,12 @@ export abstract class AccountReport extends LedgerReport {
           ),
         });
       }
-
-      return dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
     }
+
+    dateRanges = dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
+
+
+    return dateRanges
   }
 
   async _getFromAndToDates() {
@@ -349,8 +354,7 @@ export abstract class AccountReport extends LedgerReport {
     let fromDate: string;
 
     if (this.basedOn === 'Period') {
-      toDate = DateTime.fromISO(this.toDate!).plus({ days: 1 }).toISODate();
-      fromDate = this.fromDate;
+      throw new Error('_getFromAndToDates should not be called with period basedOn');
     } else if (this.basedOn === 'Until Date') {
       toDate = DateTime.fromISO(this.toDate!).plus({ days: 1 }).toISODate();
       const months = monthsMap[this.periodicity] * Math.max(this.count ?? 1, 1);
@@ -368,13 +372,21 @@ export abstract class AccountReport extends LedgerReport {
     return { fromDate, toDate };
   }
 
+  _getDateBoundaries() {
+    const last = this._dateRanges.length - 1
+    return {
+      fromDate: this._dateRanges[last].fromDate,
+      toDate:   this._dateRanges[0].toDate,
+    }
+  }
+
   async _getQueryFilters(): Promise<QueryFilter> {
     const filters: QueryFilter = {};
-    const { fromDate, toDate } = await this._getFromAndToDates();
+    const { fromDate, toDate } = this._getDateBoundaries()
 
     const dateFilter: string[] = [];
-    dateFilter.push('<', toDate);
-    dateFilter.push('>=', fromDate);
+    dateFilter.push('<', toDate.toISODate());
+    dateFilter.push('>=', fromDate.toISODate());
 
     filters.date = dateFilter;
     filters.reverted = false;

From 2044a4e270a22ebe02734f913901a56f2c9a0071 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Thu, 21 Nov 2024 15:10:39 +0100
Subject: [PATCH 10/11] fixup DatePeriod

---
 src/components/Controls/DatePeriod.vue | 4 +---
 src/pages/Report.vue                   | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Controls/DatePeriod.vue b/src/components/Controls/DatePeriod.vue
index 921d723d7..61ce08260 100644
--- a/src/components/Controls/DatePeriod.vue
+++ b/src/components/Controls/DatePeriod.vue
@@ -176,9 +176,7 @@ export default defineComponent({
       };
     });
 
-    this.stopDate  = DateTime.now().startOf('day').plus({days: 1});
-    this.startDate = this.stopDate.minus(this.period(this.value, 1));
-    this.emitChanged()
+    this.selectAnchor(this.anchorValue)
   },
   methods: {
     async selectAnchor(value: PeriodKey) {
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index cebade190..affdd5960 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -161,6 +161,8 @@ export default defineComponent({
       }
 
       if (this.report.acceptSingleTimePeriod && this.report?.basedOn != null) await this.report?.set('basedOn', 'Period')
+      if (this.startDate) await this.report.set('fromDate', this.startDate.toISODate())
+      if (this.lastDate)  await this.report.set('toDate', this.lastDate.toISODate())
 
       if (!this.report.reportData.length) {
         await this.report.setReportData();
@@ -177,6 +179,8 @@ export default defineComponent({
     },
     async periodChanged({start, stop, last}){
       console.log('periodChanged', start.toISODate(), stop.toISODate(), last.toISODate())
+      this.startDate = start
+      this.lastDate  = last
       await this.report?.set('fromDate', start.toISODate())
       await this.report?.set('toDate', last.toISODate())
       if (this.report?.basedOn != null) await this.report?.set('basedOn', 'Period')

From 52a26fe41dcc66b766933d8ae7b223f81ecd7bd2 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Thu, 21 Nov 2024 15:11:11 +0100
Subject: [PATCH 11/11] feat: opening and closing balances in Profit & Loss and
 Balance Sheet

---
 reports/AccountReport.ts | 70 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index a807f434a..b5a300eb3 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -39,6 +39,7 @@ export abstract class AccountReport extends LedgerReport {
   toYear?: number;
   consolidateColumns = false;
   hideGroupAmounts = false;
+  showOpeningAndClosing = false;
   periodicity: Periodicity = 'Monthly';
   basedOn: BasedOn = 'Until Date';
 
@@ -137,6 +138,8 @@ export abstract class AccountReport extends LedgerReport {
       indent: al.level ?? 0,
     } as ReportCell;
 
+    let sumValue = 0
+
     const balanceCells = this._dateRanges!.map((k) => {
       const rawValue = al.valueMap?.get(k)?.balance ?? 0;
       let value = this.fyo.format(rawValue, 'Currency');
@@ -144,6 +147,8 @@ export abstract class AccountReport extends LedgerReport {
         value = '';
       }
 
+      sumValue += rawValue
+
       return {
         rawValue,
         value,
@@ -152,6 +157,15 @@ export abstract class AccountReport extends LedgerReport {
       } as ReportCell;
     });
 
+    if (this.showOpeningAndClosing) {
+      balanceCells.push({
+        rawValue: sumValue,
+        value: (this.hideGroupAmounts && al.isGroup) ? '' : this.fyo.format(sumValue, 'Currency'),
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      })
+    }
+
     return {
       cells: [nameCell, balanceCells].flat(),
       level: al.level,
@@ -345,6 +359,19 @@ export abstract class AccountReport extends LedgerReport {
 
     dateRanges = dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
 
+    if (this.showOpeningAndClosing) {
+      const openingPeriod = {
+        fromDate: DateTime.fromISO('0001-01-01'),
+        toDate: dateRanges[0].fromDate,
+      }
+      const closingPeriod = {
+        fromDate: DateTime.fromISO('0001-01-01'),
+        toDate: dateRanges[dateRanges.length-1].toDate,
+      }
+      dateRanges = dateRanges.reverse()
+      dateRanges.unshift(openingPeriod)
+      // dateRanges.push(closingPeriod)
+    }
 
     return dateRanges
   }
@@ -374,9 +401,16 @@ export abstract class AccountReport extends LedgerReport {
 
   _getDateBoundaries() {
     const last = this._dateRanges.length - 1
-    return {
-      fromDate: this._dateRanges[last].fromDate,
-      toDate:   this._dateRanges[0].toDate,
+    if (this.showOpeningAndClosing) {
+      return {
+        fromDate: this._dateRanges[0].fromDate,
+        toDate:   this._dateRanges[last].toDate,
+      }
+    } else {
+      return {
+        fromDate: this._dateRanges[last].fromDate,
+        toDate:   this._dateRanges[0].toDate,
+      }
     }
   }
 
@@ -509,6 +543,11 @@ export abstract class AccountReport extends LedgerReport {
         label: t`Hide Group Amounts`,
         fieldname: 'hideGroupAmounts',
       } as Field,
+      {
+        fieldtype: 'Check',
+        label: t`Show Openings and Closings`,
+        fieldname: 'showOpeningAndClosing',
+      } as Field,
     ].flat();
   }
 
@@ -523,11 +562,16 @@ export abstract class AccountReport extends LedgerReport {
       },
     ] as ColumnField[];
 
-    const dateColumns = this._dateRanges!.sort(
-      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
-    ).map((d) => {
+    let ranges = this._dateRanges!.sort((a, b) => b.toDate.toMillis() - a.toDate.toMillis())
+    if (this.showOpeningAndClosing) {
+      ranges = ranges.reverse()
+    }
+
+    const dateColumns = ranges.map((d) => {
       const toDate = d.toDate.minus({ days: 1 });
-      const label = this.fyo.format(toDate.toJSDate(), 'Date');
+      const label =
+        // this.fyo.format(d.fromDate.toJSDate(), 'Date') + " - " +
+        this.fyo.format(toDate.toJSDate(), 'Date');
 
       return {
         label,
@@ -538,6 +582,18 @@ export abstract class AccountReport extends LedgerReport {
       } as ColumnField;
     });
 
+    if (this.showOpeningAndClosing) {
+      dateColumns[0].label = t`Opening`
+      // dateColumns[dateColumns.length-1].label = t`Closing`
+      dateColumns.push({
+        label: t`Closing`,
+        fieldtype: 'Data',
+        fieldname: 'toDate',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      })
+    }
+
     return [columns, dateColumns].flat();
   }