Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-05-04 20:11:27 +03:00
parent 9d858f4bfc
commit bbbcca2768
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/InvoiceController.php
View File

@ -143,7 +143,7 @@ class InvoiceController extends \BaseController {
$invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date); $invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
$invoice->due_date = Utils::fromSqlDate($invoice->due_date); $invoice->due_date = Utils::fromSqlDate($invoice->due_date);
$invoice->is_pro = $client->account->isPro(); $invoice->is_pro = $client->account->isPro();
$data = array( $data = array(
'hideHeader' => true, 'hideHeader' => true,
'showBreadcrumbs' => false, 'showBreadcrumbs' => false,

3
app/models/Invoice.php
View File

@ -74,7 +74,8 @@ class Invoice extends EntityModel
'tax_name', 'tax_name',
'tax_rate', 'tax_rate',
'account', 'account',
'invoice_design_id']); 'invoice_design_id',
'is_pro']);
$this->client->setVisible([ $this->client->setVisible([
'name', 'name',

4
public/built.js
View File

@ -37107,9 +37107,9 @@ function displayInvoiceItems(doc, invoice, layout) {
y += 4; y += 4;
if (invoice.invoice_design_id == 1) { if (invoice.invoice_design_id == 1) {
SetPdfColor('LightBlue', doc); SetPdfColor('LightBlue', doc, 'primary');
} else if (invoice.invoice_design_id == 2) { } else if (invoice.invoice_design_id == 2) {
SetPdfColor('SomeGreen', doc); SetPdfColor('SomeGreen', doc, 'primary');
} else if (invoice.invoice_design_id == 3) { } else if (invoice.invoice_design_id == 3) {
doc.setFontType('bold'); doc.setFontType('bold');
} else { } else {

4
public/js/script.js
View File

@ -1640,9 +1640,9 @@ function displayInvoiceItems(doc, invoice, layout) {
y += 4; y += 4;
if (invoice.invoice_design_id == 1) { if (invoice.invoice_design_id == 1) {
SetPdfColor('LightBlue', doc); SetPdfColor('LightBlue', doc, 'primary');
} else if (invoice.invoice_design_id == 2) { } else if (invoice.invoice_design_id == 2) {
SetPdfColor('SomeGreen', doc); SetPdfColor('SomeGreen', doc, 'primary');
} else if (invoice.invoice_design_id == 3) { } else if (invoice.invoice_design_id == 3) {
doc.setFontType('bold'); doc.setFontType('bold');
} else { } else {