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

Working on multiple tax rates

Browse Source
This commit is contained in:
Hillel Coren 2016-03-31 13:28:22 +03:00
parent ba3aaf47fd
commit f8256127ec
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/built.js
View File

@ -31394,12 +31394,15 @@ NINJA.invoiceLines = function(invoice) {
row.push({style:["quantity", rowStyle], text:qty || ' '}); row.push({style:["quantity", rowStyle], text:qty || ' '});
} }
if (showItemTaxes) { if (showItemTaxes) {
var str = ''; var str = ' ';
if (tax1) { if (tax1) {
str += tax1.toString() + '% '; str += tax1.toString() + '%';
} }
if (tax2) { if (tax2) {
str += tax2.toString() + '% '; if (tax1) {
str += ' ';
}
str += tax2.toString() + '%';
} }
row.push({style:["tax", rowStyle], text:str}); row.push({style:["tax", rowStyle], text:str});
} }

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

@ -395,12 +395,15 @@ NINJA.invoiceLines = function(invoice) {
row.push({style:["quantity", rowStyle], text:qty || ' '}); row.push({style:["quantity", rowStyle], text:qty || ' '});
} }
if (showItemTaxes) { if (showItemTaxes) {
var str = ''; var str = ' ';
if (tax1) { if (tax1) {
str += tax1.toString() + '% '; str += tax1.toString() + '%';
} }
if (tax2) { if (tax2) {
str += tax2.toString() + '% '; if (tax1) {
str += ' ';
}
str += tax2.toString() + '%';
} }
row.push({style:["tax", rowStyle], text:str}); row.push({style:["tax", rowStyle], text:str});
} }

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

@ -286,8 +286,8 @@
<ul class="nav nav-tabs" role="tablist" style="border: none"> <ul class="nav nav-tabs" role="tablist" style="border: none">
<li role="presentation" class="active"><a href="#notes" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.note_to_client') }}</a></li> <li role="presentation" class="active"><a href="#notes" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.note_to_client') }}</a></li>
<li role="presentation"><a href="#terms" aria-controls="terms" role="tab" data-toggle="tab">{{ trans("texts.{$entityType}_terms") }}</a></li> <li role="presentation"><a href="#terms" aria-controls="terms" role="tab" data-toggle="tab">{{ trans("texts.terms") }}</a></li>
<li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans("texts.{$entityType}_footer") }}</a></li> <li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans("texts.footer") }}</a></li>
@if ($account->isPro()) @if ($account->isPro())
<li role="presentation"><a href="#attached-documents" aria-controls="attached-documents" role="tab" data-toggle="tab">{{ trans("texts.invoice_documents") }}</a></li> <li role="presentation"><a href="#attached-documents" aria-controls="attached-documents" role="tab" data-toggle="tab">{{ trans("texts.invoice_documents") }}</a></li>
@endif @endif