Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

packages/server/src/modules/Attachments/UnlinkAttachment.ts

@@ -44,7 +44,7 @@ export class UnlinkAttachment {
     validateLinkModelExists(attachableModel);
 
     const LinkModel = this.moduleRef.get(modelRef, { strict: false });
-    const foundLinkModel = await LinkModel.query(trx).findById(modelId);
+    const foundLinkModel = await LinkModel().query(trx).findById(modelId);
     validateLinkModelEntryExists(foundLinkModel);
 
     const document = await this.documentModel().query(trx).findOne('key', filekey);

packages/webapp/src/containers/CashFlow/MoneyInDialog/TransactionTypeFields.tsx

@@ -19,7 +19,7 @@ import { useMoneyInDailogContext } from './MoneyInDialogProvider';
  */
 export default function TransactionTypeFields() {
   // Money in dialog context.
-  const { cashflowAccounts, setAccountId } = useMoneyInDailogContext();
+  const { cashflowAccounts, setAccountId, accountId } = useMoneyInDailogContext();
 
   // Retrieves the add money in button options.
   const addMoneyInOptions = useMemo(() => getAddMoneyInOptions(), []);
@@ -55,8 +55,8 @@ export default function TransactionTypeFields() {
             <FAccountsSuggestField
               name={'cashflow_account_id'}
               items={cashflowAccounts}
-              onItemSelect={({ id }) => {
-                setAccountId(id);
+              onItemChange={(value) => {
+                setAccountId(value);
               }}
             />
           </FFormGroup>

packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransactionTypeFields.tsx

@@ -60,8 +60,8 @@ function TransactionTypeFields() {
             <FAccountsSuggestField
               name={'cashflow_account_id'}
               items={cashflowAccounts}
-              onItemSelect={({ id }) => {
-                setAccountId(id);
+              onItemChange={(value) => {
+                setAccountId(value);
               }}
             />
           </FFormGroup>