diff --git a/src/containers/TransactionsLocking/TransactionsLockingHeader.js b/src/containers/TransactionsLocking/TransactionsLockingHeader.js index 3c818bed8..7eb897a06 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingHeader.js +++ b/src/containers/TransactionsLocking/TransactionsLockingHeader.js @@ -72,8 +72,7 @@ export function TransactionsLockingHeader() { intent={Intent.PRIMARY} >

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. +

@@ -82,8 +81,7 @@ export function TransactionsLockingHeader() { ) : (

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. +

diff --git a/src/containers/TransactionsLocking/TransactionsLockingList.js b/src/containers/TransactionsLocking/TransactionsLockingList.js index 6bc980042..045e50bf4 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingList.js +++ b/src/containers/TransactionsLocking/TransactionsLockingList.js @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { Paragraph } from 'components'; +import { Paragraph, FormattedMessage as T } from 'components'; import { TransactionsLockingProvider } from './TransactionsLockingProvider'; import { TransactionsLockingHeader } from './TransactionsLockingHeader'; import { TransactionsLockingBody } from './TransactionsLockingBody'; @@ -15,10 +15,7 @@ export default function TransactionsLockingListPage() { - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem - ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. + diff --git a/src/containers/TransactionsLocking/components.js b/src/containers/TransactionsLocking/components.js index e022852f8..61d8a4503 100644 --- a/src/containers/TransactionsLocking/components.js +++ b/src/containers/TransactionsLocking/components.js @@ -180,7 +180,7 @@ function TransactionsLockingItemContent() { - Lorem ipsum dolor sit amet, consectetur adipisicing elit. + @@ -340,7 +340,7 @@ const TransactionLockingWrapp = styled.div` border-color: #fc8483; ${TransLockingIcon} { - color: #ff8282; + color: #ef6d6d; } `} `; @@ -401,9 +401,9 @@ export const TransLockingReason = styled.div` `; const TransUnlockWrap = styled.div` - padding-top: 12px; + padding-top: 10px; border-top: 1px solid #ddd; - margin-top: 12px; + margin-top: 10px; ${TransLockingReason} { margin-top: 8px; diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 6223bfef6..fc2b8bab1 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1633,8 +1633,12 @@ "transactions_locking.lock_reason": "Lock Reason: {value}.", "transactions_locking.partial_unlocked_from": "Partial unlocked from {fromDate} to {toDate}.", "transactions_locking.unlock_reason": "Unlock Reason: {value}.", + "transactions_locking.callout.lock_individual.desc": "You have the ability to lock transactions of all modules at once instead of locking transactions each module​​ partially.", + "transactions_locking.callout.lock_all_at_once.desc": "You have the ability to lock or unlock transactions of each module individually instead of locking all transactions at once.", + "transactions_locking.long_description": "Transactions locking has the ability to lock all organization transactions so users can’t edit, delete or create new transactions during the past period, but still have the ability to create draft invoices or bills and that won’t affect financial reports. typically set a lock date when your financial records are being prepared for the year.", "payment_transactions": "Payment transactions", "invoice_transactions.column.withdrawal_account": "Deposit account", - "bill_transactions.column.deposit_account": "Withdrawal account" + "bill_transactions.column.deposit_account": "Withdrawal account", + "transactions_locking.lock_item.no_lock": "There are no locked transactions in this module." }