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

Fix taxes for new quotes

Browse Source
This commit is contained in:
Hillel Coren 2017-02-10 09:31:54 +02:00
parent 7f49db8946
commit b25c85faaf
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Constants.php
View File

@ -292,7 +292,7 @@ if (!defined('APP_NAME'))
define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest'));
define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '3.0.4' . env('NINJA_VERSION_SUFFIX'));
define('NINJA_VERSION', '3.0.5' . env('NINJA_VERSION_SUFFIX'));
define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));

6
app/Http/Controllers/QuoteController.php
View File

@ -98,7 +98,11 @@ class QuoteController extends BaseController
$defaultTax = false;
foreach ($rates as $rate) {
$options[$rate->rate . ' ' . $rate->name] = $rate->name . ' ' . ($rate->rate+0) . '%';
$name = $rate->name . ' ' . ($rate->rate + 0) . '%';
if ($rate->is_inclusive) {
$name .= ' - ' . trans('texts.inclusive');
}
$options[($rate->is_inclusive ? '1 ' : '0 ') . $rate->rate . ' ' . $rate->name] = $name;
// load default invoice tax
if ($rate->id == $account->default_tax_rate_id) {

2
docs/conf.py
View File

@ -59,7 +59,7 @@ author = u'Invoice Ninja'
# The short X.Y version.
version = u'3.0'
# The full version, including alpha/beta/rc tags.
release = u'3.0.4'
release = u'3.0.5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.