resolve merge conflicts

Author: Shahidullah-Muffakir

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016400
-        versionName "9.1.64-0"
+        versionCode 1009016501
+        versionName "9.1.65-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -467,6 +467,8 @@
         "reactnativekeycommand",
         "reauthentication",
         "Reauthenticator",
+        "Rebooked",
+        "REBOOKED",
         "recategorize",
         "recents",
         "REDIRECTURI",
@@ -549,6 +551,8 @@
         "subrates",
         "substep",
         "substeps",
+        "subtab",
+        "subtabs",
         "subview",
         "Subviews",
         "superapp",

cspell.json

@@ -1,138 +1,163 @@
 ---
 title: Configure NetSuite
-description: Learn how to configure the Import, Export, and Advanced settings for Expensify's integration with NetSuite.
+description: Learn how to configure the import, export, and advanced settings for Expensify's integration with NetSuite.
+keywords: [New Expensify, NetSuite configuration, import settings, export settings, advanced sync, tags, corporate card export]
 order: 2
 ---
 
-Expensify’s integration with NetSuite streamlines expense management by automatically syncing expense reports. This reduces manual entry, minimizes errors, and provides real-time visibility into spending. With this integration, you can:
+<div id="new-expensify" markdown="1">
 
-- Speed up approvals and reimbursements.
-- Gain clear insights for budgeting and compliance.
-- Ensure seamless data flow between Expensify and NetSuite.
+Expensify’s integration with NetSuite streamlines expense management by automatically syncing reports. This reduces manual work, improves visibility, and supports accurate compliance and budgeting.
 
-# Accessing NetSuite Configuration Settings
+With this integration, you can:
 
-NetSuite is connected at the workspace level, and each workspace can have a unique configuration. 
-
-To access the configuration settings:
-
-1. Click **Settings** in the bottom left menu.
-2. Select **Workspaces** from the left menu.
-3. Choose the workspace you want to configure.
-4. Click **Accounting** in the left menu.
+- Speed up approvals and reimbursements
+- Gain real-time visibility into spend
+- Sync directly between Expensify and NetSuite
 
 ---
 
-## Step 1: Configure Import Settings
+# Access NetSuite Configuration Settings
 
-To determine how data is imported from NetSuite to Expensify:
+Each Expensify Workspace has its own configuration with NetSuite.
 
-1. Go to **Accounting** > **Import**.
-2. Review and configure the following settings:
+To access:
 
-   - **Categories**: NetSuite Expense Categories are automatically imported.
-   - **Departments, Classes, and Locations**: Import options include Tags, Report Fields, or Employee Defaults.
-   - **Customers and Projects**: Choose to import them as Tags or Report Fields.
-     - *Cross-Subsidiary Customers/Projects*: Enable this to import data across all NetSuite subsidiaries. Ensure "Intercompany Time and Expense" is enabled in NetSuite under **Setup > Company > Enable Features > Advanced Features**.
-   - **Tax**: Import NetSuite Tax Groups and configure in the Taxes tab.
-   - **Custom Segments and Records**: Import segments and records as Tags or Report Fields.
-     - Use the correct Field ID from NetSuite’s Transactions tab.
-     - Avoid using the “Filtered by” feature in Custom Segments.
-   - **Custom Lists**: Enable to import lists as Tags or Report Fields.
-
-3. Click the **three-dot icon** > **Sync Now** to update settings.
-4. After configuring settings, sync the NetSuite connection to apply changes.
+1. From the left-hand menu, go to **Workspaces > [Workspace Name] > Accounting**
+2. Click **NetSuite > Configure**
 
 ---
 
-## Step 2: Configure Export Settings
+# Step 1: Configure Import Settings
+
+To control what data is imported from NetSuite:
 
-To determine how data is exported from Expensify to NetSuite:
+1. Go to **Workspaces > [Workspace Name] > Accounting > NetSuite > Import**
+2. Review and customize these options:
 
-1. Go to **Accounting** > **Export**.
-2. Review and configure the following settings:
+- **Categories** – NetSuite Expense Categories are imported automatically
+- **Departments, Classes, and Locations** – Import as:
+  - Tags (per expense)
+  - Report Fields (per report)
+  - Employee Defaults
+- **Customers and Projects** – Import as Tags or Report Fields  
+  - To support **cross-subsidiary data**, enable **Intercompany Time and Expense** under **Setup > Company > Enable Features > Advanced Features**
+- **Tax** – Imports NetSuite Tax Groups into the **Taxes** tab
+- **Custom Segments and Records** – Import as Tags or Report Fields  
+  - Use Field IDs from NetSuite’s **Transactions** tab  
+  - Do not use the “Filtered by” feature in NetSuite Custom Segments
+- **Custom Lists** – Import as Tags or Report Fields
 
-   - **Preferred Exporter**: Select an admin to handle exports.
-   - **Export Date Options**:
-     - *Date of Last Expense*
-     - *Submitted Date*
-     - *Exported Date*
-   - **Export Out-of-Pocket Expenses As**:
-     - *Expense Reports*
-     - *Vendor Bills*
-     - *Journal Entries* (Note: Customers/projects cannot be exported with this option.)
-   - **Export Company Card Expenses As**:
-     - *Expense Reports*, *Vendor Bills*, or *Journal Entries*.
-     - Expensify Card expenses always export as Journal Entries.
-   - **Export Invoices To**: Choose an Accounts Receivable account.
-   - **Invoice Item**: Select or create an invoice line item.
-   - **Export Foreign Currency Amount**: Enable to export original expense amounts.
-   - **Export to Next Open Period**: Automatically exports expenses to the next open NetSuite period if the current one is closed.
+3. Click the **three-dot icon** and choose **Sync Now** to apply changes
 
-3. Click the **three-dot icon** > **Sync Now** to update settings.
+---
+
+# Step 2: Configure Export Settings
+
+To manage how reports are exported from Expensify to NetSuite:
+
+1. Go to **Workspaces > [Workspace Name] > Accounting > NetSuite > Export**
+2. Configure the following:
+
+- **Preferred Exporter** – Select the Workspace Admin who will handle exports
+- **Export Date Options** – Choose from:
+  - Date of Last Expense
+  - Submitted Date
+  - Exported Date
+- **Export Out-of-Pocket Expenses As**:
+  - Expense Reports
+  - Vendor Bills
+  - Journal Entries *(Note: Journal Entries do not support Customers or Projects)*
+- **Export Company Card Expenses As**:
+  - Expense Reports
+  - Vendor Bills
+  - Journal Entries  
+  - *Expensify Card expenses always export as Journal Entries*
+- **Export Invoices To** – Choose the Accounts Receivable account
+- **Invoice Item** – Select or create the item line for invoices
+- **Export Foreign Currency Amount** – Enable to export original currency values
+- **Export to Next Open Period** – Enable to skip closed periods and use the next available NetSuite period
+
+3. Click the **three-dot icon** > **Sync Now** to apply changes
 
 ---
 
-## Step 3: Configure Advanced Settings
+# Step 3: Configure Advanced Settings
 
-To manage additional integration features:
+For additional control:
 
-1. Go to **Accounting** > **Advanced**.
-2. Review and configure the following settings:
+1. Go to **Workspaces > [Workspace Name] > Accounting > NetSuite > Advanced**
+2. Configure the following options:
 
-   - **Auto-Sync**: Enable for daily syncing.
-   - **Sync Reimbursed Reports**: Automatically updates reimbursement status between Expensify and NetSuite.
-   - **Invite Employees & Set Approvals**: Imports employees and sets approval workflows.
-   - **Auto Create Employees/Vendors**: Creates a NetSuite employee/vendor record if one doesn’t exist.
-   - **Enable Newly Imported Categories**: Automatically enables new Expense Categories from NetSuite.
-   - **Approval Levels**: Set NetSuite approval levels for Expense Reports, Vendor Bills, and Journal Entries.
-   - **Custom Form ID**: Use a specific NetSuite transaction form instead of the default.
+- **Auto-Sync** – Enable for daily syncing of NetSuite data
+- **Sync Reimbursed Reports** – Automatically updates status between systems
+- **Invite Employees & Set Approvals** – Imports employees and sets workflow
+- **Auto Create Employees/Vendors** – Automatically creates a NetSuite record if one doesn’t exist
+- **Enable Newly Imported Categories** – Activates newly synced Expense Categories
+- **Approval Levels** – Set approval levels for:
+  - Expense Reports
+  - Vendor Bills
+  - Journal Entries
+- **Custom Form ID** – Use a specific NetSuite form instead of the default
 
-3. Click the **three-dot icon** > **Sync Now** to apply changes.
+3. Click the **three-dot icon** > **Sync Now** to apply changes
 
 ---
 
 # FAQ
 
 ## How do I import new tags (departments, classes, locations) from NetSuite?
 
-1. Add new tags in NetSuite.
-2. Sync the NetSuite connection in Expensify.
-3. Enable or disable tags under **Settings > Workspaces > [Workspace Name] > Tags**.
+1. Add new tags in NetSuite
+2. Sync the NetSuite connection in Expensify
+3. Enable or disable tags in **Workspaces > [Workspace Name] > Tags**
+
 
 ## Can I automate employee invitations and approval workflows from NetSuite?
 
-Yes, enabling the feature will:
-- Import employees from the connected NetSuite subsidiary.
-- Notify them via email.
-- Allow workflow configuration in Expensify Classic (**Settings > Workspaces > People**).
+Yes. When enabled:
+
+- Employees are imported from the connected NetSuite subsidiary
+- Invitations are emailed
+- Approval workflows can be customized in **Workspaces > [Workspace Name] > Workflows**
+
 
 ## Why do company card expenses export immediately, but reimbursable expenses don’t?
 
-- **Reimbursable expenses** export upon reimbursement in Expensify.
-- **Company card expenses** export upon approval.
-- If Auto-Sync is enabled, reimbursement status updates automatically.
+- **Reimbursable expenses** export after reimbursement
+- **Company card expenses** export after approval
+- **Auto-Sync** ensures reimbursement status updates automatically
+
 
 ## How do I configure corporate card exports in NetSuite?
 
-1. Select the correct corporate card under **Customization > Forms > Transaction Forms**.
-2. Enable "Show" for "Account for Corporate Card Expenses" and "Corporate Card" fields.
-3. Set the default card account on employee records.
+1. Go to **Customization > Forms > Transaction Forms**
+2. Open the correct form
+3. Enable the following fields:
+   - **Account for Corporate Card Expenses**
+   - **Corporate Card**
+4. Set the default card account on employee records
+
 
 ## Why can’t I import custom segments created before 2019.1?
 
-Check the "Use as Field ID" box in NetSuite. This assigns a unified ID to older segments.
+Check the **Use as Field ID** box in NetSuite. This assigns a usable ID to older segments for import into Expensify.
+
 
 ## How does Auto-Sync work with reimbursed reports?
 
-- If a report is reimbursed in Expensify, NetSuite marks it as paid.
-- If a report is marked as paid in NetSuite, Expensify updates the status during the next sync.
+- When a report is reimbursed in Expensify, NetSuite marks it as paid
+- If paid in NetSuite, Expensify reflects that during the next sync
+
 
 ## Will enabling Auto-Sync affect existing reports?
 
-No, only newly approved reports will auto-export. Manually export older reports if needed.
+No. Auto-Sync only applies to newly approved reports. Export older reports manually if needed.
+
 
 ## How does multi-currency exporting work in NetSuite?
 
-- Employee/vendor currency must match the subsidiary currency.
-- The bank account currency must match the subsidiary currency for bill payments.
+- The employee/vendor currency must match the subsidiary
+- The bank account currency must match the subsidiary for bill payments
+
+</div>