fix: list ordering issues

backend/database/core.ts

@@ -422,12 +422,21 @@ export default class DatabaseCore extends DatabaseBase {
 
     this.#applyFiltersToBuilder(builder, filters);
 
-    if (options.orderBy) {
+    const { orderBy, groupBy, order } = options;
-      builder.orderBy(options.orderBy, options.order);
+    if (Array.isArray(orderBy)) {
+      builder.orderBy(orderBy.map((column) => ({ column, order })));
     }
 
-    if (options.groupBy) {
+    if (typeof orderBy === 'string') {
-      builder.groupBy(options.groupBy);
+      builder.orderBy(orderBy, order);
+    }
+
+    if (Array.isArray(groupBy)) {
+      builder.groupBy(...groupBy);
+    }
+
+    if (typeof groupBy === 'string') {
+      builder.groupBy(groupBy);
     }
 
     if (options.offset) {

backend/database/types.ts

@@ -5,8 +5,8 @@ import { DatabaseManager } from './manager';
 export interface GetQueryBuilderOptions {
   offset?: number;
   limit?: number;
-  groupBy?: string;
+  groupBy?: string | string[];
-  orderBy?: string;
+  orderBy?: string | string[];
   order?: 'desc' | 'asc';
 }
 

reports/LedgerReport.ts

@@ -95,7 +95,7 @@ export abstract class LedgerReport extends Report {
       {
         fields,
         filters,
-        orderBy: 'date',
+        orderBy: ['date', 'created'],
         order: this.ascending ? 'asc' : 'desc',
       }
     )) as RawLedgerEntry[];

reports/inventory/helpers.ts

@@ -26,7 +26,7 @@ export async function getRawStockLedgerEntries(fyo: Fyo) {
 
   return (await fyo.db.getAllRaw(ModelNameEnum.StockLedgerEntry, {
     fields: fieldnames,
-    orderBy: 'date',
+    orderBy: ['date', 'created', 'name'],
     order: 'asc',
   })) as RawStockLedgerEntry[];
 }

src/pages/ListView/List.vue

@@ -198,9 +198,10 @@ export default defineComponent({
 
       filters = objectForEach(clone(filters), toRaw);
 
-      const orderBy = !!fyo.getField(this.schemaName, 'date')
+      const orderBy = ['created'];
-        ? 'date'
+      if (fyo.db.fieldMap[this.schemaName]['date']) {
-        : 'created';
+        orderBy.unshift('date');
+      }
 
       this.data = (
         await fyo.db.getAll(this.schemaName, {

src/utils/export.ts

@@ -260,9 +260,11 @@ async function getParentData(
   limit: number | null,
   fyo: Fyo
 ) {
-  const orderBy = !!fields.find((f) => f.fieldname === 'date')
+  const orderBy = ['created'];
-    ? 'date'
+  if (fyo.db.fieldMap[schemaName]['date']) {
-    : 'created';
+    orderBy.unshift('date');
+  }
+
   const options: GetAllOptions = { filters, orderBy, order: 'desc' };
   if (limit) {
     options.limit = limit;

utils/db/types.ts

@@ -59,8 +59,8 @@ export interface GetAllOptions {
   filters?: QueryFilter;
   offset?: number;
   limit?: number;
-  groupBy?: string;
+  groupBy?: string | string[];
-  orderBy?: string;
+  orderBy?: string | string[];
   order?: 'asc' | 'desc';
 }