- fix: store children accounts with Redux store.

- fix: store expense payment date with transactions.
- fix: Total assets, liabilities and equity on balance sheet.
- tweaks: dashboard content and sidebar style.
- fix: reset form with contact list on journal entry form.
- feat: Add hints to filter accounts in financial statements.
This commit is contained in:
Ahmed Bouhuolia
2020-07-12 12:31:12 +02:00
parent 4bd8f1628d
commit 9d9c7c1568
60 changed files with 1685 additions and 929 deletions

View File

@@ -35,15 +35,14 @@
}
&__body{
padding-left: 20px;
padding-right: 20px;
padding-left: 15px;
padding-right: 15px;
display: flex;
justify-content: center;
align-items: center;
}
&__header.is-hidden + .financial-statement__body{
.financial-sheet{
margin-top: 40px;
}
@@ -55,7 +54,7 @@
border-radius: 10px;
min-width: 640px;
width: auto;
padding: 30px 20px;
padding: 30px 18px;
max-width: 100%;
margin: 15px auto 35px;
min-height: 400px;
@@ -65,7 +64,7 @@
&__title{
margin: 0;
font-weight: 400;
font-size: 22px;
font-size: 20px;
color: #464646;
text-align: center;
}
@@ -93,6 +92,7 @@
background: #fff;
}
}
.tr.no-results{
.td{
flex-direction: column;
@@ -117,7 +117,8 @@
font-size: 12px;
}
.dashboard__loading-indicator{
margin: 60px auto 0;
margin: auto;
padding: 0;
}
&--expended{
@@ -141,7 +142,9 @@
&--opening_balance,
&--closing_balance{
background-color: #fbfbfb;
.td{
background-color: #fbfbfb;
}
}
&--closing_balance .td{
@@ -158,28 +161,22 @@
&--general-ledger,
&--journal{
width: auto;
margin-left: 10px;
margin-right: 10px;
margin-top: 10px;
border-color: #EEEDED;
}
&--journal{
.financial-sheet__table{
.tbody{
.tr:not(.no-results) .td{
padding: 0.4rem;
color: #444;
border-bottom-color: #F0F0F0;
color: #000;
border-bottom-color: #DDD;
min-height: 32px;
border-left: 1px solid #F0F0F0;
border-left: 1px dotted #DDD;
&:first-of-type{
border-left: 0;
}
&.account_code{
color: #666;
}
}
}
}
@@ -189,9 +186,6 @@
.financial-sheet__table{
.tbody{
.account_code.td{
color: #666;
}
.total.td {
border-bottom-color: #000;
}
@@ -212,10 +206,25 @@
&--balance-sheet{
.financial-sheet__table{
.tbody{
.total.td{
border-bottom-color: #000;
}
.tr.row_type--total_row{
.total.td,
.account_name.td{
font-weight: 600;
color: #333;
}
}
.tr.is-expanded{
.td.total,
.td.total-period{
> span{
display: none;
}
}
}
}
}
}
@@ -236,6 +245,29 @@
}
}
}
&--minimal{
border: 0;
padding: 0;
margin-top: 20px;
.financial-sheet{
&__title{
font-size: 18px;
color: #333;
}
&__title + .financial-sheet__date{
margin-top: 8px;
}
&__table{
margin-top: 20px;
}
}
}
&.is-full-width{
width: 100%;
}
}
@@ -272,6 +304,5 @@
line-height: 1.55;
margin-top: 12px;
}
}
}