CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,695 Commits 21 Branches 0 Tags
75dc87cccf1cb9a1ef7ea79bfa69adf6f265a4e6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vishwas Babu A J 75dc87cccf Merge pull request #785 from pramodn02/MIFOSX-932 
MIFOSX-932 - chaged the query to fetch hierarchy
 2014-03-03 22:32:53 -08:00
Vishwas Babu A J fb1c158e95 Merge pull request #784 from pramodn02/MIFOSX-931 
MIFOSX-931 - added API doc for overdraft account
 2014-03-03 21:31:35 -08:00
Vishwas Babu A J 1e63957dc9 Merge pull request #783 from pramodn02/MIFOSX-932 
MIFOSX-932 - Basic Savings reports
 2014-03-03 15:21:18 -08:00
Vishwas Babu A J b02a357581 Merge pull request #781 from vishwasbabu/develop-new 
applying format across the project and fixing all warnings
 2014-03-01 04:54:10 -08:00
Vishwas Babu A J 1c1e83eb5e applying format across the project and fixing all warnings 
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsApplicationProcessWritePlatformService.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
 2014-03-01 04:50:17 -08:00
Vishwas Babu A J c404dfdeb1 Merge pull request #779 from lingalamadhukar/MIFOSX-946 
MIFOSX-946 capture loanpurpose for group and jlg loans
 2014-03-01 02:47:22 -08:00
Vishwas Babu A J 975ae07cf7 Merge pull request #780 from vishwasbabu/develop 
fix for MIFOSX-884
 2014-03-01 02:40:11 -08:00
Vishwas Babu A J fb6c5440dc fix for MIFOSX-884 2014-03-01 02:37:12 -08:00
Vishwas Babu A J 4ae3e99c18 Merge pull request #774 from pramodn02/MIFOSX-929 
MIFOSX-929 - added check for multiple permission for client
 2014-02-28 11:09:58 -08:00
Vishwas Babu A J 85193881b5 clean up to created Date field in SavingsAccountTransactionDTO 2014-02-28 10:56:34 -08:00
Vishwas Babu A J 9a668e6cac Merge pull request #778 from pramodn02/savingstransaction 
MIFOSX-939 - corrected order of saving transactions
 2014-02-28 10:45:59 -08:00
Vishwas Babu A J e6b2a35f41 updates to MIFOSX-888 2014-02-27 22:28:19 -08:00
Vishwas Babu A J fd32d997e7 Merge pull request #773 from pramodn02/savings 
MIFOSX-931 - added current account
 2014-02-25 01:44:38 -08:00
Vishwas Babu A J 7ad240b1af updates for 1.18.0 release 2014-02-23 16:52:19 -08:00
Vishwas Babu A J cf51a85cdc Update CHANGELOG.md 
for 1.18.0 release
 2014-02-23 16:46:24 -08:00
Vishwas Babu A J 6653dae41b merging 1.17.1 into develop 2014-02-23 16:40:15 -08:00
Vishwas Babu A J 219bd33adf updating gradle properties for 1.17.1 release 2014-02-23 16:35:24 -08:00
Vishwas Babu A J 61236ae249 Update CHANGELOG.md 
for 1.17.1 release
 2014-02-23 16:29:59 -08:00
Vishwas Babu A J 6ef342a486 Merge pull request #772 from emmanuelnnaa/MIFOSX-923 
MIFOSX-923 - entity status property added to the search resultset
 2014-02-23 15:34:09 -08:00
Vishwas Babu A J a3a643258a Merge pull request #771 from pramodn02/MIFOSX-920 
MIFOSX-920 - corrected parser to return number if it is bigdecimal
 2014-02-19 21:25:30 -08:00
Vishwas Babu A J 4865e2a156 Merge pull request #750 from lingalamadhukar/MIFOSX-880 
MIFOSX-880 calculate interest from interestChargedFromDate
 2014-02-18 20:45:12 -08:00
Vishwas Babu A J 3277f84811 Merge pull request #753 from goutham-M/mifosx-collectionsheet-enhancement 
MIFOSX-902 productive collection sheet feature is added
 2014-02-18 20:09:20 -08:00
Vishwas Babu A J 89e3016fc9 Merge pull request #770 from pramodn02/MIFOSX-847_1 
MIFOSX-847 - added variations in loan data for clients
 2014-02-18 19:55:24 -08:00
Vishwas Babu A J 2a21eda984 Merge pull request #761 from lingalamadhukar/MIFOSX-911 
MIFOSX-911 Update Api doc issues
 2014-02-18 18:46:05 -08:00
Vishwas Babu A J 5e82d5c320 Merge pull request #769 from lingalamadhukar/MIFOSX-864 
MIFOSX-864 Add timeline for list client loans
 2014-02-18 18:43:18 -08:00
Vishwas Babu A J 05fa39ac1e Merge pull request #754 from Musoni/MIFOSX-900 
MIFOSX-900 - Refuse deactivating charges that are currently in use
 2014-02-18 18:30:29 -08:00
Vishwas Babu A J 65eab01daa Merge pull request #768 from pramodn02/MIFOSX-92_2 
MIFOSX-92 - modified column names
 2014-02-18 16:52:18 -08:00
Vishwas Babu A J 0bb6e0d9f4 Merge pull request #755 from pramodn02/MIFOSX-906 
MIFOSX-906 - added creation of transaction id before creating Journal En...
 2014-02-16 19:11:19 -08:00
Vishwas Babu A J 34600936aa Merge pull request #764 from vorburger/readMeDemoBeta 
add link to demo.openmf.org/beta/ Community App to README
 2014-02-16 19:07:11 -08:00
Vishwas Babu A J fd6551bcba Merge pull request #766 from pramodn02/MIFOSX-895 
MIFOSX-895 : corrected validations
 2014-02-16 19:06:01 -08:00
Vishwas Babu A J 0651468beb Merge pull request #756 from Musoni/MIFOSX-867 
MIFOSX-867 - Fixed disbursement or submit date after repayment startdate...
 2014-02-13 23:05:23 -08:00
Vishwas Babu A J 25a32ea925 Merge pull request #760 from goutham-M/mifosx-journalentryerrmsgfix 
MIFOSX-910 for journal entry posting not proper err msg displaying fixed
 2014-02-13 23:03:15 -08:00
Vishwas Babu A J 13f8c6cac8 Merge pull request #751 from emmanuelnnaa/MIFOSX-901 
MIFOSX-901 - "BIT" datatype/columntype missing displaytype, throws "error.msg.invalid.lookup.type" error message
 2014-02-13 17:48:51 -08:00
Vishwas Babu A J ac932974f3 MIFOSX-751 updates 2014-02-10 09:07:10 +05:30
Vishwas Babu A J 36fcb9c069 correcting sql patch numbering 2014-02-09 02:39:13 +05:30
Vishwas Babu A J f0eea29fb2 Merge pull request #743 from Musoni/MIFOSX-888 
MIFOSX-888 - Early Repayments Strategy
 2014-02-09 01:09:50 +05:30
Vishwas Babu A J 9edb9ae219 Merge pull request #735 from lingalamadhukar/mifosx-871 
MIFOSX-871 Advanced search query with search operators
 2014-02-09 00:58:53 +05:30
Vishwas Babu A J 02191d6280 Merge pull request #736 from pramodn02/MIFOSX-870 
MIFOSX-870 - added disbursement charges to update summary job
 2014-02-09 00:56:05 +05:30
Vishwas Babu A J 103beaf56c correcting names for SQL patch files for MIFOSX-897 and MIFOSX-896 2014-02-09 00:53:39 +05:30
Vishwas Babu A J 6fed3899c5 Merge pull request #747 from emmanuelnnaa/MIFOS-6119 
MIFOSX-896 - added permission for 'savingsaccountcharge' endpoint - simple SQL insert
 2014-02-09 00:44:03 +05:30
Vishwas Babu A J 84c967b674 Merge pull request #748 from emmanuelnnaa/MIFOSX-897 
MIFOSX-897 - SQL for create journalentry checker permission. Permission missing in m_permission table.
 2014-02-08 19:16:59 +05:30
Vishwas Babu A J 062ae8905e MifosX-872 optionally capture payment type for a manual journal entry 2014-02-08 17:39:11 +05:30
Vishwas Babu A J 133e4e4d90 MifosX-872 optionally capture payment type for a manual journal entry 2014-02-08 16:54:52 +05:30
Vishwas Babu A JandSander van der Heyden f09cf9a433 MIFOSX-888 - Early Repayments Strategy 2014-02-03 15:41:04 +01:00
Vishwas Babu A J b78dd9e127 MIFOSX-879 correcting documentation issues 2014-01-29 04:05:30 +05:30
Vishwas Babu A J d58d2482ce MIFOSX-879 correcting documentation issues 2014-01-29 03:53:58 +05:30
Vishwas Babu A J 5ae9e5287f Merge pull request #722 from pramodn02/MIFOSX-720_243 
MIFOSX-720 adding whitespace to query
 2014-01-17 06:36:40 -08:00
Vishwas Babu A J b8b488c1be updating release details for 1.7.0 Release 2014-01-17 13:28:50 +05:30
Vishwas Babu A J bdbe2d2c51 Update CHANGELOG.md 
for 1.7.0 Release
 2014-01-16 19:21:32 +05:30
Vishwas Babu A J 74a058a6b1 MIFOSX-866 changes for returing transaction type associated with a journal entry 2014-01-16 12:23:48 +05:30
Vishwas Babu A J 5757cba348 mifosx-720 update sql patch number 2014-01-16 10:03:25 +05:30
Vishwas Babu A J 31a8a33ce6 Merge pull request #711 from ashok-conflux/MIFOSX-831-01 
Added group by clause for generate collection sheet query
 2013-12-31 04:23:51 -08:00
Vishwas Babu A J a08f0db277 Merge pull request #708 from ashok-conflux/IntegrationTestFix 
added product shortName to create Loan product test case
 2013-12-29 22:52:55 -08:00
Vishwas Babu A J c8e007478d merge ashoks changes for collection sheet improvements 2013-12-29 22:47:05 +05:30
Vishwas Babu A J 5e7a259052 renaming sql patch for loan product short name 2013-12-29 22:37:53 +05:30
Vishwas Babu A J a86bbc5ebe Merge pull request #707 from Vishwa1311/MIFOSX845 
SQL patch named "V137__added_is_active_column_in_m_staff.sql" has been added and also I have updated the API-docs for Staff.
 2013-12-29 09:05:36 -08:00
Vishwas Babu A J 341aefa080 Merge pull request #703 from lingalamadhukar/mifosx-832 
Adding short names for loan and saving products
 2013-12-29 09:04:59 -08:00
Vishwas Babu A J a5e9a32c26 Merge branch 'master' into develop 2013-12-29 22:06:21 +05:30
Vishwas Babu A J f32ca69a37 update gradle.properties for 1.16.1 release 2013-12-29 21:44:35 +05:30
Vishwas Babu A J d0e5677b4d Update CHANGELOG.md 
for 1.16.1 release
 2013-12-29 21:43:29 +05:30
Vishwas Babu A J 570296d10a renaming sql patch 2013-12-22 02:14:41 +05:30
Vishwas Babu A J 6cb756bab1 renaming sql patch 2013-12-22 02:13:55 +05:30
Vishwas Babu A J fe36328184 Merge pull request #698 from ashok-conflux/MIFOSX-812 
add currency details to journal entries api
 2013-12-17 06:54:09 -08:00
Vishwas Babu A J e91ee2d1d1 Merge pull request #699 from ashok-conflux/MIFOSX-830 
returning valid commandId for api actions when maker checker is enabled
 2013-12-17 06:53:34 -08:00
Vishwas Babu A J fb45948c0d Update CHANGELOG.md 
for 1.16 release
 2013-12-16 02:45:32 +05:30
Vishwas Babu A J b2d8c517e3 merge master into develop 2013-12-16 02:35:36 +05:30
Vishwas Babu A J 7e9e3f4857 updates for 1.15.2 release 2013-12-16 02:18:47 +05:30
Vishwas Babu A J fa293d19ce Merge pull request #694 from ashok-conflux/MIFOSX-824 
Added pagination support to audit API
 2013-12-12 22:58:37 -08:00
Vishwas Babu A J 66f974720f adding instructions for deploying the community app 2013-12-12 15:31:12 +05:30
Vishwas Babu A J 3789ac1f07 Update CHANGELOG.md 2013-12-12 15:11:47 +05:30
Vishwas Babu A J a9f01477e0 Merge pull request #693 from ashok-conflux/MIFOSX-826 
added holiday status to response API data
 2013-12-12 01:05:15 -08:00
Vishwas Babu A J e7f0e60555 fix for MIFOSX-822 2013-12-11 06:48:39 +05:30
Vishwas Babu A J 5c30edc710 fix for MIFOSX-822 2013-12-11 06:42:46 +05:30
Vishwas Babu A J 68089e0360 fix for MIFOSX-821 2013-12-06 18:43:56 +05:30
Vishwas Babu A J cebdc5cfc1 fix for MIFOSX-821 2013-12-06 18:41:59 +05:30
Vishwas Babu A J 74606b424d fix for MIFOSX-818 2013-12-06 18:07:03 +05:30
Vishwas Babu A J 5aa6fecd5c fix for MIFOSX-818 2013-12-06 18:03:55 +05:30
Vishwas Babu A JandKeith Woodlock 584f0fd99f fix for MIFOSX-820 2013-12-05 16:30:04 +00:00
Vishwas Babu A J 3fa2c26897 fix for MIFOSX-820 2013-12-05 21:04:23 +05:30
Vishwas Babu A J 6df82f820a Merge pull request #683 from pramodn02/MIFOSX-569 
MIFOSX-569 - Corrected validation for borrower cycle
 2013-11-29 05:30:13 -08:00
Vishwas Babu A J ef628d0997 Merge pull request #682 from pramodn02/MIFOSX-800 
MIFOSX-800 - added empty data check
 2013-11-29 01:49:59 -08:00
Vishwas Babu A J 797c44e48c Merge pull request #681 from pramodn02/MIFOSX-795 
MIFOSX-795 : Products accounting API clean up
 2013-11-29 01:49:42 -08:00
Vishwas Babu A J 37c04828dd Merge pull request #679 from pramodn02/MIFOSX-569 
added borrower cycle to loan products
 2013-11-24 22:06:43 -08:00
Vishwas Babu A J baec784db4 Merge pull request #677 from ashok-conflux/holidays-api-update 
updated holidays api doc
 2013-11-24 22:05:17 -08:00
Vishwas Babu A J f4cb8101e8 merge 1.14.0 release into master 2013-11-21 23:53:13 +05:30
Vishwas Babu A J 7bd6ef0b03 Update CHANGELOG.md 
for 1.10.0 RELEASE
 2013-11-21 23:27:51 +05:30
Vishwas Babu A J 003c21bac0 update to 1.14.0 RELEASE 2013-11-21 23:22:10 +05:30
Vishwas Babu A J 7a12a73f78 Merge pull request #672 from pramodn02/MIFOSX-787 
enabled percentage of interrest for loans
 2013-11-19 01:24:44 -08:00
Vishwas Babu A J 25bc2f4553 Merge pull request #671 from ashok-conflux/MIFOSX-693 
added support to edit/delete holiday
 2013-11-15 03:06:36 -08:00
Vishwas Babu A J aa0df6a0c3 Merge pull request #662 from pramodn02/MIFOSX-730 
Mifosx 730
 2013-11-12 23:35:00 -08:00
Vishwas Babu A J 3e1c3eb4c6 Merge pull request #658 from vorburger/apps_new_community_app 
apps/README updated to point to community-app
 2013-11-12 05:56:25 -08:00
Vishwas Babu A J 43343e28b3 Merge pull request #656 from pramodn02/MIFOSX-730 
Mifosx 730
 2013-11-06 03:23:51 -08:00
Vishwas Babu A J 75353716a9 Merge pull request #655 from pramodn02/MIFOSX-730 
fix for percentage based approach
 2013-11-05 02:09:48 -08:00
Vishwas Babu A J f898c5fcff Update CHANGELOG.md 
for 1.12.0.release
 2013-10-16 04:55:24 +05:30
Vishwas Babu A J 768ee1ddef prep for 1.12 Release 2013-10-16 04:51:06 +05:30
Vishwas Babu A J 7d31547a37 Merge pull request #639 from vishwasbabu/develop 
temporary updates to MIFOSX-735 to fix MIFOSX-742
 2013-10-15 12:24:52 -07:00
Vishwas Babu A J 264632b15a temporary updates to MIFOSX-735 to fix MIFOSX-742 2013-10-16 00:52:50 +05:30
Vishwas Babu A J d5e798ae6c Merge pull request #638 from Musoni/develop 
Mifosx-735 removed office runningBalance from glaccount api and updated ...
 2013-10-15 02:02:07 -07:00
Vishwas Babu A J cbd08003c1 Merge branch 'mifosplatform-1.11.2' into develop 2013-10-13 04:47:55 +05:30
Vishwas Babu A J 13252dc7b7 Merge pull request #631 from vorburger/ugd_develop_vorburger 
GSoC UGD API Doc proposal (for discussion & review)
 2013-10-12 16:13:41 -07:00