shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1198 from batuhawk/master

Browse Source 
Invoice and bill tax alignment
This commit is contained in:
Batuhan Baş 2020-01-29 06:20:01 +03:00 committed by GitHub
commit 14fd4c2b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/css/element.css vendored
View File

@ -2609,8 +2609,13 @@
max-width: unset !important;
}
.select-tax .el-select span:first-of-type {
width: 60px !important;
:first-of-type.select-tax .el-select span:first-of-type {
width: 125px !important;
overflow: hidden;
}
.select-tax .el-select span:last-of-type {
width: 40px !important;
overflow: hidden;
}
@ -2619,7 +2624,7 @@
}
.select-tax .el-select .el-select__tags .el-select__tags-text {
width: 20px !important;
width: 82px !important;
overflow: hidden;
}
@ -15459,22 +15464,10 @@
max-width: unset !important;
}
.select-tax .el-select span:first-of-type
{
width: 60px !important;
overflow: hidden;
}
.select-tax .el-input--prefix .el-input__inner {
padding-left: 23px !important;
}
.select-tax .el-select .el-select__tags .el-select__tags-text
{
width: 20px !important;
overflow: hidden;
}
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after
{
right: 4px !important;

4
resources/views/purchases/bills/create.blade.php
View File

@ -44,7 +44,7 @@
@stack('name_th_end')
@stack('quantity_th_start')
<th class="col-md-2 text-center border-right-0 border-bottom-0">{{ trans('bills.quantity') }}</th>
<th class="col-md-1 text-center border-right-0 border-bottom-0">{{ trans('bills.quantity') }}</th>
@stack('quantity_th_end')
@stack('price_th_start')
@ -52,7 +52,7 @@
@stack('price_th_end')
@stack('taxes_th_start')
<th class="col-md-2 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
<th class="col-md-3 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@stack('taxes_th_end')
@stack('total_th_start')

4
resources/views/purchases/bills/edit.blade.php
View File

@ -45,7 +45,7 @@
@stack('name_th_end')
@stack('quantity_th_start')
<th class="col-md-2 text-center border-right-0 border-bottom-0">{{ trans('bills.quantity') }}</th>
<th class="col-md-1 text-center border-right-0 border-bottom-0">{{ trans('bills.quantity') }}</th>
@stack('quantity_th_end')
@stack('price_th_start')
@ -53,7 +53,7 @@
@stack('price_th_end')
@stack('taxes_th_start')
<th class="col-md-2 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
<th class="col-md-3 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@stack('taxes_th_end')
@stack('total_th_start')

4
resources/views/purchases/bills/item.blade.php
View File

@ -51,7 +51,7 @@
@stack('name_td_end')
@stack('quantity_td_start')
<td class="col-md-2 border-right-0 border-bottom-0">
<td class="col-md-1 border-right-0 border-bottom-0">
@stack('quantity_input_start')
<input class="form-control text-center"
autocomplete="off"
@ -89,7 +89,7 @@
@stack('price_td_end')
@stack('taxes_td_start')
<td class="col-md-2 border-right-0 border-bottom-0">
<td class="col-md-3 border-right-0 border-bottom-0">
@stack('tax_id_input_start')
{{ Form::multiSelectAddNewGroup('tax_id', '', '', $taxes, '', [
'data-item' => 'tax_id',

4
resources/views/sales/invoices/create.blade.php
View File

@ -44,7 +44,7 @@
@stack('name_th_end')
@stack('quantity_th_start')
<th class="col-md-2 text-center border-right-0 border-bottom-0">{{ trans($text_override['quantity']) }}</th>
<th class="col-md-1 text-center border-right-0 border-bottom-0">{{ trans($text_override['quantity']) }}</th>
@stack('quantity_th_end')
@stack('price_th_start')
@ -52,7 +52,7 @@
@stack('price_th_end')
@stack('taxes_th_start')
<th class="col-md-2 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
<th class="col-md-3 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@stack('taxes_th_end')
@stack('total_th_start')

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

@ -45,7 +45,7 @@
@stack('name_th_end')
@stack('quantity_th_start')
<th class="col-md-2 text-center border-right-0 border-bottom-0">{{ trans($text_override['quantity']) }}</th>
<th class="col-md-1 text-center border-right-0 border-bottom-0">{{ trans($text_override['quantity']) }}</th>
@stack('quantity_th_end')
@stack('price_th_start')
@ -53,7 +53,7 @@
@stack('price_th_end')
@stack('taxes_th_start')
<th class="col-md-2 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
<th class="col-md-3 text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@stack('taxes_th_end')
@stack('total_th_start')

4
resources/views/sales/invoices/item.blade.php
View File

@ -51,7 +51,7 @@
@stack('name_td_end')
@stack('quantity_td_start')
<td class="col-md-2 border-right-0 border-bottom-0">
<td class="col-md-1 border-right-0 border-bottom-0">
@stack('quantity_input_start')
<input class="form-control text-center"
autocomplete="off"
@ -89,7 +89,7 @@
@stack('price_td_end')
@stack('taxes_td_start')
<td class="col-md-2 border-right-0 border-bottom-0">
<td class="col-md-3 border-right-0 border-bottom-0">
@stack('tax_id_input_start')
{{ Form::multiSelectAddNewGroup('tax_id', '', '', $taxes, '', [
'data-item' => 'tax_id',