feat: improve financial statements rows color

packages/server/src/api/controllers/Organization.ts

@@ -65,7 +65,6 @@ export default class OrganizationController extends BaseController {
       check('fiscal_year').exists().isIn(MONTHS),
       check('language').exists().isString().isIn(ACCEPTED_LOCALES),
       check('date_format').optional().isIn(DATE_FORMATS),
-      check('tax_number').optional({ nullable: true }).isString().trim().escape(),
     ];
   }
 

packages/server/src/interfaces/Setup.ts

@@ -6,7 +6,6 @@ export interface IOrganizationSetupDTO {
   fiscalYear: string;
   industry: string;
   timeZone: string;
-  taxNumber: string;
 }
 
 export interface IOrganizationBuildDTO {
@@ -17,7 +16,6 @@ export interface IOrganizationBuildDTO {
   timezone: string;
   fiscalYear: string;
   dateFormat?: string;
-  taxNumber: string;
 }
 
 export interface IOrganizationUpdateDTO {
@@ -27,7 +25,6 @@ export interface IOrganizationUpdateDTO {
   timezone: string;
   fiscalYear: string;
   industry: string;
-  taxNumber: string;
 }
 
 export interface IOrganizationBuildEventPayload {

packages/server/src/services/Organization/OrganizationService.ts

@@ -189,7 +189,6 @@ export default class OrganizationService {
       tenant.metadata?.baseCurrency
     );
     await tenant.saveMetadata(organizationDTO);
-    // console.log('organizationDTO', organizationDTO);
 
     if (organizationDTO.baseCurrency !== tenant.metadata?.baseCurrency) {
       // Triggers `onOrganizationBaseCurrencyUpdated` event.

packages/server/src/system/migrations/20231012112401_add_tax_number_column_to_tenants_metadata_table.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('tenants_metadata', (table) => {
-    table.string('tax_number')
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('tenants_metadata', (table) => {
-    table.dropColumn('tax_number');
-  });
-};

packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.tsx

@@ -62,6 +62,7 @@ const BalanceSheetDataTable = styled(ReportDataTable)`
         border-bottom: 0;
         padding-top: 0.32rem;
         padding-bottom: 0.32rem;
+        color: #252A31;
       }
       &.is-expanded {
         .td:not(.name) .cell-inner {
@@ -72,6 +73,7 @@ const BalanceSheetDataTable = styled(ReportDataTable)`
         .td {
           font-weight: 500;
           border-top: 1px solid #bbb;
+          color: #000;
         }
       }
 

packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.tsx

@@ -60,9 +60,8 @@ const CashflowStatementDataTable = styled(DataTable)`
           border-bottom: 0;
           padding-top: 0.32rem;
           padding-bottom: 0.32rem;
+          color: #252a31;
         }
-
-        // &.row-type--AGGREGATE,
         &.row_type--ACCOUNTS {
           border-top: 1px solid #bbb;
         }
@@ -72,6 +71,9 @@ const CashflowStatementDataTable = styled(DataTable)`
         &.row_type--TOTAL {
           font-weight: 500;
 
+          .td {
+            color: #000;
+          }
           &:not(:first-child) .td {
             border-top: 1px solid #bbb;
           }

packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.tsx

@@ -61,6 +61,7 @@ const ProfitLossDataTable = styled(ReportDataTable)`
         border-bottom: 0;
         padding-top: 0.32rem;
         padding-bottom: 0.32rem;
+        color: #252A31;
       }
       &.is-expanded {
         .td:not(.name) .cell-inner {
@@ -71,6 +72,7 @@ const ProfitLossDataTable = styled(ReportDataTable)`
         .td {
           font-weight: 500;
           border-top: 1px solid #bbb;
+          color: #000;
         }
       }
       &:last-of-type .td {

packages/webapp/src/containers/Preferences/General/General.schema.tsx

@@ -6,9 +6,6 @@ const Schema = Yup.object().shape({
   name: Yup.string()
     .required()
     .label(intl.get('organization_name_')),
-  tax_number: Yup.string()
-    .nullable()
-    .label(intl.get('organization_tax_number_')),
   industry: Yup.string()
     .nullable()
     .label(intl.get('organization_industry_')),

packages/webapp/src/containers/Preferences/General/GeneralForm.tsx

@@ -59,17 +59,6 @@ export default function PreferencesGeneralForm({ isSubmitting }) {
         <FInputGroup medium={'true'} name={'name'} fastField={true} />
       </FFormGroup>
 
-      {/* ---------- Organization Tax Number ----------  */}
-      <FFormGroup
-        name={'tax_number'}
-        label={<T id={'organization_tax_number'} />}
-        inline={true}
-        helperText={<T id={'shown_on_sales_forms_and_purchase_orders'} />}
-        fastField={true}
-      >
-        <FInputGroup medium={'true'} name={'tax_number'} fastField={true} />
-      </FFormGroup>
-
       {/* ---------- Industry ----------  */}
       <FFormGroup
         name={'industry'}

packages/webapp/src/containers/Preferences/General/GeneralFormPage.tsx

@@ -23,7 +23,6 @@ const defaultValues = {
   fiscal_year: '',
   date_format: '',
   timezone: '',
-  tax_number: '',
 };
 
 /**

packages/webapp/src/containers/Setup/SetupOrganizationForm.tsx

@@ -43,15 +43,6 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
         <FInputGroup name={'name'} fastField={true} />
       </FFormGroup>
 
-      {/* ---------- Organization Tax Number ----------  */}
-      <FFormGroup
-        name={'tax_number'}
-        label={<T id={'organization_tax_number'} />}
-        fastField={true}
-      >
-        <FInputGroup name={'tax_number'} fastField={true} />
-      </FFormGroup>
-
       {/* ---------- Location ---------- */}
       <FFormGroup
         name={'location'}

packages/webapp/src/lang/en/index.json

@@ -37,7 +37,6 @@
   "success": "Success",
   "register_a_new_organization": "Register a New Organization.",
   "organization_name": "Organization Name",
-  "organization_tax_number": "Organization Tax Number",
   "email": "Email",
   "email_address": "Email Address",
   "register": "Register",
@@ -340,7 +339,6 @@
   "item_type_": "Item type",
   "item_name_": "Item name",
   "organization_industry_": "Organization industry",
-  "organization_tax_number_": "Organization tax number",
   "base_currency_": "Base currency",
   "date_format_": "Date format",
   "category_name_": "Category name",