Commit Graph
100 Commits
Author SHA1 Message Date
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 773883eff7 Update CHANGELOG.md
for release 1.10.2
2013-09-23 11:27:42 +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
Vishwas Babu A J fcacf1582d prep for 1.9.0 Release 2013-09-09 06:10:07 +05:30
Vishwas Babu A J 17b87c18a3 minor fixes to transfer functionality 2013-09-09 06:06:40 +05:30
Vishwas Babu A J 74b0b82d1f Merge pull request #572 from vishwasbabu/develop
cleaning up transfers functionality
2013-09-08 16:27:40 -07:00
Vishwas Babu A J fcee0a333e cleaning up transfers functionality 2013-09-09 04:56:35 +05:30
Vishwas Babu A J 445a341997 Merge branch 'mifosx-436' into develop 2013-09-08 09:59:33 +05:30
Vishwas Babu A J 3ddaa07548 adding some validations for loan transfers 2013-09-08 09:58:28 +05:30
Vishwas Babu A J 26565d6be9 Merge pull request #571 from pramodn02/MIFOSX-634_2
Mifosx 634 2 - added status validation for undo transaction
2013-09-06 06:40:24 -07:00
Vishwas Babu A J e36255c030 fixing build issues due to bas merge 2013-09-06 18:04:05 +05:30
Vishwas Babu A J 48bd0b02fe merging ashoks changes for group closure 2013-09-06 17:27:08 +05:30
Vishwas Babu A J ae75b07fb5 Merge pull request #569 from pramodn02/MIFOSX-634
Mifosx 634-Added support to activate closed account by adjusting the transaction
2013-09-06 03:39:08 -07:00
Vishwas Babu A J 34f514da4e Merge pull request #565 from pramodn02/MIFOSX-622
Mifosx 622 - added transfer withdrawal fee configuration
2013-09-05 07:49:29 -07:00
Vishwas Babu A J ebba52bb9c Merge pull request #564 from pramodn02/MIFOSX-624
Mifosx 624-added validation for applying annual fee negative balance
2013-09-04 03:29:27 -07:00
Vishwas Babu A J aab79b3561 Merge pull request #563 from vishwasbabu/mifosx-436
Mifosx 436
2013-09-04 01:16:37 -07:00
Vishwas Babu A J 0e1c55f349 fix for repayment intervals recalculation 2013-09-04 13:37:55 +05:30
Vishwas Babu A J b3d94aa8c4 Merge pull request #561 from vishwasbabu/mifosx-436
Mifosx 436
2013-09-03 19:56:02 -07:00
Vishwas Babu A J d93f630c9b cleaning up transfers functionality and prepping for 1.9 release 2013-09-04 08:21:54 +05:30
Vishwas Babu A J 6650946b1e Merge pull request #560 from pramodn02/MIFOSX-628
Mifosx 628
2013-09-03 07:18:56 -07:00
Vishwas Babu A J 93d303b286 Merge pull request #559 from pramodn02/MIFOSX-635
Mifosx 635
2013-09-03 07:18:11 -07:00
Vishwas Babu A J 2a196228d2 Merge pull request #557 from pramodn02/MIFOSX-517_2
datatable mappings with code and code values implementation
2013-09-03 07:17:40 -07:00
Vishwas Babu A J 3c5679544b Merge pull request #555 from ashok-conflux/MIFOSX-607
Mifosx 607
2013-08-31 00:08:29 -07:00
Vishwas Babu A J 3dc5126bb9 Merge pull request #554 from vishwasbabu/mifosx-436
Mifosx 436
2013-08-29 09:45:19 -07:00
Vishwas Babu A J f218bce80f clean up for close client 2013-08-29 22:13:22 +05:30
Vishwas Babu A J f131506916 Merge pull request #553 from vishwasbabu/mifosx-436
updating loan transacation api to retreive office data
2013-08-29 09:20:43 -07:00
Vishwas Babu A J 22fc47a938 updating loan transacation api to retreive office data 2013-08-29 21:47:49 +05:30
Vishwas Babu A J 235c258be7 Merge pull request #551 from ashok-conflux/MIFOSX-613
Mifosx 613
2013-08-29 05:30:32 -07:00
Vishwas Babu A J c842339bde Merge pull request #550 from pramodn02/MIFOSX-596
changes to transfer funds from overpaid account
2013-08-29 05:29:51 -07:00
Vishwas Babu A J b2644bee9d Merge pull request #548 from ashok-conflux/MIFOSX-607
MIFOSX-607 - capture client atendance in collection sheet
2013-08-28 00:34:34 -07:00
Vishwas Babu A J 2ac1dad66a Merge pull request #547 from mifoscontributer/mifox-predefinedAR
Changing predefined posting json for consistenxy
2013-08-28 00:31:44 -07:00
Vishwas Babu A J 1f7a93b7aa Merge pull request #546 from vishwasbabu/mifosx-436
update test cases to handle new parameters required for accrual/cash acc...
2013-08-27 10:01:06 -07:00
Vishwas Babu A J 75bcfbff57 update test cases to handle new parameters required for accrual/cash accounting 2013-08-27 22:28:20 +05:30
Vishwas Babu A J 4bc7b64270 Merge pull request #534 from mifoscontributer/mifosx-440
Meeting calendar cleanup
2013-08-27 07:30:05 -07:00
Vishwas Babu A J 5a8c36d0af Merge pull request #541 from pramodn02/MIFOSX-619
Mifosx 619
2013-08-27 07:28:48 -07:00
Vishwas Babu A J e10c4c25e7 Merge pull request #544 from mifoscontributer/mifosx-547_c
Transfer clients between groups
2013-08-27 02:01:00 -07:00
Vishwas Babu A J faaf180ec4 Merge pull request #542 from vishwasbabu/mifosx-436
Mifosx 436
2013-08-26 10:57:31 -07:00
Vishwas Babu A J 22fee03e0a adding an api workflow for transfers 2013-08-26 23:25:33 +05:30
Vishwas Babu A J 90de8d1cd7 Merge pull request #539 from mifoscontributer/mifosx-547
Change Api call for client transfers
2013-08-23 00:03:48 -07:00
Vishwas Babu A J 8dcb251826 Merge pull request #538 from mifoscontributer/mifosx-613
Return valid(not null) officeId for a loan
2013-08-22 07:33:37 -07:00
Vishwas Babu A J 6d0afd2b1e Merge pull request #535 from vishwasbabu/mifosx-436
linking loan transactions to branches in preparation for inter-branch ac...
2013-08-21 09:47:24 -07:00
Vishwas Babu A J b1d2b42da1 linking loan transactions to branches in preparation for inter-branch account transfers 2013-08-21 22:14:17 +05:30
Vishwas Babu A J 81bde6ddad Update CHANGELOG.md
for 1.8.1 RELEASE
2013-08-21 18:45:14 +05:30
Vishwas Babu A J ba55add488 prepping for 1.8.1 release 2013-08-21 18:42:23 +05:30
Vishwas Babu A J e62a279b3c fix for mifosx-617 2013-08-21 17:26:28 +05:30
Vishwas Babu A J bb1aa34f62 preparing dev branch for 1.9.0 release 2013-08-20 20:27:35 +05:30
Vishwas Babu A J 1e4b3eb01f Update CHANGELOG.md
for 1.8.0 Release
2013-08-20 20:21:49 +05:30