diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts index bfb0e0c9..634c56ec 100644 --- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts +++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts @@ -41,12 +41,12 @@ export class AccountingLedgerEntry extends Doc { static getListViewSettings(): ListViewSettings { return { columns: [ + 'date', 'account', 'party', 'debit', 'credit', 'referenceName', - 'reverted', ], }; } diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts index 583c8f9a..c021e0f9 100644 --- a/models/baseModels/Address/Address.ts +++ b/models/baseModels/Address/Address.ts @@ -1,6 +1,11 @@ -import { t } from 'fyo'; +import { Fyo, t } from 'fyo'; import { Doc } from 'fyo/model/doc'; -import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types'; +import { + EmptyMessageMap, + FormulaMap, + ListsMap, + ListViewSettings, +} from 'fyo/model/types'; import { codeStateMap } from 'regional/in'; import { getCountryInfo } from 'utils/misc'; @@ -54,4 +59,10 @@ export class Address extends Doc { return t`Enter Country to load States`; }, }; + + static override getListViewSettings(): ListViewSettings { + return { + columns: ['name', 'addressLine1', 'city', 'state', 'country'], + }; + } } diff --git a/models/inventory/StockLedgerEntry.ts b/models/inventory/StockLedgerEntry.ts index d64c6756..b3ede093 100644 --- a/models/inventory/StockLedgerEntry.ts +++ b/models/inventory/StockLedgerEntry.ts @@ -1,7 +1,7 @@ import { Doc } from 'fyo/model/doc'; +import { ListViewSettings } from 'fyo/model/types'; import { Money } from 'pesa'; - export class StockLedgerEntry extends Doc { date?: Date; item?: string; @@ -11,4 +11,17 @@ export class StockLedgerEntry extends Doc { referenceName?: string; referenceType?: string; batch?: string; + + static override getListViewSettings(): ListViewSettings { + return { + columns: [ + 'date', + 'item', + 'location', + 'rate', + 'quantity', + 'referenceName', + ], + }; + } } diff --git a/schemas/app/Address.json b/schemas/app/Address.json index c3a40516..f4f43847 100644 --- a/schemas/app/Address.json +++ b/schemas/app/Address.json @@ -1,8 +1,15 @@ { "name": "Address", "label": "Address", + "naming": "manual", "isSingle": false, "fields": [ + { + "fieldname": "name", + "label": "Address Name", + "fieldtype": "Data", + "required": true + }, { "fieldname": "addressLine1", "label": "Address Line 1", @@ -69,6 +76,7 @@ } ], "quickEditFields": [ + "name", "addressLine1", "addressLine2", "city", diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json index cd671c4f..c534216f 100644 --- a/schemas/app/PrintSettings.json +++ b/schemas/app/PrintSettings.json @@ -35,6 +35,7 @@ "fieldtype": "Link", "target": "Address", "inline": true, + "create": true, "section": "Contacts" }, { diff --git a/schemas/regional/in/Address.json b/schemas/regional/in/Address.json index 376ae771..41ba5061 100644 --- a/schemas/regional/in/Address.json +++ b/schemas/regional/in/Address.json @@ -9,6 +9,7 @@ } ], "quickEditFields": [ + "name", "addressLine1", "addressLine2", "city", diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue index ab65c594..58bc9e49 100644 --- a/src/components/Controls/AutoComplete.vue +++ b/src/components/Controls/AutoComplete.vue @@ -25,6 +25,7 @@ :placeholder="inputPlaceholder" :readonly="isReadOnly" @focus="(e) => !isReadOnly && onFocus(e, toggleDropdown)" + @click="(e) => !isReadOnly && onFocus(e, toggleDropdown)" @blur="(e) => !isReadOnly && onBlur(e.target.value)" @input="onInput" @keydown.up="highlightItemUp" @@ -55,7 +56,6 @@ -