Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36114 59 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ rating system updated ..weekly rating  
36113 59 m ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ rbm rating consolidate mail  
36112 1 h 22 m ranu /trunk/profitmandi-fofo/src/main/ weekly rating system live on calling module  
36111 2 h 19 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ Update margin scheme invoice PDF to match GST compliant format per Rule 32(5)

- Title: TAX INVOICE with margin scheme subtitle
- No purchase price disclosed on invoice
- Columns: S.No, Description, HSN, Qty, Gross Sale Value, Taxable Value (Margin), Tax Rate, Tax Amount
- Declaration box with Section 2(27) and Rule 32(5) reference
- Summary: Total Selling Price, GST on Margin, Total Invoice Value
- Labels: Buyer Details / Supplier Details per GST terminology
 
36110 4 h 45 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ Route margin scheme invoices to new generateMarginSchemeInvoice() PDF method  
36109 4 h 45 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ Separate margin scheme invoice PDF generation from regular invoice flow

- Add generateMarginSchemeInvoice() with proper margin scheme table format:
S.No | Description | HSN | Qty | Purchase Price | Selling Price | Margin | GST on Margin | Invoice Total
- Title: INVOICE OF SUPPLY (MARGIN SCHEME)
- Remove margin-specific logic from generateAndWrite() (regular invoice path)
- IRN, E-Way Bill, and cancellation stamp logic intact in both paths
 
36108 20 h 30 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Fix margin scheme e-invoice: remove OthChrg from item level, declare only taxable margin + GST in e-invoice values. NIC/GSP rejects item-level OthChrg with error 2189. Verified on sandbox.  
36107 21 h 1 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Fix margin scheme e-invoice: use purchase price directly as OthChrg instead of deriving by subtraction. Avoids float precision issues that caused NIC error 2189.  
36106 21 h 48 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ Add REJECTED status to PurchaseReturnStatus enum for DN rejection flow  
36105 22 h 3 m amit /trunk/profitmandi-dao/src/main/resources/ Remove SQL migration files from version control  
36104 22 h 7 m amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Add DN rejection and item denial endpoints for purchase return flow  
36103 22 h 7 m amit /trunk/profitmandi-dao/src/main/ Add DN rejection with full reversal: restore inventory, schemes, price drops, offers; add deny reason to purchase return items; add purchase return notification service  
36102 23 h 7 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fix IRN error 2189 for margin scheme invoices + handle non-serialized debit note returns

GstProService: Fix float precision drift in TotItemVal calculation for margin scheme items.
Use BigDecimal for OthChrg subtraction and set TotItemVal directly to sellingPrice
instead of re-adding float components. Fixes all RF- invoice IRN failures including
zero-margin internal orders.

PurchaseReturnServiceImpl: Add non-serialized item handling in receiveDebitNoteItems
and refundOrder. Previously non-serialized items skipped warehouse scan creation,
quantity adjustment, order status update, and ReturnOrderInfo creation. Also pre-loads
items to avoid N+1 queries and unifies scan type determination for both paths.
 
36101 1 d 0 h ranu /trunk/ weekly rating system live on calling module  
36100 2 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix margin invoice: resolve GRN purchaseId to PO id for purchase price lookup, rename selectByPurchaseIdItemId to selectByPurchaseOrderIdItemId  
36099 2 d 22 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ code commit via websocket instead of selenium for agent status  
36098 2 d 23 h ranu /trunk/ code commit via websocket instead of selenium for agent status  
36097 2 d 23 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ code commit via websocket instead of selenium for agent status  
36096 3 d 1 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ persistance logout and other status ...agent live status (deduplication)  
36095 3 d 1 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ persistance logout and other status ...agent live status (deduplication)  

Show All