diff --git a/app/Models/Company.php b/app/Models/Company.php index 5b86814bfd44..36daf77e02a4 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -127,7 +127,6 @@ class Company extends BaseModel 'invoice_task_project', 'report_include_deleted', 'invoice_task_lock', - 'use_vendor_currency', 'convert_payment_currency', 'convert_expense_currency', ]; diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index ccaa1805b644..8ee24b227783 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -191,7 +191,6 @@ class CompanyTransformer extends EntityTransformer 'invoice_task_project' => (bool) $company->invoice_task_project, 'report_include_deleted' => (bool) $company->report_include_deleted, 'invoice_task_lock' => (bool) $company->invoice_task_lock, - 'use_vendor_currency' => (bool) $company->use_vendor_currency, 'convert_payment_currency' => (bool) $company->convert_payment_currency, 'convert_expense_currency' => (bool) $company->convert_expense_currency, ]; diff --git a/database/migrations/2022_12_14_004639_vendor_currency_update.php b/database/migrations/2022_12_14_004639_vendor_currency_update.php index 990af9e211ed..26b8fece844e 100644 --- a/database/migrations/2022_12_14_004639_vendor_currency_update.php +++ b/database/migrations/2022_12_14_004639_vendor_currency_update.php @@ -14,6 +14,12 @@ return new class extends Migration */ public function up() { + + Schema::table('companies', function (Blueprint $table) + { + $table->dropColumn('use_vendor_currency'); + }); + Vendor::query()->whereNull('currency_id')->orWhere('currency_id', '')->cursor()->each(function ($vendor){ $vendor->currency_id = $vendor->company->settings->currency_id;