Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 22:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' into bank_rules

Browse Source
This commit is contained in:
David Bomba 2022-11-24 08:05:15 +11:00
commit b043d1a190
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Epc/EpcQrGenerator.php
View File

@ -76,7 +76,7 @@ class EpcQrGenerator
$this->formatMoney($this->amount), $this->formatMoney($this->amount),
$this->sepa['purpose'], $this->sepa['purpose'],
substr($this->invoice->number,0,34), substr($this->invoice->number,0,34),
substr($this->invoice->public_notes,0,139), '',
'' ''
)), "\n"); )), "\n");

2
app/Http/Controllers/InvoiceController.php
View File

@ -698,7 +698,7 @@ class InvoiceController extends BaseController
/*If we are using bulk actions, we don't want to return anything */ /*If we are using bulk actions, we don't want to return anything */
switch ($action) { switch ($action) {
case 'auto_bill': case 'auto_bill':
$invoice = AutoBill::dispatch($invoice->id, $invoice->company->db); AutoBill::dispatch($invoice->id, $invoice->company->db);
return $this->itemResponse($invoice); return $this->itemResponse($invoice);
case 'clone_to_invoice': case 'clone_to_invoice':

5
app/Http/Controllers/MigrationController.php
View File

@ -181,7 +181,10 @@ class MigrationController extends BaseController
$company->tasks()->forceDelete(); $company->tasks()->forceDelete();
$company->vendors()->forceDelete(); $company->vendors()->forceDelete();
$company->expenses()->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(); $company->all_activities()->forceDelete();
$settings = $company->settings; $settings = $company->settings;