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

Clarify that inclusive can’t be used as defaults

Browse Source
This commit is contained in:
Hillel Coren 2017-08-28 11:07:21 +03:00
parent a8d73fe1f2
commit 2c10dcae41
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2181,7 +2181,7 @@ $LANG = array(
'created_new_company' => 'Successfully created new company', 'created_new_company' => 'Successfully created new company',
'fees_disabled_for_gateway' => 'Fees are disabled for this gateway.', 'fees_disabled_for_gateway' => 'Fees are disabled for this gateway.',
'logout_and_delete' => 'Log Out/Delete Account', 'logout_and_delete' => 'Log Out/Delete Account',
'tax_rate_type_help' => 'Inclusive taxes adjust the line item cost when selected.', 'tax_rate_type_help' => 'Inclusive tax rates adjust the line item cost when selected.<br/>Only exclusive tax rates can be used as a default.',
'invoice_footer_help' => 'Use $pageNumber and $pageCount to display the page information.', 'invoice_footer_help' => 'Use $pageNumber and $pageCount to display the page information.',
'credit_note' => 'Credit Note', 'credit_note' => 'Credit Note',
'credit_issued_to' => 'Credit issued to', 'credit_issued_to' => 'Credit issued to',

7
resources/views/accounts/tax_rate.blade.php
View File

@ -29,10 +29,9 @@
{!! Former::text('rate')->label('texts.rate')->append('%') !!} {!! Former::text('rate')->label('texts.rate')->append('%') !!}
{!! Former::radios('is_inclusive')->radios([ {!! Former::radios('is_inclusive')->radios([
trans('texts.exclusive') => array('name' => 'is_inclusive', 'value' => 0), trans('texts.exclusive') . ': 100 + 10% = 100 + 10' => array('name' => 'is_inclusive', 'value' => 0),
trans('texts.inclusive') => array('name' => 'is_inclusive', 'value' => 1), trans('texts.inclusive') . ':&nbsp; 100 + 10% = 90.91 + 9.09' => array('name' => 'is_inclusive', 'value' => 1),
])->inline() ])->check(0)
->check(0)
->label('type') ->label('type')
->help('tax_rate_type_help') !!} ->help('tax_rate_type_help') !!}