diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php index d308f7188ba9..1bfbff2f956b 100644 --- a/app/Helpers/Epc/EpcQrGenerator.php +++ b/app/Helpers/Epc/EpcQrGenerator.php @@ -76,7 +76,7 @@ class EpcQrGenerator $this->formatMoney($this->amount), $this->sepa['purpose'], substr($this->invoice->number,0,34), - substr($this->invoice->public_notes,0,139), + '', '' )), "\n"); diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 723cf5978ae7..73c0ba94a012 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -698,7 +698,7 @@ class InvoiceController extends BaseController /*If we are using bulk actions, we don't want to return anything */ switch ($action) { case 'auto_bill': - $invoice = AutoBill::dispatch($invoice->id, $invoice->company->db); + AutoBill::dispatch($invoice->id, $invoice->company->db); return $this->itemResponse($invoice); case 'clone_to_invoice': diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 121502d300b0..fab87c414d95 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -181,7 +181,10 @@ class MigrationController extends BaseController $company->tasks()->forceDelete(); $company->vendors()->forceDelete(); $company->expenses()->forceDelete(); - $company->purchase_orders()->forceDelete(); +// $company->bank_transaction_rules()->forceDelete(); + $company->bank_transactions()->forceDelete(); + $company->bank_integrations()->forceDelete(); + $company->all_activities()->forceDelete(); $settings = $company->settings;