diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index ff940e422d0b..3aadd6cea67f 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -258,8 +258,10 @@ class CompanySettings extends BaseSettings public $client_portal_allow_over_payment = false; //@implemented public $use_credits_payment = 'off'; //always, option, off //@implemented + public $hide_empty_columns_on_pdf = false; public static $casts = [ + 'hide_empty_columns_on_pdf' => 'bool', 'enable_reminder_endless' => 'bool', 'use_credits_payment' => 'string', 'recurring_invoice_number_pattern' => 'string', diff --git a/app/Models/Company.php b/app/Models/Company.php index 71fe3f6d2408..575d92138a62 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -45,7 +45,6 @@ class Company extends BaseModel protected $presenter = CompanyPresenter::class; protected $fillable = [ - 'hide_empty_columns_on_pdf', 'calculate_expense_tax_by_amount', 'invoice_expense_documents', 'invoice_task_documents', diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index d194d71ef3f4..86c08e2bad2c 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -149,7 +149,7 @@ class CompanyTransformer extends EntityTransformer 'default_task_is_date_based' => (bool)$company->default_task_is_date_based, 'enable_product_discount' => (bool)$company->enable_product_discount, 'calculate_expense_tax_by_amount' =>(bool)$company->calculate_expense_tax_by_amount, - 'hide_empty_columns_on_pdf' => (bool) $company->hide_empty_columns_on_pdf, + 'hide_empty_columns_on_pdf' => false, //@deprecate ]; } diff --git a/database/migrations/2021_01_05_013203_improve_decimal_resolution.php b/database/migrations/2021_01_05_013203_improve_decimal_resolution.php index aa04b64e7e6b..72cccfd524dd 100644 --- a/database/migrations/2021_01_05_013203_improve_decimal_resolution.php +++ b/database/migrations/2021_01_05_013203_improve_decimal_resolution.php @@ -144,6 +144,9 @@ class ImproveDecimalResolution extends Migration $table->integer('status_order')->nullable(); }); + Schema::table('companies', function (Blueprint $table) { + $table->dropColumn('hide_empty_columns_on_pdf'); + }); } /**