Commit Graph
100 Commits
Author SHA1 Message Date
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 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
Vishwas Babu A J 9d5071c320 Merge pull request #632 from ashok-conflux/MIFOSX-732
Remove payment mode option from savings charges
2013-10-12 07:54:48 -07:00
Vishwas Babu A J f7d89d8b71 Merge pull request #629 from ashok-conflux/MIFOSX-728
Capture annual fee due date at charge creation time
2013-10-12 04:07:05 -07:00
Vishwas Babu A J 00bbc70623 Merge pull request #628 from ashok-conflux/MIFOSX-728
Add recurring fee support for savings
2013-10-09 06:27:43 -07:00
Vishwas Babu A J a2766caef2 Merge pull request #627 from pramodn02/MIFOSX-639
handled external id for loan transaction
2013-10-08 22:51:22 -07:00
Vishwas Babu A J 9e53a08fbf Merge pull request #626 from ashok-conflux/MIFOSX-723
Allow adjustment of deposited amount if there are any charges/withdrawan transactions on same day
2013-10-08 01:17:52 -07:00
Vishwas Babu A J c676e01872 Merge pull request #624 from ashok-conflux/savings_charge_apidoc
Updated api doc with savings charges details
2013-10-07 09:21:53 -07:00
Vishwas Babu A J 021295f4f3 Merge pull request #625 from vishwasbabu/mifosplatform-1.11.1
Mifosplatform 1.11.1
2013-10-07 09:20:49 -07:00
Vishwas Babu A J fd82494a07 prep for mifosplatform-1.11.1 release 2013-10-07 21:48:29 +05:30
Vishwas Babu A J f2f5bb4e9d Update CHANGELOG.md
for 1.11.1.RELEASE
2013-10-07 21:46:32 +05:30
Vishwas Babu A J dfc3078e13 MIFOSX-727: Loan Write off account not being persisted on creating a new Loan Product 2013-10-07 21:41:42 +05:30
Vishwas Babu A J 6b8f60539c Update CHANGELOG.md
for 1.11.0.RELEASE
2013-10-06 02:13:08 +05:30
Vishwas Babu A J 15d905a7d9 prep for 1.11.0 RELEASE 2013-10-06 01:45:32 +05:30
Vishwas Babu A J de481e2fec Merge pull request #623 from vishwasbabu/develop
fixing failing unit tests after accounting changes
2013-10-05 12:24:46 -07:00
Vishwas Babu A J c9eb3920d9 fixing failing unit tests after accounting changes 2013-10-06 00:46:38 +05:30
Vishwas Babu A J b0b59951cd Merge pull request #622 from vishwasbabu/develop
edits to temp liability account for overpayments
2013-10-05 10:19:30 -07:00
Vishwas Babu A J 45e133ab23 edits to temp liability account for overpayments 2013-10-05 22:43:36 +05:30
Vishwas Babu A J b47d4c3907 Merge pull request #621 from ashok-conflux/MIFOSX-697-patch
Fixed annual fee batch job and savings charges related issues
2013-10-05 08:53:23 -07:00
Vishwas Babu A J f9da94b89f Merge pull request #620 from vishwasbabu/develop
api updates for accounting changes to loans and savings
2013-10-05 08:39:41 -07:00
Vishwas Babu A J db379295fa api updates for accounting changes to loans and savings 2013-10-05 21:07:38 +05:30
Vishwas Babu A J 3e3b0d65a3 Merge branch 'master' into develop 2013-10-05 05:02:35 +05:30
Vishwas Babu A J 73adbcf99f Update CHANGELOG.md
for 1.10.3.RELEASE
2013-10-05 04:50:19 +05:30
Vishwas Babu A J 622a4307ec fix for daily interest calculation 2013-10-05 04:24:01 +05:30
Vishwas Babu A J 3294c8877d moving all bugf fixes and improvemnets from 1.10.3 to develop branch 2013-10-05 03:41:39 +05:30
Vishwas Babu A J 7964422d7d Merge pull request #619 from vishwasbabu/mifosplatform-1.10.3
handle overpayments and refunds in accounting
2013-10-04 01:05:49 -07:00
Vishwas Babu A J bd3c0b547f Merge pull request #618 from mifoscontributer/datatables
mifosx-717 fix register/deregister datatable for constraint based approach
2013-10-04 01:04:09 -07:00
Vishwas Babu A J c02fba1efe handle overpayments and refunds in accounting 2013-10-03 15:57:13 +05:30
Vishwas Babu A J 5f209097e1 Merge pull request #617 from ashok-conflux/MIFOSX-697
Move withdrawal and annual fee charges to charges workflow
2013-10-02 14:50:15 -07:00
Vishwas Babu A J 2bd812899a Merge pull request #615 from pramodn02/MIFOSX-435_2
Mifosx 435 2
2013-10-02 14:49:53 -07:00
Vishwas Babu A J 46146cf638 Merge pull request #614 from pramodn02/MIFOSX-699
Mifosx 699
2013-09-27 04:52:24 -07:00
Vishwas Babu A J 2fa22e4a16 Merge pull request #613 from pramodn02/MIFOSX-435
Mifosx 435
2013-09-27 04:51:52 -07:00
Vishwas Babu A J e89982223c Merge pull request #612 from vishwasbabu/mifosplatform-1.10.3
fix for daily interest calculation with declining balance
2013-09-26 08:30:46 -07:00
Vishwas Babu A J 9470e3a858 fix for daily interest calculation 2013-09-26 20:47:39 +05:30
Vishwas Babu A J a650058159 Merge pull request #611 from vishwasbabu/mifosplatform-1.10.3
cleaning up accounting integration for savings
2013-09-26 06:56:56 -07:00
Vishwas Babu A J 4ee40b7f57 cleaning up accounting integration for savings 2013-09-26 19:23:02 +05:30
Vishwas Babu A J 3793b0872a Merge pull request #610 from ashok-conflux/MIFOSX-692
Mifosx 692
2013-09-26 02:45:57 -07:00
Vishwas Babu A J 4320fc25a2 Merge pull request #609 from ashok-conflux/MIFOSX-691-Patch
Mifosx 691 patch
2013-09-25 07:34:42 -07:00
Vishwas Babu A J 617662f0df Merge pull request #608 from vishwasbabu/temp
Temp
2013-09-24 14:24:28 -07:00
Vishwas Babu A J 5776ee3b53 handle penalties/fees separately for savings and add ability to map penalties/fees to separate income accounts 2013-09-25 02:51:25 +05:30
Vishwas Babu A J 72b0889bbf Merge pull request #607 from ashok-conflux/MIFOSX-691
Savings fee code cleanup and added shcedule for paying charges
2013-09-24 11:17:22 -07:00
Vishwas Babu A J 7e606a2d13 Merge pull request #605 from pramodn02/MIFOSX-688
Mifosx 688
2013-09-23 08:36:24 -07:00
Vishwas Babu A J ff5779c238 Merge pull request #604 from ashok-conflux/MIFOSX-679
Added missing Braces for create holidays in API doc
2013-09-23 00:46:07 -07:00
Vishwas Babu A J ae7c91c6a4 Merge pull request #603 from pramodn02/MIFOSX-689_2
update account transfers with new loan transaction id
2013-09-23 00:24:36 -07:00
Vishwas Babu A J 72a0a547aa Merge branch 'master' into develop 2013-09-23 11:33:08 +05:30
Vishwas Babu A J 773883eff7 Update CHANGELOG.md
for release 1.10.2
2013-09-23 11:27:42 +05:30