commit 59b8fc62f6b765b416c46fa0da38b3482e5a3f78 Author: Maneesha Sunkari Date: Tue Nov 9 14:49:42 2021 +0530 V 5.1 final testing about to complete commit 5e92955d210ae7cb34ff2513182abad04e9ffc4b Author: Maneesha Sunkari Date: Mon Nov 1 11:19:37 2021 +0530 V 5.0 version released commit 151e6c6fb49eb1212db7ff4b9b3ab1b7b9ff7966 Author: Maneesha Sunkari Date: Sat Oct 30 08:05:27 2021 +0530 Modify Farmer enables commit 4ad5ff82264ed043a1936da0041397912ae1f63f Author: Maneesha Sunkari Date: Fri Oct 29 15:48:12 2021 +0530 V 4.9 Diff is checking now commit 7115125ac379535b9bb98751658e03935f660714 Author: Maneesha Sunkari Date: Fri Oct 29 15:07:55 2021 +0530 Some Changes commit f70499498c9d7bd6a2d3a7b5c2ab4deb33d53cb6 Author: Maneesha Sunkari Date: Fri Oct 29 12:54:58 2021 +0530 LandDetailsId re added in Verrify Farmer Call commit ff9af5c5fd17a3907326469e782ad9f2366d6b90 Author: Maneesha Sunkari Date: Fri Oct 29 12:51:55 2021 +0530 FarmerDetails not Completed commit 24073f324de34ab3209858258c5df58ce8b60ce7 Author: Maneesha Sunkari Date: Thu Oct 28 17:28:56 2021 +0530 Procurement Done with the multiland Token commit 0dbf209db8be7c5a9330d695c0291f3ba3507b4f Author: Maneesha Sunkari Date: Thu Oct 28 10:38:22 2021 +0530 Survey ,Subdivision issue in tokenGen is Fixed commit 17cea6d30e38c42b552f746146fdc0961eca6798 Author: Maneesha Sunkari Date: Wed Oct 27 11:39:19 2021 +0530 Some Changes on Token Gen commit 17c91e566ed0936e74abf0cc798172643259d8f7 Author: Maneesha Sunkari Date: Wed Oct 27 11:37:03 2021 +0530 Instead Of radio button ,Check Box Added in Tokengen Land Selection commit 21e01de1b16b45cbf5ebd2aea01c7a92f6093da8 Author: Maneesha Sunkari Date: Wed Oct 27 11:04:00 2021 +0530 Multiple Lands can select while Token Generation commit 0874adc0964f9edd26481262080a17620993892d Author: Maneesha Sunkari Date: Tue Oct 26 13:49:00 2021 +0530 NCCF Procurement Cancel & NCCF Procurement Reports are Fixed now commit 5e665b623226e561f335f005d61bc6c97a7d61bf Author: Maneesha Sunkari Date: Tue Oct 26 10:54:06 2021 +0530 NCCF Procurement Sync_status not update Code Set now commit b0b83c6d7f1a4d4185dfa092d5345db47911acfe Author: Maneesha Sunkari Date: Mon Oct 25 18:12:44 2021 +0530 NCCF Procurement Done commit 1ecfcdd6531a43113bbc4a1321f75ac6c055c660 Merge: 5c8d6eb9 2669cb8c Author: Swetha Errabelli Date: Tue Oct 19 20:03:56 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit 5c8d6eb9c5c322600c3f5d7c62c3caca55316711 Author: Swetha Errabelli Date: Tue Oct 19 20:03:40 2021 +0530 Procurement abstract report query changed commit 2669cb8c80c4424bedc306f6ab84944f8c788035 Author: Maneesha Sunkari Date: Tue Oct 19 20:02:23 2021 +0530 Login Procurement & Movement Agrregate Queries are changed commit 76f4c59d6e5e9db1c8926b767ef8c0bca0ff07cb Author: Maneesha Sunkari Date: Tue Oct 19 18:49:47 2021 +0530 Log Added in ProcurementPreviewActivity Cancel() method commit 23f614629a9ee0da78d248c271185cd7e8f70acd Merge: a6557c1d 7aa69960 Author: Maneesha Sunkari Date: Tue Oct 19 18:10:52 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5  Conflicts:  app/src/main/java/com/callippus/epaddy/saleitems/procurement/ProcurementPreviewActivity.java commit a6557c1db450ced3461ff0075cd0d6b0b1365c60 Author: Maneesha Sunkari Date: Tue Oct 19 18:10:20 2021 +0530 Some Changes commit 7aa699600c67c6af15a784b070da0b6c7e308ccd Author: Swetha Errabelli Date: Tue Oct 19 18:09:32 2021 +0530 Procurement & Movement Queries checked with sync_status<>8 Procurement Preview OnBackPreseed() method changed commit 892b4824e19e37fbd0802ddaef7dc9c0221a691d Author: Maneesha Sunkari Date: Tue Oct 19 15:32:20 2021 +0530 Movement Dialogue set cancelable to false commit 8ef03c8e9df474ac01bb350030fc7375b72256ae Author: Maneesha Sunkari Date: Tue Oct 19 14:59:11 2021 +0530 Procurement BillPrint Doing in BackGround commit a81b6161e87572fec66c82b7db365a1a0fcd7364 Author: Maneesha Sunkari Date: Tue Oct 12 18:54:58 2021 +0530 Bank Details Error Popu Added commit 9079c51f724e3a8412645d3358e4891ab9925ca5 Author: Swetha Errabelli Date: Tue Oct 12 18:13:56 2021 +0530 Ifsc Code micr Code Exception Handling & Error Message need to set Propertly for PostBank API commit b30c08e6b46545571026e008210faf1ed5791d8e Author: Maneesha Sunkari Date: Tue Oct 12 14:15:47 2021 +0530 truckTo issue fixed -tested in online but not in online truck request commit 161e7a752eb738a587c3153eadd26402f861c9be Author: Swetha Errabelli Date: Tue Oct 12 11:56:45 2021 +0530 CancelOrder API response Handled commit 5b67cfc743694869dcadda57a64009f98e932e75 Author: Maneesha Sunkari Date: Tue Oct 12 00:10:25 2021 +0530 Movement Entry "Parametre must be decedent of this view" Exception resolved commit 6e929158a1e05f8638bbe7b4a7457e157e4e14cc Merge: 3cd653d4 da24f1e7 Author: Maneesha Sunkari Date: Mon Oct 11 20:18:27 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5  Conflicts:  app/src/main/java/com/callippus/epaddy/saleitems/movement/StockEntryItemAdapter.java commit 3cd653d4c3abab355564c9c98c85b1382a37875a Author: Maneesha Sunkari Date: Mon Oct 11 20:17:18 2021 +0530 Aadhaar & Mobile Edit given For the Fresh Registration commit da24f1e7ade5e760664d873b0e7190171016d9ad Author: Swetha Errabelli Date: Mon Oct 11 20:16:17 2021 +0530 UnSupported Serializable Exception while FarmerEdit in Preview Screen Fixed commit 67f22fdf7fdc22b684132ac09ada98c05c8aee47 Merge: 9b5ec93b 8e3e4e58 Author: Swetha Errabelli Date: Mon Oct 11 18:33:48 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit 9b5ec93bcb42199c982385b870ba8d9f4a9ccafa Author: Swetha Errabelli Date: Mon Oct 11 18:30:28 2021 +0530 popone Token commit 8e3e4e58c3decc1ee0f12dbe60cfa21dc02f7efd Author: Maneesha Sunkari Date: Mon Oct 11 17:56:32 2021 +0530 Auto Population of Region & taluk in farmer registration Done commit 181b32d2fb391d453d232bb894d50838ba596b78 Author: Maneesha Sunkari Date: Mon Oct 11 14:29:43 2021 +0530 Farmer registration code added commit ff606eb14c7aa8e2cad76637b3b5c0c167e38432 Author: Maneesha Sunkari Date: Mon Oct 11 12:28:38 2021 +0530 mapped Villages API call removed from farmer Reg. & Modification commit eca6df3919b32cfccf2d803fb6330412655bf075 Author: Maneesha Sunkari Date: Mon Oct 11 12:00:57 2021 +0530 Procurement & Movement Log added where it required commit 4d4f28508e3bd8346ccca041ebd431076422b0c1 Author: Maneesha Sunkari Date: Mon Oct 11 11:49:56 2021 +0530 Movement Cancel Inserting TransportDetails twice is removed commit 90ccf8a0948fe930d976fc9bd7c6ce2324cb5e75 Author: Maneesha Sunkari Date: Mon Oct 11 11:27:27 2021 +0530 Farmer DPC Details Id is not changing ...Sending as usual when updating farmer commit 6a05aecc46ca925004721d26130728298383065b Author: Swetha Errabelli Date: Mon Oct 11 10:54:38 2021 +0530 current Dpc Details id sending in Updatefarmer also commit 9ef79b1922ece2d6cd2f7ebc87c11bd5994ffec7 Merge: dece8a85 a2d4b8e3 Author: Swetha Errabelli Date: Mon Oct 11 10:38:46 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit a2d4b8e3b76aaa0c3101e8a68fbf6ebef953c63e Author: Maneesha Sunkari Date: Mon Oct 11 10:36:25 2021 +0530 Farmer reg with selectable region,taluk,village are Done commit dece8a852d51da6f2235b868d65a9780ccca70bb Merge: 34caacc7 3af539e1 Author: Swetha Errabelli Date: Mon Oct 11 10:11:44 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5  Conflicts:  app/src/main/java/com/callippus/epaddy/dbfunctions/FarmerDB.java commit 3af539e108840eb2fad7c1c82a9271bd05e504e6 Author: Maneesha Sunkari Date: Mon Oct 11 10:10:58 2021 +0530 FarmerRegietration with Regionmaster,talukMaster&Village Master Done commit de8a45a9cae9be2dbdf5c894a3de89c8de9b5ac0 Author: Maneesha Sunkari Date: Mon Oct 11 01:42:48 2021 +0530 Region ,taluk & Village selection added commit d972d934afdc66ec3ffb336cd9af43180add0ffa Author: Maneesha Sunkari Date: Thu Oct 7 10:40:35 2021 +0530 Latest Code After removed Dummy gunny type commit 34caacc7621044688d43e3aedb0801e38ce505bf Merge: 1faf31fd f13df0e9 Author: Swetha Errabelli Date: Wed Oct 6 20:23:27 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit 1faf31fdda8ea4e561fb4c7bd069a1859e9c7cbc Author: Swetha Errabelli Date: Wed Oct 6 20:23:14 2021 +0530 GetPendingProcurement count Query Changed commit f13df0e9234935b0ee72bb5327590488e4bf0db0 Author: Maneesha Sunkari Date: Wed Oct 6 19:03:42 2021 +0530 Farmer Code added in Procurement RePrint commit 6dbf62ecc148699ba4c53591eb01f55ce29cac0b Author: Maneesha Sunkari Date: Wed Oct 6 16:58:08 2021 +0530 Connection timeout set to 3 minutes commit 9bd19e75e801fd6cf15d15352c9d27372a51b44c Author: Maneesha Sunkari Date: Wed Oct 6 11:10:22 2021 +0530 BankMaster Data type issue resolved commit 8781542bc60f700b49a5cc8f9f225af664999b08 Author: Maneesha Sunkari Date: Tue Oct 5 18:19:38 2021 +0530 Purchase failed Records are Included Pending Actions commit 8f737099c996f1dcadfbc76fffd9c5ce96ae1c02 Author: Maneesha Sunkari Date: Tue Oct 5 14:56:50 2021 +0530 Gunny Type & Sort Type added in movement Preview SCreen commit 57ca597e6ddb5b4cb150bba27da61b3445d66c78 Author: Maneesha Sunkari Date: Tue Oct 5 14:37:52 2021 +0530 Movement Issues Fixed -Stock Inv Bags Count wrongly updating -Bill Print Qntities in negative commit ed3e390bc7100a517be2cf8555a36140c3723c65 Author: Maneesha Sunkari Date: Tue Oct 5 14:13:45 2021 +0530 StockInv BOD checking for procuring Items at ProcurementEntryActivity commit 1a7811490617aa761aacd2c89c22a7fa1cd18573 Author: Maneesha Sunkari Date: Tue Oct 5 13:10:36 2021 +0530 Purchase update after getting succes from server is Done -In old version effected Rows are not checked..So inventories are updating according to effected Rows commit f998a1fd8febf5bbdd27d6acd52a02bfd946e206 Author: Maneesha Sunkari Date: Fri Oct 1 13:03:05 2021 +0530 V 4.5 released commit f06694457be5b35190d00c8ea48e99aa2d872fd9 Merge: ba155ffa fd1bea92 Author: Maneesha Sunkari Date: Fri Oct 1 09:44:32 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5  Conflicts:  app/src/main/java/com/callippus/epaddy/saleitems/movement/MovementPreviewActivity.java commit ba155ffa4185a3de9a468b5ec191753cfc6b4593 Author: Maneesha Sunkari Date: Fri Oct 1 09:43:54 2021 +0530 Movement Preview issue && BankAccount SetError issues in FarmerReg Fixed commit fd1bea92ff56006f062c48d86053925a892e919b Author: Swetha Errabelli Date: Fri Oct 1 09:42:26 2021 +0530 showalert in movementCancel exception fixed commit 36fe2bd1c5fc9326030357eb690f1881ca8f2217 Merge: 8e8e3d6e b7821921 Author: Swetha Errabelli Date: Fri Oct 1 08:31:59 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5  Conflicts:  app/src/main/java/com/callippus/epaddy/DBConnection.java commit b782192138025800c827a21ef4d84f6d5df093c7 Merge: d33f79ef 202fcd95 Author: Maneesha Sunkari Date: Fri Oct 1 08:31:09 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit d33f79efe8af49b2042a1356cdd2216203b6e877 Author: Maneesha Sunkari Date: Fri Oct 1 08:30:35 2021 +0530 Bill Cancel Working now commit 8e8e3d6e1a2c727d0e4fc046609686a013c1e3d0 Author: Swetha Errabelli Date: Fri Oct 1 08:30:14 2021 +0530 NullPtr Exception fixed commit 202fcd95f4d88bb187bd7a1ffdbf59f5cc4bbd0d Author: Swetha Errabelli Date: Fri Oct 1 01:28:22 2021 +0530 Land selection on Token Gen base on VAO & AAO Flags commit 527e486998a7673d1f0241028fb89f043e6b765c Merge: 87354b12 6d59952a Author: Swetha Errabelli Date: Thu Sep 30 22:24:46 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit 87354b1266ad5764619643e399e9e92aade8d077 Author: Swetha Errabelli Date: Thu Sep 30 22:24:22 2021 +0530 farmer modify redirect changed commit 6d59952a54605e595b63eb90133b592150d4e94f Author: Maneesha Sunkari Date: Thu Sep 30 22:24:10 2021 +0530 Movement Checked for Previous Season & Some Changes done as given by swetha commit 146a150a1f90849d352654f8f734854bbcbeac44 Author: Maneesha Sunkari Date: Thu Sep 30 18:41:42 2021 +0530 Sending versionNo in TokenGen API..Now seed Database schema Updating to latest commit 5577d268434ff7394a77092ea9f92162bf7a38e8 Author: Maneesha Sunkari Date: Thu Sep 30 17:20:11 2021 +0530 Procurement changed and checked commit c4c71ec54591d2e2872d670dea88065a8fbaac3b Author: Maneesha Sunkari Date: Thu Sep 30 12:50:17 2021 +0530 Sending Version in TokenGen & FarmerReg commit 6e7c6691f8fc7f186a3cb8e22e57702fd54c575f Author: Maneesha Sunkari Date: Thu Sep 30 12:01:44 2021 +0530 Token Generation validations Done commit e827d48e4e8e9fb944e231143a5d2149f708c1cb Author: Maneesha Sunkari Date: Thu Sep 30 11:30:20 2021 +0530 Some Changes Done given by swetha commit ed637c539415cd43b6a3fd9cdf3df8e6d464ef80 Author: Maneesha Sunkari Date: Wed Sep 29 20:46:04 2021 +0530 Some Code Changed on Remove Land commit fb4be6d35ad995304c006388a81b5e420070efa0 Author: Maneesha Sunkari Date: Wed Sep 29 20:07:45 2021 +0530 Some Code Changed on AAO & VAO approval Data commit 093382bc35812a0031751a792786ba8596ea4f6b Author: Maneesha Sunkari Date: Wed Sep 29 18:41:32 2021 +0530 Add Land Functionality Added & Land Selection adedd in token Generation commit 57a98136fc1049ede4e40903a9adf9dff9005801 Author: Maneesha Sunkari Date: Wed Sep 29 15:36:17 2021 +0530 Farmer Redirection Code Added commit 2ff549a20bd4cc746a3e4088e751b514a90ce459 Merge: 45f0ab0b cc3b9136 Author: Swetha Errabelli Date: Wed Sep 29 14:23:55 2021 +0530 Merge branch 'V4.5' of https://gitlab.com/gvsrini/epaddy into V4.5 commit 45f0ab0be58635548f6c077bdf34460e567ebcf6 Author: Swetha Errabelli Date: Wed Sep 29 14:23:35 2021 +0530 Update FarmerReg exceptions Resolved commit cc3b91363f446c3227c9f9d6589ac2562384b224 Author: Maneesha Sunkari Date: Wed Sep 29 14:04:57 2021 +0530 Sort & Variery Selection Added in TokenGen Activity commit 67fa3712a7c2b2c6a1b9d3cad34eab38571ee575 Author: Maneesha Sunkari Date: Wed Sep 29 13:05:41 2021 +0530 update Land Details Done commit ddf8f4c53afc82cec18159ead79553b4a8100ee5 Author: Maneesha Sunkari Date: Wed Sep 29 12:43:27 2021 +0530 Modify FarmerDetails Done commit 14456efd51ffdc1c5ffc6f3f2e287a1b7022e0e3 Author: Maneesha Sunkari Date: Tue Sep 28 22:58:50 2021 +0530 Modify farmer Details Done commit 7ac6decf26e1af75f0968c4996f9702a209465bd Author: Maneesha Sunkari Date: Mon Sep 27 18:06:16 2021 +0530 MovementCancel working Fine commit 38cc6f579bfdc8575f803366eef6490959c81b88 Author: Maneesha Sunkari Date: Mon Sep 27 17:41:10 2021 +0530 Some unknown changes on moment commit 2168f7c98d211f10ab0d987800876ce4a2f021c5 Author: Maneesha Sunkari Date: Mon Sep 27 10:41:37 2021 +0530 Movement & Movement Cancel Done commit e6404826c0475ed79e42ec8a30f14ea3e819f7dd Author: Maneesha Sunkari Date: Fri Sep 24 16:55:37 2021 +0530 LandDetails Validations added commit a77918012c77c568972e998d835bae35d01d0878 Author: Maneesha Sunkari Date: Fri Sep 24 12:01:26 2021 +0530 Some changes commit 5f00929806acb04d6ad987b6f3c425efc0a312b6 Author: Maneesha Sunkari Date: Fri Sep 24 11:40:06 2021 +0530 Movement Code tried to change commit deb1760447447bd6cd5a30838e3dd9c06667f264 Author: Maneesha Sunkari Date: Fri Sep 24 10:03:05 2021 +0530 Procurement Bill Cancel Done commit 1754e81028f03742cec380549cdf07647c34646b Author: Maneesha Sunkari Date: Fri Sep 24 00:07:49 2021 +0530 Village Spinner Added in FarmerRegistrationActivity commit 6dd4f9d83412e6ad6057ab379616b8f718164203 Author: Maneesha Sunkari Date: Thu Sep 23 23:23:26 2021 +0530 Procurement Shedule Local Database removed commit 46d6d628672b24a0ebc5cf51c502f7ff5d44af5a Author: Maneesha Sunkari Date: Thu Sep 23 21:00:55 2021 +0530 Procurement Done in Online Mode commit 1aa5aabc4b70464a720b64fed117208fb582abe6 Author: Maneesha Sunkari Date: Wed Sep 22 22:33:03 2021 +0530 Farmer Registration (Mapped Village Master Needs to be add) & Toke Generation Done commit 54be62518ef8e6a2624c82d2170d55712cccf5fb Author: Maneesha Sunkari Date: Tue Sep 21 12:10:59 2021 +0530 Farmer Reg worked only for One Land commit 6b534c7c681f3f45e37fdafa4bb9f862fce3f9ce Author: Maneesha Sunkari Date: Mon Sep 13 10:34:45 2021 +0530 Token verification code Done commit f849850ba47d4656aac8e1686d298063e33682b6 Author: Maneesha Sunkari Date: Fri Aug 20 10:17:48 2021 +0530 Before Online Code started commit 4994187765e5de61deedc16c42e7c2624870b7ba Author: Maneesha Sunkari Date: Wed Aug 4 11:59:34 2021 +0530 V 4.4 released