SmartDukaan – /

Rev 32331 – Added changes related to schemes

amit.gupta — Mon, 14 Aug 2023 11:13:40 +0530

amit.gupta – 9 file(s) modified
Added changes related to schemes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/SchemeSummaryModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-table.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 32330 – Fixe

amit.gupta — Fri, 11 Aug 2023 17:41:51 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css

Rev 32329 – Fixed orders

amit.gupta — Fri, 11 Aug 2023 16:25:45 +0530

amit.gupta – 4 file(s) modified
Fixed orders

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 32328 – Fixe

amit.gupta — Fri, 11 Aug 2023 15:09:00 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 32327 – Fixe

amit.gupta — Fri, 11 Aug 2023 14:48:18 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 32326 – Fixe

amit.gupta — Fri, 11 Aug 2023 13:14:06 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 32325 – Fixe

amit.gupta — Thu, 10 Aug 2023 18:58:32 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 32324 – Fixed changes related to Grn.

amit.gupta — Thu, 10 Aug 2023 15:02:51 +0530

amit.gupta – 2 file(s) modified
Fixed changes related to Grn.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32323 – Fixe

amit.gupta — Thu, 10 Aug 2023 12:27:15 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32322 – Fixe

amit.gupta — Thu, 10 Aug 2023 12:25:05 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32321 – Fixe

amit.gupta — Thu, 10 Aug 2023 08:48:00 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 32320 – Fixe

amit.gupta — Thu, 10 Aug 2023 08:40:57 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32319 – Fixe

amit.gupta — Wed, 09 Aug 2023 19:29:02 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32318 – Fixe

amit.gupta — Wed, 09 Aug 2023 19:12:24 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 32317 – Fixe

amit.gupta — Wed, 09 Aug 2023 19:04:40 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 32316 – Added warehouses fix

amit.gupta — Wed, 09 Aug 2023 18:22:46 +0530

amit.gupta – 2 file(s) modified
Added warehouses fix

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm

Rev 32315 – Resolved the issue with any color

amit.gupta — Wed, 09 Aug 2023 12:04:15 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java

Rev 32314 – Added Oppo Scheduler to process activation information

amit.gupta — Wed, 09 Aug 2023 07:27:06 +0530

amit.gupta – 1 file(s) modified
Added Oppo Scheduler to process activation information

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 32313 –

tejbeer — Tue, 08 Aug 2023 17:43:18 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 32312 – Added warehouses

amit.gupta — Tue, 08 Aug 2023 13:41:34 +0530

amit.gupta – 4 file(s) modified
Added warehouses

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
~ /trunk/InventoryManager/src/main/webapp/js/common.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm

Rev 32311 – changes

tejbeer — Mon, 07 Aug 2023 11:16:37 +0530

tejbeer – 11 file(s) modified
changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/DebitNoteType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseNewReceiveInvoiceModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-validate-purchase.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-invoice-add-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 32310 – Fixe

amit.gupta — Sun, 06 Aug 2023 22:21:31 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java

Rev 32309 – Fixe

amit.gupta — Sun, 06 Aug 2023 22:19:13 +0530

amit.gupta – 2 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 32308 – Added

amit.gupta — Sun, 06 Aug 2023 21:27:53 +0530

amit.gupta – 10 file(s) modified
Added

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/smat-retailer-club.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/super-retailer-club.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/super-retailer.jpg
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 32307 – Added Oppo Scheduler to process activation information

amit.gupta — Fri, 04 Aug 2023 13:41:12 +0530

amit.gupta – 1 file(s) modified
Added Oppo Scheduler to process activation information

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 32306 – Resolved the issue with any color

amit.gupta — Fri, 04 Aug 2023 13:37:04 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 32305 – Fixe

amit.gupta — Fri, 04 Aug 2023 12:14:14 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java

Rev 32304 – Fixe

amit.gupta — Fri, 04 Aug 2023 12:06:46 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java

Rev 32303 – Fixe

amit.gupta — Fri, 04 Aug 2023 08:34:25 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 32302 – Fixe

amit.gupta — Fri, 04 Aug 2023 08:32:52 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/url-generation.vm

Rev 32301 – Fixed comment

amit.gupta — Thu, 03 Aug 2023 20:31:34 +0530

amit.gupta – 1 file(s) modified
Fixed comment

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 32300 – change

tejbeer — Thu, 03 Aug 2023 16:25:29 +0530

tejbeer – 11 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/DebitNoteType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseDebitNoteLine.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-debit-note.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-view.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoices.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-view-purchase-order.vm

Rev 32299 – In Finance Automate Process SellIn SellOut

jai.hind — Thu, 03 Aug 2023 16:20:11 +0530

jai.hind – 3 file(s) modified
In Finance Automate Process SellIn SellOut

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 32298 –

tejbeer — Wed, 02 Aug 2023 19:51:19 +0530

tejbeer – 4 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32297 –

tejbeer — Wed, 02 Aug 2023 18:30:19 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 32296 –

tejbeer — Wed, 02 Aug 2023 17:34:28 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 32295 –

tejbeer — Wed, 02 Aug 2023 17:22:34 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 32294 –

tejbeer — Wed, 02 Aug 2023 17:19:00 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-debit-note.vm

Rev 32293 –

tejbeer — Wed, 02 Aug 2023 16:57:53 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 32292 –

tejbeer — Wed, 02 Aug 2023 13:45:39 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java