diff --git a/client/src/common/homepageOptions.js b/client/src/common/homepageOptions.js index f5416d554..681ceef20 100644 --- a/client/src/common/homepageOptions.js +++ b/client/src/common/homepageOptions.js @@ -7,35 +7,32 @@ export const accountsReceivable = [ shortcuts: [ { title: 'Sales invoices', - description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + description: 'Tracking sales invoices with your customers with payment due date.', link: '/invoices', }, { title: 'Sales estimates', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Manage your sales estimates to create quotes that can later be turned to a sale invoice.', link: '/estimates', }, { title: 'Sales receipts', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Manage sales receipts for sales that get paid immediately from the customer.', link: '/receipts', }, { title: 'Customers', - description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', - + description: 'Manage the customers relations with customer receivable and credit balances.', link: '/customers', }, { title: 'Customers payment', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Manage payment transactions from your customers with sale invoices.', link: '/payment-receives', }, ], @@ -48,21 +45,18 @@ export const accountsPayable = [ shortcuts: [ { title: 'Purchase invoices', - description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', - + description: 'Manage the purchase invoices with your vendors with payment due date.', link: '/bills', }, { title: 'Vendors', - description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + description: 'Manage the vendors relations with vendor payable and debit balances.', link: '/vendors', }, { title: 'Vendors payments', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Manage payments transactions to your vendors with purchase invoices.', link: '/payment-mades', }, @@ -77,26 +71,24 @@ export const financialAccounting = [ { title: 'Chart of accounts', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', - + 'Manage your accounts chart to record your transactions and categorise your transactions in parent accounts.', link: '/accounts', }, { title: 'Manual journal', - description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + description: 'Manage manual journal transactions on accounts, cost centra and projects.', link: '/manual-journals', }, { title: 'Expenses', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Track your indirect expenses under specific categories such as payroll, rent.', link: '/expenses', }, { title: 'Financial statements', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Show financial reports about your organization to summarize your business’s financial performance.', link: '/financial-reports', }, ], @@ -110,19 +102,18 @@ export const productsServices = [ { title: 'Products & Services', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Manage your products (inventory or non-inventory) and services and place them into categories.', link: '/items', }, { title: 'Products & Services Categories', description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + 'Group your products and service into different categories.', link: 'items/categories', }, { title: 'Inventory Adjustments', - description: - 'Labore aute elit proident sit culpa. Commodo nulla veniam ullamco ullamco ut nulla pariatur eu. Esse tempor irure incididunt veniam sint excepteur quis.', + description: 'Manage your inventory adjustment of inventory items.', link: '/inventory-adjustments', }, ], diff --git a/client/src/style/pages/FinancialStatements/FinancialSheets.scss b/client/src/style/pages/FinancialStatements/FinancialSheets.scss index 41f21197d..ab0c18d8e 100644 --- a/client/src/style/pages/FinancialStatements/FinancialSheets.scss +++ b/client/src/style/pages/FinancialStatements/FinancialSheets.scss @@ -3,7 +3,7 @@ .section-title { font-weight: 500; - margin-bottom: 1.6rem; + margin-bottom: 1.4rem; font-size: 20px; color: rgb(31, 50, 85); margin-top: 10px; @@ -15,14 +15,13 @@ margin-left: -20px; } &__item { - width: 270px; - margin-bottom: 20px; - margin-left: 20px; + width: 260px; + margin-bottom: 16px; + margin-left: 16px; border: 1px solid #d1dee2; border-top: 3px solid #d1dee2; - padding-top: 16px; background: #fff; - padding: 20px; + padding: 18px; .title { font-size: 16px; diff --git a/server/package.json b/server/package.json index 77603cef1..527bbc6b9 100644 --- a/server/package.json +++ b/server/package.json @@ -4,11 +4,12 @@ "description": "", "main": "src/server.ts", "scripts": { - "build": "clear && tsc -p tsconfig.json && copy-18n", "start": "cross-env NODE_PATH=./src nodemon", "inspect": "cross-env NODE_PATH=./src nodemon src/server.ts", "copy-18n": "cpy --cwd=src/locales --parents '**/*.json' ../../build/locales", - "clear": "rimraf build" + "clear": "rimraf build", + "build:ts": "tsc -p tsconfig.json", + "build": "npm-run-all clear build:ts copy-18n" }, "author": "Ahmed Bouhuolia, ", "license": "ISC", @@ -94,13 +95,15 @@ "knex-factory": "0.0.6", "mocha": "^5.2.0", "module-alias": "^2.2.2", + "npm-run-all": "^4.1.5", "nyc": "^14.1.1", "regenerator-runtime": "^0.13.7", "sinon": "^7.4.2", "ts-node": "^9.0.0", "typedi": "^0.8.0", "typescript": "^3.9.7", - "webpack-cli": "^4.6.0" + "webpack-cli": "^4.6.0", + "rimraf": "^3.0.2" }, "_moduleAliases": { "loaders": "build/loaders", @@ -121,5 +124,6 @@ "services": "build/services", "subscribers": "build/subscribers", "system": "build/system" - } + }, + "_moduleAliases": {} } diff --git a/server/src/services/Sales/SalesInvoices.ts b/server/src/services/Sales/SalesInvoices.ts index f3f40e928..d8094ca0e 100644 --- a/server/src/services/Sales/SalesInvoices.ts +++ b/server/src/services/Sales/SalesInvoices.ts @@ -399,7 +399,7 @@ export default class SaleInvoicesService implements ISalesInvoicesService { if (saleInvoiceObj.invoiceNo) { await this.validateInvoiceNumberUnique( tenantId, - saleInvoiceDTO.invoiceNo, + saleInvoiceObj.invoiceNo, saleInvoiceId ); }