From 932afddf111a1979eed663fe3b65c06c132b5c86 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Mon, 21 Mar 2022 13:41:07 +0200
Subject: [PATCH] fix: remote line min lines.

---
 .../Accounting/MakeJournal/MakeJournalEntriesTable.js |  4 ++--
 src/containers/Accounting/MakeJournal/components.js   | 11 ++++-------
 src/containers/Entries/ItemsEntriesTable.js           |  4 +++-
 .../Expenses/ExpenseForm/ExpenseFormEntriesTable.js   |  9 +++++++--
 .../WarehouseTransfers/WarehouseTransferForm/utils.js |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js b/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js
index 2069ffdbc..b6f34200d 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js
@@ -21,8 +21,8 @@ export default function MakeJournalEntriesTable({
   entries,
   defaultEntry,
   error,
-  initialLinesNumber = 4,
-  minLinesNumber = 4,
+  initialLinesNumber = 1,
+  minLinesNumber = 1,
   currencyCode,
 }) {
   const { accounts, contacts, branches } = useMakeJournalFormContext();
diff --git a/src/containers/Accounting/MakeJournal/components.js b/src/containers/Accounting/MakeJournal/components.js
index 0a4d588a3..cec39f28c 100644
--- a/src/containers/Accounting/MakeJournal/components.js
+++ b/src/containers/Accounting/MakeJournal/components.js
@@ -13,7 +13,7 @@ import {
   BranchesListFieldCell,
 } from 'components/DataTableCells';
 
-import { CellType, Features } from 'common';
+import { CellType, Features, Align } from 'common';
 
 import { useFeatureCan } from 'hooks/state';
 import { useCurrentOrganization } from 'hooks/state';
@@ -92,7 +92,6 @@ export const useJournalTableEntriesColumns = () => {
         id: 'account_id',
         accessor: 'account_id',
         Cell: AccountsListFieldCell,
-        className: 'account',
         disableSortBy: true,
         width: 160,
         fieldProps: { allowCreate: true },
@@ -101,24 +100,23 @@ export const useJournalTableEntriesColumns = () => {
         Header: CreditHeaderCell,
         accessor: 'credit',
         Cell: MoneyFieldCell,
-        className: 'credit',
         disableSortBy: true,
         width: 100,
+        align: Align.Right,
       },
       {
         Header: DebitHeaderCell,
         accessor: 'debit',
         Cell: MoneyFieldCell,
-        className: 'debit',
         disableSortBy: true,
         width: 100,
+        align: Align.Right,
       },
       {
         Header: ContactHeaderCell,
         id: 'contact_id',
         accessor: 'contact_id',
         Cell: ContactsListFieldCell,
-        className: 'contact',
         disableSortBy: true,
         width: 120,
       },
@@ -129,7 +127,6 @@ export const useJournalTableEntriesColumns = () => {
               id: 'branch_id',
               accessor: 'branch_id',
               Cell: BranchesListFieldCell,
-              className: 'branch',
               disableSortBy: true,
               width: 120,
             },
@@ -140,7 +137,6 @@ export const useJournalTableEntriesColumns = () => {
         accessor: 'note',
         Cell: InputGroupCell,
         disableSortBy: true,
-        className: 'note',
         width: 200,
       },
       {
@@ -150,6 +146,7 @@ export const useJournalTableEntriesColumns = () => {
         disableSortBy: true,
         disableResizing: true,
         width: 45,
+        align: Align.Center,
       },
     ],
     [],
diff --git a/src/containers/Entries/ItemsEntriesTable.js b/src/containers/Entries/ItemsEntriesTable.js
index 8718e0fbc..7d4023e83 100644
--- a/src/containers/Entries/ItemsEntriesTable.js
+++ b/src/containers/Entries/ItemsEntriesTable.js
@@ -31,6 +31,7 @@ function ItemsEntriesTable({
   currencyCode,
   itemType, // sellable or purchasable
   landedCost = false,
+  minLinesNumber
 }) {
   const [rows, setRows] = React.useState(initialEntries);
 
@@ -76,7 +77,7 @@ function ItemsEntriesTable({
   const handleRemoveRow = (rowIndex) => {
     const newRows = compose(
       // Ensure minimum lines count.
-      updateMinEntriesLines(4, defaultEntry),
+      updateMinEntriesLines(minLinesNumber, defaultEntry),
       // Remove the line by the given index.
       updateRemoveLineByIndex(rowIndex),
     )(rows);
@@ -117,6 +118,7 @@ ItemsEntriesTable.defaultProps = {
   },
   initialEntries: [],
   linesNumber: 1,
+  minLinesNumber: 1,
 };
 
 export default ItemsEntriesTable;
diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js b/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js
index 41988443e..c70d9c787 100644
--- a/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js
+++ b/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js
@@ -23,6 +23,7 @@ export default function ExpenseFormEntriesTable({
   onChange,
   currencyCode,
   landedCost = true,
+  minLines,
 }) {
   // Expense form context.
   const { accounts } = useExpenseFormContext();
@@ -50,14 +51,14 @@ export default function ExpenseFormEntriesTable({
     (rowIndex) => {
       const newRows = compose(
         // Ensure minimum lines count.
-        updateMinEntriesLines(4, defaultEntry),
+        updateMinEntriesLines(minLines, defaultEntry),
         // Remove the line by the given index.
         updateRemoveLineByIndex(rowIndex),
       )(entries);
 
       saveInvoke(onChange, newRows);
     },
-    [entries, defaultEntry, onChange],
+    [minLines, entries, defaultEntry, onChange],
   );
 
   return (
@@ -76,4 +77,8 @@ export default function ExpenseFormEntriesTable({
       }}
     />
   );
+}
+
+ExpenseFormEntriesTable.defaultProps = {
+  minLines: 1,
 }
\ No newline at end of file
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js
index a652f2145..7266c6289 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js
@@ -177,7 +177,7 @@ export const mutateTableRow = R.curry((rowIndex, newRow, rows) => {
 export const deleteTableRow = R.curry((rowIndex, defaultEntry, rows) => {
   return compose(
     // Ensure minimum lines count.
-    updateMinEntriesLines(4, defaultEntry),
+    updateMinEntriesLines(MIN_LINES_NUMBER, defaultEntry),
     // Remove the line by the given index.
     updateRemoveLineByIndex(rowIndex),
   )(rows);