diff --git a/app/controllers/QuoteController.php b/app/controllers/QuoteController.php index 005cccd77735..e0d887c25bd4 100644 --- a/app/controllers/QuoteController.php +++ b/app/controllers/QuoteController.php @@ -35,11 +35,13 @@ class QuoteController extends \BaseController { 'columns'=>Utils::trans(['checkbox', 'quote_number', 'client', 'quote_date', 'quote_total', 'due_date', 'status', 'action']) ]; + /* if (Invoice::scope()->where('is_recurring', '=', true)->count() > 0) { $data['secEntityType'] = ENTITY_RECURRING_INVOICE; $data['secColumns'] = Utils::trans(['checkbox', 'frequency', 'client', 'start_date', 'end_date', 'quote_total', 'action']); } + */ return View::make('list', $data); } diff --git a/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php b/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php index d97a063649b7..81442b001b3f 100644 --- a/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php +++ b/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php @@ -422,10 +422,14 @@ class AddInvoiceDesignTable extends Migration { var account = invoice.account; var currencyId = client.currency_id; + layout.accountTop += 25; + layout.headerTop += 25; + layout.tableTop += 25; + if (invoice.image) { var left = layout.headerRight - invoice.imageWidth; - doc.addImage(invoice.image, 'JPEG', left, 30); + doc.addImage(invoice.image, 'JPEG', left, 50); } /* table header */