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

update from master

Browse Source
This commit is contained in:
steenrabol 2016-01-11 20:41:02 +01:00
parent 6133c6ff07
commit bcffedcbd3
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,12 +124,8 @@ 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 = $account->isPro(); $invoice->is_pro = $account->isPro();
<<<<<<< HEAD
=======
$invoice->invoice_fonts = $account->getFontsData(); $invoice->invoice_fonts = $account->getFontsData();
>>>>>>> cf24684adbce402f1c0e266672c4a2a5767dc754
if ($invoice->invoice_design_id == CUSTOM_DESIGN) { if ($invoice->invoice_design_id == CUSTOM_DESIGN) {
$invoice->invoice_design->javascript = $account->custom_design; $invoice->invoice_design->javascript = $account->custom_design;
} else { } else {

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

@ -1012,7 +1012,7 @@ return array(
'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.', 'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',
'white_label_purchase_link' => 'Purchase a white label license', 'white_label_purchase_link' => 'Purchase a white label license',
<<<<<<< HEAD
// Expense / vendor // Expense / vendor
'expense' => 'Expense', 'expense' => 'Expense',
@ -1061,8 +1061,7 @@ return array(
'edit_payment_terms' => 'Edit payment term', 'edit_payment_terms' => 'Edit payment term',
'edit_payment_term' => 'Edit payment term', 'edit_payment_term' => 'Edit payment term',
'archive_payment_term' => 'Archive payment term', 'archive_payment_term' => 'Archive payment term',
);
=======
// recurring due dates // recurring due dates
'recurring_due_dates' => 'Recurring Invoice Due Dates', 'recurring_due_dates' => 'Recurring Invoice Due Dates',
@ -1106,4 +1105,4 @@ return array(
'payment_message_button' => 'Thank you for your payment of :amount.', 'payment_message_button' => 'Thank you for your payment of :amount.',
); );
>>>>>>> cf24684adbce402f1c0e266672c4a2a5767dc754

4
resources/views/invoices/edit.blade.php
View File

@ -892,9 +892,6 @@
@endif @endif
applyComboboxListeners(); applyComboboxListeners();
<<<<<<< HEAD
});
=======
}); });
function onFrequencyChange(){ function onFrequencyChange(){
@ -914,7 +911,6 @@
$('#recurring_due_date').val(''); $('#recurring_due_date').val('');
} }
} }
>>>>>>> cf24684adbce402f1c0e266672c4a2a5767dc754
function applyComboboxListeners() { function applyComboboxListeners() {
var selectorStr = '.invoice-table input, .invoice-table textarea'; var selectorStr = '.invoice-table input, .invoice-table textarea';