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: fix 'Invoice issued to' in business design for quote

Browse Source
This commit is contained in:
Hillel Coren 2016-02-03 22:19:15 +02:00
parent cc49415a78
commit 25b8c54355
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Account.php
View File

@ -646,6 +646,7 @@ class Account extends Eloquent
'quote_number', 'quote_number',
'total', 'total',
'invoice_issued_to', 'invoice_issued_to',
'quote_issued_to',
//'date', //'date',
'rate', 'rate',
'hours', 'hours',

4
public/built.js
View File

@ -31100,8 +31100,8 @@ NINJA.decodeJavascript = function(invoice, javascript)
if (match.indexOf('?') < 0 || value) { if (match.indexOf('?') < 0 || value) {
if (invoice.partial && field == 'balance_due') { if (invoice.partial && field == 'balance_due') {
field = 'amount_due'; field = 'amount_due';
} else if (invoice.is_quote && field == 'your_invoice') { } else if (invoice.is_quote) {
field = 'your_quote'; field = field.replace('invoice', 'quote');
} }
var label = invoiceLabels[field]; var label = invoiceLabels[field];
if (match.indexOf('UC') >= 0) { if (match.indexOf('UC') >= 0) {

4
public/js/pdf.pdfmake.js
View File

@ -191,8 +191,8 @@ NINJA.decodeJavascript = function(invoice, javascript)
if (match.indexOf('?') < 0 || value) { if (match.indexOf('?') < 0 || value) {
if (invoice.partial && field == 'balance_due') { if (invoice.partial && field == 'balance_due') {
field = 'amount_due'; field = 'amount_due';
} else if (invoice.is_quote && field == 'your_invoice') { } else if (invoice.is_quote) {
field = 'your_quote'; field = field.replace('invoice', 'quote');
} }
var label = invoiceLabels[field]; var label = invoiceLabels[field];
if (match.indexOf('UC') >= 0) { if (match.indexOf('UC') >= 0) {

2
resources/lang/en/texts.php
View File

@ -1142,6 +1142,6 @@ return array(
'all_pages_footer' => 'Show footer on', 'all_pages_footer' => 'Show footer on',
'invoice_currency' => 'Invoice Currency', 'invoice_currency' => 'Invoice Currency',
'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.', 'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
'quote_issued_to' => 'Quote issued to',
); );