fineract-cn-fims-web-app.git
2 years agoMerge pull request #21 from aasaru/update_dockerfile_images develop
aasaru [Thu, 12 Dec 2019 07:36:12 +0000 (09:36 +0200)] 
Merge pull request #21 from aasaru/update_dockerfile_images

tested

2 years agoMerge pull request #23 from apache/dependabot/npm_and_yarn/mixin-deep-1.3.2
Awasum Yannick [Tue, 10 Dec 2019 07:10:59 +0000 (08:10 +0100)] 
Merge pull request #23 from apache/dependabot/npm_and_yarn/mixin-deep-1.3.2

Bump mixin-deep from 1.3.1 to 1.3.2

2 years agoBump mixin-deep from 1.3.1 to 1.3.2 23/head
dependabot[bot] [Mon, 9 Dec 2019 22:15:40 +0000 (22:15 +0000)] 
Bump mixin-deep from 1.3.1 to 1.3.2

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge pull request #22 from apache/dependabot/npm_and_yarn/ws-1.1.5
Awasum Yannick [Mon, 9 Dec 2019 22:14:43 +0000 (23:14 +0100)] 
Merge pull request #22 from apache/dependabot/npm_and_yarn/ws-1.1.5

Bump ws from 1.1.1 to 1.1.5

2 years agoBump ws from 1.1.1 to 1.1.5 22/head
dependabot[bot] [Mon, 9 Dec 2019 21:26:56 +0000 (21:26 +0000)] 
Bump ws from 1.1.1 to 1.1.5

Bumps [ws](https://github.com/websockets/ws) from 1.1.1 to 1.1.5.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/1.1.1...1.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoupdate Docker images to most recent version 21/head
Juhan Aasaru [Thu, 26 Sep 2019 19:33:34 +0000 (22:33 +0300)] 
update Docker images to most recent version

2 years agoMerge pull request #20 from aasaru/awasum_docker
aasaru [Tue, 17 Sep 2019 06:42:03 +0000 (09:42 +0300)] 
Merge pull request #20 from aasaru/awasum_docker

FINCN-164: Dockerize fims web app with adjustments to make it work with docker-compose

2 years agoAdd travis and docker hub banners to readme 20/head
Juhan Aasaru [Thu, 12 Sep 2019 11:47:14 +0000 (14:47 +0300)] 
Add travis and docker hub banners to readme

2 years agoMerge branch 'awasum_docker' of https://github.com/aasaru/fineract-cn-fims-web-app...
Juhan Aasaru [Thu, 12 Sep 2019 11:37:14 +0000 (14:37 +0300)] 
Merge branch 'awasum_docker' of https://github.com/aasaru/fineract-cn-fims-web-app into awasum_docker

2 years agoFINCN-164 revert proxy.conf.json, add notification-ms endpoints, fix padding
Juhan Aasaru [Thu, 12 Sep 2019 11:36:57 +0000 (14:36 +0300)] 
FINCN-164 revert proxy.conf.json, add notification-ms endpoints, fix padding

2 years agoMerge branch 'develop' into awasum_docker
aasaru [Tue, 10 Sep 2019 11:26:49 +0000 (14:26 +0300)] 
Merge branch 'develop' into awasum_docker

2 years agoFINCN-164 Implement changes suggested by https://github.com/apache/fineract-cn-fims...
Juhan Aasaru [Tue, 10 Sep 2019 11:26:12 +0000 (14:26 +0300)] 
FINCN-164 Implement changes suggested by https://github.com/apache/fineract-cn-fims-web-app/pull/20#issuecomment-528414249

2 years agoMerge pull request #18 from awasum/docker
Awasum Yannick [Thu, 5 Sep 2019 15:03:46 +0000 (16:03 +0100)] 
Merge pull request #18 from awasum/docker

FINCN-164: Dockerize fims web app

2 years agorename ledger-ms -> accounting-ms
Juhan Aasaru [Thu, 5 Sep 2019 13:21:43 +0000 (16:21 +0300)] 
rename ledger-ms -> accounting-ms

2 years agoreplace localhost with docker image names
Juhan Aasaru [Thu, 5 Sep 2019 09:31:53 +0000 (12:31 +0300)] 
replace localhost with docker image names

2 years agoMerge remote-tracking branch 'awasum/docker' into awasum_docker
Juhan Aasaru [Thu, 5 Sep 2019 08:25:54 +0000 (11:25 +0300)] 
Merge remote-tracking branch 'awasum/docker' into awasum_docker

2 years agoMerge pull request #19 from aasaru/kengneruphine_develop_fixed
Awasum Yannick [Wed, 4 Sep 2019 19:47:16 +0000 (20:47 +0100)] 
Merge pull request #19 from aasaru/kengneruphine_develop_fixed

Pull request #12 with a fix that makes tests pass

2 years agomake travis build all branches, fix failing build 19/head
Juhan Aasaru [Wed, 4 Sep 2019 19:19:59 +0000 (22:19 +0300)] 
make travis build all branches, fix failing build

2 years agoMerge remote-tracking branch 'kengneruphine/develop' into kengneruphine_develop_fixed
Juhan Aasaru [Wed, 4 Sep 2019 19:17:05 +0000 (22:17 +0300)] 
Merge remote-tracking branch 'kengneruphine/develop' into kengneruphine_develop_fixed

2 years agoUpdate signOff-meeting.component.ts 12/head
Ruphine Kengne [Mon, 8 Jul 2019 17:41:18 +0000 (18:41 +0100)] 
Update signOff-meeting.component.ts

adding a newline a the end of the file

2 years agoMerge branch 'develop' into develop
Ruphine Kengne [Mon, 8 Jul 2019 17:09:52 +0000 (18:09 +0100)] 
Merge branch 'develop' into develop

2 years agofixing tslint to make ci pass
Ruphine Kengne [Mon, 8 Jul 2019 16:38:05 +0000 (17:38 +0100)] 
fixing tslint to make ci pass

2 years agoDockerize fims web app 18/head
Awasum Yannick [Sat, 6 Jul 2019 16:52:57 +0000 (17:52 +0100)] 
Dockerize fims web app

2 years agoUpdate README.md 16/head
Awasum Yannick [Fri, 5 Jul 2019 17:16:55 +0000 (18:16 +0100)] 
Update README.md

3 years agoMerge pull request #13 from crain/develop
Myrle Krantz [Tue, 23 Oct 2018 13:08:28 +0000 (15:08 +0200)] 
Merge pull request #13 from crain/develop

Fix breaking build

3 years agoFormat code, removed commented code, optimized imports 13/head
Mark [Fri, 19 Oct 2018 09:31:42 +0000 (11:31 +0200)] 
Format code, removed commented code, optimized imports
Use "map" instead of "for each" as uglify breaks because of global variable use within a for each loop

3 years agoMerge pull request #11 from cabrelkemfang/develop
Myrle Krantz [Thu, 18 Oct 2018 18:37:20 +0000 (20:37 +0200)] 
Merge pull request #11 from cabrelkemfang/develop

Fixing the issue FINCN-87 :loan products interest must be given to two decimal points

3 years agoFixing the issue FINCN-101:Group Definition Minimum and Maximum Numbers should not...
kengneruphine [Wed, 17 Oct 2018 14:46:52 +0000 (15:46 +0100)] 
Fixing the issue FINCN-101:Group Definition Minimum and Maximum Numbers should not be decimals

3 years agoFixing the issue FINCN-87 :loan products interest must be given to two decimal points 11/head
cabrelkemfang [Wed, 17 Oct 2018 08:59:43 +0000 (09:59 +0100)] 
Fixing the issue FINCN-87 :loan products interest must be given to two decimal points

3 years agoMerge pull request #10 from cabrelkemfang/develop
Myrle Krantz [Tue, 16 Oct 2018 19:26:12 +0000 (21:26 +0200)] 
Merge pull request #10 from cabrelkemfang/develop

Fixing the issue FINCN-99:Unable To Create A Loan Product

3 years agoFixing the issue FINCN-99:Unable To Create A Loan Product 10/head
cabrelkemfang [Tue, 16 Oct 2018 10:51:39 +0000 (11:51 +0100)] 
Fixing the issue FINCN-99:Unable To Create A Loan Product

3 years agoMerge pull request #9 from cabrelkemfang/develop
Myrle Krantz [Thu, 11 Oct 2018 11:32:55 +0000 (13:32 +0200)] 
Merge pull request #9 from cabrelkemfang/develop

 Fixing bug FINCN-88 :member loan ledger input help missing

3 years ago Fixing bug FINCN-88 :member loan ledger input help missing 9/head
cabrelkemfang [Thu, 11 Oct 2018 08:36:08 +0000 (09:36 +0100)] 
 Fixing bug FINCN-88 :member loan ledger input help missing

3 years agoMerge pull request #7 from kengneruphine/develop
Awasum Yannick [Tue, 14 Aug 2018 14:09:48 +0000 (15:09 +0100)] 
Merge pull request #7 from kengneruphine/develop

Consume sign-off meeting endpoint [GSoC Period]

3 years agoimplement multiple selection on members during group creation, consume sign-off endpoint 7/head
kengneruphine [Fri, 10 Aug 2018 14:33:48 +0000 (15:33 +0100)] 
implement multiple selection on members during group creation, consume sign-off endpoint

3 years agoMerge pull request #5 from davidyaha/feature/fix-ts
Awasum Yannick [Thu, 2 Aug 2018 17:55:42 +0000 (18:55 +0100)] 
Merge pull request #5 from davidyaha/feature/fix-ts

Fix ts compilation

3 years agoMerge pull request #6 from kengneruphine/develop
Awasum Yannick [Thu, 2 Aug 2018 17:51:23 +0000 (18:51 +0100)] 
Merge pull request #6 from kengneruphine/develop

Extending fims-web-app to provide a UI for the Group microservice

3 years agocheck vulnerability issues 6/head
kengneruphine [Thu, 2 Aug 2018 14:59:42 +0000 (15:59 +0100)] 
check vulnerability issues

3 years agoReverted the base URLs for the different services to localhost and finished consuming...
kengneruphine [Thu, 2 Aug 2018 14:44:24 +0000 (15:44 +0100)] 
Reverted the base URLs for the different services to localhost and finished consuming get request for the meeting endpoint

3 years agoFixed TS compilation issues 5/head
David Yahalomi [Tue, 31 Jul 2018 13:26:14 +0000 (16:26 +0300)] 
Fixed TS compilation issues

3 years agoAdded watch flag on the dev script for faster dev cycle
David Yahalomi [Tue, 31 Jul 2018 13:25:51 +0000 (16:25 +0300)] 
Added watch flag on the dev script for faster dev cycle

3 years agoAdded yarn.lock for yarn users
David Yahalomi [Tue, 31 Jul 2018 13:25:25 +0000 (16:25 +0300)] 
Added yarn.lock for yarn users

3 years agoUpdate ngrx/effects and rxjs to fix ts compilation errors
David Yahalomi [Tue, 31 Jul 2018 13:24:56 +0000 (16:24 +0300)] 
Update ngrx/effects and rxjs to fix ts compilation errors

3 years agoLift node version max version restriction
David Yahalomi [Tue, 31 Jul 2018 13:24:12 +0000 (16:24 +0300)] 
Lift node version max version restriction

3 years agoconsuming meeting endpoint
kengneruphine [Sun, 22 Jul 2018 18:14:34 +0000 (19:14 +0100)] 
consuming meeting endpoint

3 years agomodifying proxy.conf.json file to have the ip address of my new cloudspace
kengneruphine [Tue, 10 Jul 2018 09:07:02 +0000 (10:07 +0100)] 
modifying proxy.conf.json file to have the ip address of my new cloudspace

3 years agoMerge branch 'develop' of https://github.com/kengneruphine/group-fineract-cn-fims...
kengneruphine [Mon, 9 Jul 2018 04:41:15 +0000 (05:41 +0100)] 
Merge branch 'develop' of https://github.com/kengneruphine/group-fineract-cn-fims-web-app into develop

Merge fixes vulnerabilities issues

3 years agoconsuming endpoints for meeting
kengneruphine [Mon, 9 Jul 2018 04:37:23 +0000 (05:37 +0100)] 
consuming endpoints for meeting

3 years agoFixing vulnerabilities issues
Ruphine Kengne [Thu, 5 Jul 2018 15:42:51 +0000 (16:42 +0100)] 
Fixing vulnerabilities issues

modifying the version of hoek and handlebars

3 years agoRemoving close,reopen group and adding status
kengneruphine [Thu, 5 Jul 2018 15:35:15 +0000 (16:35 +0100)] 
Removing close,reopen group and adding status

4 years agoGroupDefinition Ui,fix the errors with ui display for closeGroup and reopenGroup
kengneruphine [Thu, 21 Jun 2018 11:57:00 +0000 (12:57 +0100)] 
GroupDefinition Ui,fix the errors with ui display for closeGroup and reopenGroup

4 years agoimplemented permissions and view groupDefinition UI
kengneruphine [Sun, 17 Jun 2018 05:15:26 +0000 (06:15 +0100)] 
implemented permissions and view groupDefinition UI

4 years ago Adding group store
kengneruphine [Mon, 4 Jun 2018 18:28:46 +0000 (19:28 +0100)] 
 Adding group store

4 years agoFixing errors on close group component
kengneruphine [Sun, 3 Jun 2018 16:38:26 +0000 (17:38 +0100)] 
Fixing errors on close group component

4 years agogroup detail,close-group component
kengneruphine [Tue, 29 May 2018 16:10:24 +0000 (17:10 +0100)] 
group detail,close-group component

4 years agoimplementing attach meeting date
kengneruphine [Sun, 27 May 2018 21:01:30 +0000 (22:01 +0100)] 
implementing attach meeting date

4 years agocreate group component implementation
kengneruphine [Sat, 26 May 2018 07:07:32 +0000 (08:07 +0100)] 
create group component implementation

4 years agoMerge pull request #4 from myrle-krantz/develop
Myrle Krantz [Mon, 16 Apr 2018 19:21:05 +0000 (21:21 +0200)] 
Merge pull request #4 from myrle-krantz/develop

Updating package names.

4 years agoAdjusting to package name changes in upstream repositories. 4/head
Myrle Krantz [Mon, 16 Apr 2018 19:04:47 +0000 (21:04 +0200)] 
Adjusting to package name changes in upstream repositories.

4 years agoMerge pull request #3 from myrle-krantz/develop
Myrle Krantz [Wed, 11 Apr 2018 16:46:52 +0000 (18:46 +0200)] 
Merge pull request #3 from myrle-krantz/develop

Updating file license headers and readme links from Mifos to Apache.

4 years agoSwitching links to Apache Fineract infrastructure. 3/head
Myrle Krantz [Wed, 11 Apr 2018 16:35:40 +0000 (18:35 +0200)] 
Switching links to Apache Fineract infrastructure.

4 years agorelicensing .scss files from Mifos to Apache
Myrle Krantz [Wed, 11 Apr 2018 16:28:31 +0000 (18:28 +0200)] 
relicensing .scss files from Mifos to Apache

4 years agorelicensing .html files from Mifos to Apache
Myrle Krantz [Wed, 11 Apr 2018 16:16:11 +0000 (18:16 +0200)] 
relicensing .html files from Mifos to Apache

4 years agorelicensing .ts files from Mifos to Apache
Myrle Krantz [Wed, 11 Apr 2018 07:26:43 +0000 (09:26 +0200)] 
relicensing .ts files from Mifos to Apache

4 years agoUpdating licenseCheck and NOTICE file.
Myrle Krantz [Tue, 10 Apr 2018 10:59:04 +0000 (12:59 +0200)] 
Updating licenseCheck and NOTICE file.

4 years agoMerge pull request #2 from ebenezergraham/patch-1
Myrle Krantz [Fri, 6 Apr 2018 17:50:16 +0000 (19:50 +0200)] 
Merge pull request #2 from ebenezergraham/patch-1

Fixed a broken link to the demo-server

4 years agoFixed a broken link to the demo-server 2/head
Ebenezer Graham [Fri, 6 Apr 2018 16:57:59 +0000 (20:57 +0400)] 
Fixed a broken link to the demo-server

4 years agoMerge pull request #1 from kengneruphine/develop
Awasum Yannick [Sun, 1 Apr 2018 06:03:08 +0000 (07:03 +0100)] 
Merge pull request #1 from kengneruphine/develop

Complete migration of code from Mifos IO for fims-web-app

4 years agoMerge pull request #54 from markvanveen/develop 1/head
Mark van Veen [Fri, 3 Nov 2017 16:40:04 +0000 (17:40 +0100)] 
Merge pull request #54 from markvanveen/develop

Show ledger balance

4 years agoShow ledger balance
Mark [Fri, 3 Nov 2017 16:38:58 +0000 (17:38 +0100)] 
Show ledger balance
Use account identifier when linking to account entries from deposit account

4 years agoMerge pull request #52 from ndelvos78/IncludeLoanProductInfoInDetailsForMemberLoan
Mark van Veen [Fri, 3 Nov 2017 10:14:45 +0000 (11:14 +0100)] 
Merge pull request #52 from ndelvos78/IncludeLoanProductInfoInDetailsForMemberLoan

Include loan product info in details for member loan

4 years agoAdding info regarding loan product to details of the member loan (since once the...
ndelvos78 [Tue, 31 Oct 2017 12:53:44 +0000 (08:53 -0400)] 
Adding info regarding loan product to details of the member loan (since once the loan is approved, it cannot be edited anymore and the info on which loan product it was based will no longer be displayed anywhere anymore).

4 years agoAdding info regarding loan product to details of the member loan (since once the...
ndelvos78 [Tue, 31 Oct 2017 12:53:04 +0000 (08:53 -0400)] 
Adding info regarding loan product to details of the member loan (since once the loan is approved, it cannot be edited anymore and the info on which loan product it was based will no longer be displayed anywhere anymore).

4 years agoMerge branch 'develop' of https://github.com/KuelapInc/fims-web-app into IncludeLoanP...
ndelvos78 [Tue, 31 Oct 2017 00:20:35 +0000 (20:20 -0400)] 
Merge branch 'develop' of https://github.com/KuelapInc/fims-web-app into IncludeLoanProductInfoInDetailsForMemberLoan

Merge with local changes.

4 years agoAdding info regarding loan product to details of the member loan (since once the...
ndelvos78 [Mon, 30 Oct 2017 20:30:48 +0000 (16:30 -0400)] 
Adding info regarding loan product to details of the member loan (since once the loan is approved, it cannot be edited anymore and the info on which loan product it was based will no longer be displayed anywhere anymore).

4 years agoAdding info regarding loan product to details of the member loan (since once the...
ndelvos78 [Mon, 30 Oct 2017 18:21:14 +0000 (14:21 -0400)] 
Adding info regarding loan product to details of the member loan (since once the loan is approved, it cannot be edited anymore and the info on which loan product it was based will no longer be displayed anywhere anymore).

4 years agoAdding info regarding loan product to details of the member loan (since once the...
ndelvos78 [Mon, 30 Oct 2017 18:15:28 +0000 (14:15 -0400)] 
Adding info regarding loan product to details of the member loan (since once the loan is approved, it cannot be edited anymore and the info on which loan product it was based will no longer be displayed anywhere anymore).

4 years agoMerge pull request #51 from ndelvos78/WordingChanges
Mark van Veen [Mon, 30 Oct 2017 07:35:55 +0000 (08:35 +0100)] 
Merge pull request #51 from ndelvos78/WordingChanges

Wording changes (customer to member)

4 years agoChanged message text that was still referring to customer instead of member.
ndelvos78 [Fri, 27 Oct 2017 19:42:05 +0000 (15:42 -0400)] 
Changed message text that was still referring to customer instead of member.

4 years agoChanged message text that was still referring to customer instead of member.
ndelvos78 [Thu, 26 Oct 2017 13:29:56 +0000 (09:29 -0400)] 
Changed message text that was still referring to customer instead of member.

4 years agoMerge pull request #50 from ndelvos78/DepositAndLoanTermValidation
Mark van Veen [Thu, 26 Oct 2017 07:23:36 +0000 (09:23 +0200)] 
Merge pull request #50 from ndelvos78/DepositAndLoanTermValidation

Deposit and loan term validation, custom field length and precision validation

4 years agoAdded maxScale validation for length and precision fields (Members > Custom fields...
ndelvos78 [Wed, 25 Oct 2017 19:17:58 +0000 (15:17 -0400)] 
Added maxScale validation for length and precision fields (Members > Custom fields) as well.

4 years agoTerm input field for deposit and loan product creation now becomes invalid if a decim...
ndelvos78 [Wed, 25 Oct 2017 18:39:46 +0000 (14:39 -0400)] 
Term input field for deposit and loan product creation now becomes invalid if a decimal number is entered. Term input field for loan product creation also becomes invalid if 0 is entered.

4 years agoMerge pull request #49 from markvanveen/develop
Mark van Veen [Tue, 24 Oct 2017 13:32:20 +0000 (15:32 +0200)] 
Merge pull request #49 from markvanveen/develop

Add new fields for deposit products and customer

4 years agoAdd new fields for deposit products and customer
Mark [Tue, 24 Oct 2017 13:28:48 +0000 (15:28 +0200)] 
Add new fields for deposit products and customer

4 years agoMerge pull request #48 from markvanveen/develop
Mark van Veen [Sun, 22 Oct 2017 12:39:46 +0000 (14:39 +0200)] 
Merge pull request #48 from markvanveen/develop

Add upload of loan documents

4 years agoAdd upload of loan documents
Mark [Sun, 22 Oct 2017 12:39:09 +0000 (14:39 +0200)] 
Add upload of loan documents

4 years agoMerge pull request #47 from markvanveen/develop
Mark van Veen [Tue, 17 Oct 2017 13:46:47 +0000 (15:46 +0200)] 
Merge pull request #47 from markvanveen/develop

Teller denomination

4 years agoIncreased timeout as the 10 secs are not sufficient anymore because the app takes...
Mark [Tue, 17 Oct 2017 13:45:10 +0000 (15:45 +0200)] 
Increased timeout as the 10 secs are not sufficient anymore because the app takes to long to build

4 years agoAdd denomination management for teller
Mark [Tue, 17 Oct 2017 13:22:11 +0000 (15:22 +0200)] 
Add denomination management for teller
Add disabled attribute for fab button

4 years agoExclude empty entries by default
Mark [Mon, 16 Oct 2017 10:55:38 +0000 (12:55 +0200)] 
Exclude empty entries by default
Upgrade angular cli because of OOM

4 years agoMerge pull request #46 from markvanveen/develop
Mark van Veen [Fri, 13 Oct 2017 17:50:17 +0000 (19:50 +0200)] 
Merge pull request #46 from markvanveen/develop

Upgrade to latest angular/material

4 years agoMerge remote-tracking branch 'remotes/upstream/develop' into develop
Mark [Fri, 13 Oct 2017 17:49:30 +0000 (19:49 +0200)] 
Merge remote-tracking branch 'remotes/upstream/develop' into develop

4 years agoFix test because of refactoring
Mark [Fri, 13 Oct 2017 17:48:57 +0000 (19:48 +0200)] 
Fix test because of refactoring

4 years agoUpgrade to angular 4.4.5
Mark [Fri, 13 Oct 2017 15:50:27 +0000 (17:50 +0200)] 
Upgrade to angular 4.4.5
Upgrade to angular-material 2.0.0-beta.12
Refactored code because of breaking changes

4 years agoMerge pull request #45 from markvanveen/develop
Mark van Veen [Thu, 12 Oct 2017 10:44:55 +0000 (12:44 +0200)] 
Merge pull request #45 from markvanveen/develop

Financial Condition Report

4 years agoAdd financial condition report
Mark [Thu, 12 Oct 2017 10:44:09 +0000 (12:44 +0200)] 
Add financial condition report

4 years agoChange order of credit/debit column to be consistent
Mark [Thu, 12 Oct 2017 10:43:40 +0000 (12:43 +0200)] 
Change order of credit/debit column to be consistent

4 years agoSet title to empty string to prevent displaying undefined when not title is given
Mark [Thu, 12 Oct 2017 10:43:06 +0000 (12:43 +0200)] 
Set title to empty string to prevent displaying undefined when not title is given

4 years agoMerge pull request #43 from markvanveen/develop
Mark van Veen [Wed, 11 Oct 2017 08:58:55 +0000 (10:58 +0200)] 
Merge pull request #43 from markvanveen/develop

Add new permission for income statement