Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop

src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.js

@@ -43,7 +43,6 @@ function ReconcileCreditNoteDeleteAlert({
           message: intl.get('reconcile_credit_note.alert.success_message'),
           intent: Intent.SUCCESS,
         });
-        closeDrawer('credit-note-detail-drawer');
       })
       .catch(
         ({

src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js

@@ -11,6 +11,7 @@ export default function LockingTransactionsDialogContent({
   moduleName,
   isEnabled,
 }) {
+
   return (
     <LockingTransactionsFormProvider
       isEnabled={isEnabled}

src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.js

@@ -39,13 +39,13 @@ function LockingTransactionsForm({
   // Initial form values.
   const initialValues = React.useMemo(
     () => ({
-      ...(!isEnabled
+      ...(isEnabled
         ? {
-            ...defaultInitialValues,
+            ...transformToForm(transactionLocking, defaultInitialValues),
             module: moduleName,
           }
         : {
-            ...transformToForm(transactionLocking, defaultInitialValues),
+            ...defaultInitialValues,
             module: moduleName,
           }),
     }),

src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js

@@ -25,8 +25,6 @@ function LockingTransactionsFormProvider({
       enabled: !!isEnabled,
     });
 
-  // const isEnabled = transactionLocking?.is_enabled;
-
   // State provider.
   const provider = {
     dialogName,

src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/components.js

@@ -25,14 +25,14 @@ export function useRefundCreditTransactionsTableColumns() {
     () => [
       {
         Header: intl.get('date'),
-        accessor: 'date',
+        accessor: 'formatted_date',
         Cell: FormatDateCell,
         width: 100,
         className: 'date',
       },
       {
         Header: intl.get('refund_credit_transactions.column.amount_refunded'),
-        accessor: 'amount',
+        accessor: 'formtted_amount',
         width: 100,
         className: 'amount',
         align: 'right',

src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/components.js

@@ -25,14 +25,14 @@ export function useRefundCreditTransactionsTableColumns() {
     () => [
       {
         Header: intl.get('date'),
-        accessor: 'date',
+        accessor: 'formatted_date',
         Cell: FormatDateCell,
         width: 100,
         className: 'date',
       },
       {
         Header: intl.get('refund_vendor_credit.column.amount'),
-        accessor: 'amount',
+        accessor: 'formtted_amount',
         width: 100,
         className: 'amount',
         align: 'right',

src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js

@@ -47,7 +47,7 @@ export function ActionsMenu({
           onClick={safeCallback(onOpen, original)}
         />
       </If>
-      <If condition={!original.is_draft && original.is_published}>
+      <If condition={!original.is_draft && !original.is_closed && original.is_published}>
         <MenuItem
           // icon={<Icon icon="quick-payment-16" />}
           text={intl.get('vendor_credits.action.reconcile_with_bills')}

src/containers/TransactionsLocking/TransactionsLockingBody.js

@@ -23,14 +23,15 @@ function TransactionsLockingBodyJsx({
   // #withAlertsActions
   openAlert,
 }) {
-  const {
-    isTransactionLockingLoading,
-    transactionLockingType,
-  } = useTransactionsLockingContext();
+  const { isTransactionLockingLoading, transactionLockingType } =
+    useTransactionsLockingContext();
 
   // Handle locking transactions.
-  const handleLockingTransactions = (module) => {
-    openDialog('locking-transactions', { module: module });
+  const handleLockingTransactions = (module, {}, isEnabled) => {
+    openDialog('locking-transactions', {
+      isEnabled: isEnabled,
+      module: module,
+    });
   };
   // Handle unlocking transactions
   const handleUnlockTransactions = (module) => {
@@ -49,6 +50,7 @@ function TransactionsLockingBodyJsx({
     transactionLockingType === 'partial' ? (
       <TransactionsLockingList
         onLock={handleLockingTransactions}
+        onEditLock={handleLockingTransactions}
         onCancelLock={handleUnlockTransactions}
         onUnlockPartial={handleUnlockingPartial}
         onCancelUnlockPartial={handleCancelUnlockingPartail}

src/containers/TransactionsLocking/components.js

@@ -251,10 +251,10 @@ function TransactionsLockingItemActions() {
   } = useTransactionsLockingItemContext();
 
   const handleLockClick = (event) => {
-    safeInvoke(onLock, module, isEnabled, event);
+    safeInvoke(onLock, module, event);
   };
   const handleEditBtn = (event) => {
-    safeInvoke(onEditLock, module, event);
+    safeInvoke(onEditLock, module, isEnabled, event);
   };
   const handleUnlockPartial = (event) => {
     safeInvoke(onUnlockPartial, module, event);
@@ -401,7 +401,7 @@ export const TransLockingReason = styled.div`
 `;
 
 const TransUnlockWrap = styled.div`
-  padding-top: 10px; 
+  padding-top: 10px;
   border-top: 1px solid #ddd;
   margin-top: 10px;