Commit Graph
100 Commits
Author SHA1 Message Date
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
Vishwas Babu A J 090a9a4536 Merge branch 'master' into develop 2013-09-23 11:23:47 +05:30
Vishwas Babu A J 16c864abc2 Merge pull request #602 from vishwasbabu/mifosplatform-1.10.2
bug fixes for 1.10.2 release
2013-09-22 22:37:27 -07:00
Vishwas Babu A J 878e52c986 bug fixes for 1.10.2 release 2013-09-23 01:16:37 +05:30
Vishwas Babu A J 01368e59b2 merge release 1.10.1 to develop branch 2013-09-20 23:53:10 +05:30
Vishwas Babu A J 3531e956fb Update CHANGELOG.md
for 1.10.1 Release
2013-09-20 23:30:40 +05:30
Vishwas Babu A J 65ca796fce Merge pull request #601 from vishwasbabu/mifosplatform-1.10.1
Mifosplatform 1.10.1
2013-09-20 10:56:55 -07:00
Vishwas Babu A J 086fbcd0c9 resolve compilation issues generated by cleanup 2013-09-20 23:12:47 +05:30
Vishwas Babu A J 749565dd1c formatting and cleaning up the entire project 2013-09-20 23:11:38 +05:30
Vishwas Babu A J 26baa69d2e Merge pull request #600 from vishwasbabu/mifosplatform-1.10.1
fix for multiple product mappings
2013-09-20 10:20:07 -07:00
Vishwas Babu A J 07d3669549 fix for multiple product mappings 2013-09-20 22:46:08 +05:30
Vishwas Babu A J 6e252b8a58 Update CHANGELOG.md
for 1.10 release
2013-09-20 01:40:52 +05:30
Vishwas Babu A J 3fe60ff08f prep for 1.10 release 2013-09-20 01:29:51 +05:30
Vishwas Babu A J bf209819f6 add validation for charges 2013-09-20 01:08:08 +05:30
Vishwas Babu A J 15127b747f Merge pull request #596 from vishwasbabu/develop-new
Develop new
2013-09-19 12:05:51 -07:00
Vishwas Babu A J c46eab4453 added some validations around transfers of savings accounts 2013-09-20 00:33:50 +05:30
Vishwas Babu A J 421724d24c Merge pull request #595 from ashok-conflux/MIFOSX-644
Mifosx 644
2013-09-19 11:45:16 -07:00
Vishwas Babu A J 4a8a0d42b7 Merge pull request #594 from pramodn02/MIFOSX-642_2
Mifosx 642 2
2013-09-19 08:25:21 -07:00
Vishwas Babu A J 5cbcab9c1e Merge pull request #593 from vishwasbabu/develop
fixed issues with combination of regular and account transfer fees at di...
2013-09-19 06:49:45 -07:00
Vishwas Babu A J ae4a665015 fixed issues with combination of regular and account transfer fees at disbursal 2013-09-19 19:18:52 +05:30
Vishwas Babu A J 73105c8485 Merge pull request #592 from pramodn02/MIFOSX-642_2
Mifosx 642 2
2013-09-19 06:10:25 -07:00
Vishwas Babu A J 076c8c9fcc Merge pull request #589 from pramodn02/MIFOSX-642_2
Mifosx 642 2
2013-09-19 03:40:05 -07:00
Vishwas Babu A J 99d316f406 merging 1.9.2 release into develop branch 2013-09-19 09:37:36 +05:30
Vishwas Babu A J aaaba187b3 Update CHANGELOG.md
fix typos
2013-09-19 09:15:39 +05:30
Vishwas Babu A J 948da215f5 Update CHANGELOG.md
for 1.9.2 release
2013-09-19 09:11:24 +05:30
Vishwas Babu A J 669a7eef35 Merge pull request #587 from vishwasbabu/mifosplatform-1.9.2
minor fixes while prepping for 1.9.2 release
2013-09-18 20:33:27 -07:00
Vishwas Babu A J 244895e07d minor fixes while prepping for 1.9.2 release 2013-09-19 09:00:54 +05:30
Vishwas Babu A J 0e18e2951b Merge pull request #586 from pramodn02/MIFOSX-642
Mifosx 642
2013-09-18 05:30:36 -07:00
Vishwas Babu A J adc915d9ef fix issues with sql patch number in previous pull request 2013-09-17 21:19:58 +05:30
Vishwas Babu A J e731f50f38 Merge pull request #585 from vishwasbabu/develop
track currency with accounting
2013-09-17 08:47:08 -07:00
Vishwas Babu A J 2b8da96474 track currency with accounting 2013-09-17 21:13:45 +05:30
Vishwas Babu A J 658d38a3fa Merge pull request #583 from vishwasbabu/develop
minor issues in savings transfer
2013-09-12 18:27:06 -07:00
Vishwas Babu A J cbf4a43cb6 minor issues in savings transfer 2013-09-13 06:54:24 +05:30
Vishwas Babu A J e67ab7cf88 merging 1.9.1 release into develop 2013-09-10 20:32:33 +05:30
Vishwas Babu A J 5af987ffb8 Update CHANGELOG.md 2013-09-10 20:21:55 +05:30
Vishwas Babu A J d5e50a8913 Update CHANGELOG.md
for 1.9.1 Release
2013-09-10 20:21:27 +05:30
Vishwas Babu A J 739737dbca Merge pull request #581 from pramodn02/MIFOSX-647
Mifosx 647
2013-09-10 07:42:29 -07:00
Vishwas Babu A J 1faf75b174 Merge pull request #580 from vishwasbabu/mifosplatform-1.9.1
minor issues with loan transfers
2013-09-10 07:16:48 -07:00
Vishwas Babu A J bba521a8c3 minor issues with loan transfers 2013-09-10 19:43:52 +05:30
Vishwas Babu A J 190b9a58b3 wip:enabling transfer of saving accounts 2013-09-10 17:13:53 +05:30
Vishwas Babu A J b9f929aec2 Merge pull request #579 from vishwasbabu/develop
accounting for savings now picks up office from transaction
2013-09-09 23:30:13 -07:00
Vishwas Babu A J ce66ca4718 accounting for savings now picks us office from transaction 2013-09-10 11:58:30 +05:30
Vishwas Babu A J da3a3b4c67 Merge pull request #578 from vishwasbabu/develop
map savings account transactions to an Office in preparation for savings...
2013-09-09 20:32:50 -07:00
Vishwas Babu A J 546e480496 db changes for mapping savings transactions to an office 2013-09-10 09:01:39 +05:30
Vishwas Babu A J dcbcfee148 map savings account transactions to an Office in preparation for savings account transfers 2013-09-10 08:58:33 +05:30
Vishwas Babu A J 4762a7786f Merge branch 'master' into develop 2013-09-09 07:39:16 +05:30
Vishwas Babu A J bdb2162ab7 Merge pull request #574 from openMF/master
disable constraint based approach for datatables by default
2013-09-08 19:06:41 -07:00
Vishwas Babu A J b297f75c4c disable constraint based approach for datatables by default 2013-09-09 07:34:04 +05:30
Vishwas Babu A J a3219104fe track 1.10 release 2013-09-09 07:04:17 +05:30
Vishwas Babu A J 8ddf2dd858 Update CHANGELOG.md
for 1.9.0 Release
2013-09-09 06:36:16 +05:30
Vishwas Babu A J 0297757f50 Merge pull request #573 from vishwasbabu/develop
Develop
2013-09-08 17:48:03 -07:00