diff --git a/packages/server/src/models/Account.Settings.ts b/packages/server/src/models/Account.Settings.ts
index 7be8cf404..fff2ed581 100644
--- a/packages/server/src/models/Account.Settings.ts
+++ b/packages/server/src/models/Account.Settings.ts
@@ -121,7 +121,7 @@ export default {
},
balance: {
name: 'account.field.balance',
- accessor: 'amount',
+ accessor: 'formattedAmount',
},
description: {
name: 'account.field.description',
diff --git a/packages/server/src/services/Export/ExportPdf.ts b/packages/server/src/services/Export/ExportPdf.ts
index eb7c99586..68ed30e9b 100644
--- a/packages/server/src/services/Export/ExportPdf.ts
+++ b/packages/server/src/services/Export/ExportPdf.ts
@@ -12,13 +12,13 @@ export class ExportPdf {
private chromiumlyTenancy: ChromiumlyTenancy;
/**
- *
- * @param tenantId
- * @param columns
- * @param data
- * @param sheetTitle
- * @param sheetDescription
- * @returns
+ *
+ * @param tenantId
+ * @param columns
+ * @param data
+ * @param sheetTitle
+ * @param sheetDescription
+ * @returns
*/
public async pdf(
tenantId: number,
@@ -40,7 +40,7 @@ export class ExportPdf {
);
// Convert the HTML content to PDF
return this.chromiumlyTenancy.convertHtmlContent(tenantId, htmlContent, {
- margins: { top: 0, bottom: 0, left: 0, right: 0 },
+ margins: { top: 0.2, bottom: 0.2, left: 0.2, right: 0.2 },
landscape: true,
});
}
diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx
index 34e2d2432..5861febfb 100644
--- a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx
+++ b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx
@@ -30,7 +30,7 @@ import withSettings from '@/containers/Settings/withSettings';
import withSettingsActions from '@/containers/Settings/withSettingsActions';
import withDialogActions from '@/containers/Dialog/withDialogActions';
-import { useResourceExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf';
+import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf';
import { compose } from '@/utils';
import { DialogsName } from '@/constants/dialogs';
@@ -59,9 +59,8 @@ function ManualJournalActionsBar({
// Manual journals context.
const { journalsViews, fields } = useManualJournalsContext();
- // Exports the given resource into pdf.
- const { mutateAsync: exportPdf, isLoading: isExportPdfLoading } =
- useResourceExportPdf();
+ // Exports pdf document.
+ const { downloadAsync: downloadExportPdf } = useDownloadExportPdf();
// Manual journals refresh action.
const { refresh } = useRefreshJournals();
@@ -98,7 +97,7 @@ function ManualJournalActionsBar({
// Handle the pdf print button click.
const handlePdfPrintBtnSubmit = () => {
- exportPdf({ resource: 'ManualJournal' });
+ downloadExportPdf({ resource: 'ManualJournal' });
};
return (
@@ -150,7 +149,6 @@ function ManualJournalActionsBar({
icon={}
text={}
onClick={handlePdfPrintBtnSubmit}
- disabled={isExportPdfLoading}
/>