| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36121 |
2 h 52 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ |
Set orderId on CustomOrderItem for invoice PDF generation |
|
| 36120 |
2 h 52 m |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Widen Order Id column, compact E-Way Bill format matching invoice style |
|
| 36119 |
4 h 2 m |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Invoice PDF fixes: unified Rate column, per-unit gross sale for margin qty>1, Tax+Total columns, Tax Rate header, remove whitespace in summary |
|
| 36118 |
4 h 13 m |
ranu |
/trunk/ |
code for socket snapshot |
|
| 36117 |
4 h 19 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ |
Route all invoice PDF generation to generateInvoiceV2 |
|
| 36116 |
4 h 20 m |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Unified invoice PDF generation (generateInvoiceV2) for both margin and regular invoices
- New clean layout: Logo+Title+QR header, Supplier/Invoice/Buyer sections, 10-col item table
- Margin: subtitle, declaration, Gross Sale/Margin columns, GST on Margin summary
- Regular: Rate/Taxable columns, Total GST summary, no declaration
- Shared: Tax Rate col, Tax+Total cols, payment, credit terms, IRN/QR, EWB, cancellation
- Old generateAndWrite() preserved for debit notes and credit notes |
|
| 36115 |
4 h 36 m |
ranu |
/trunk/ |
rbm rating consolidate mail |
|
| 36114 |
5 h 57 m |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ |
rating system updated ..weekly rating |
|
| 36113 |
5 h 58 m |
ranu |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ |
rbm rating consolidate mail |
|
| 36112 |
6 h 21 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
weekly rating system live on calling module |
|
| 36111 |
7 h 18 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 |
9 h 44 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ |
Route margin scheme invoices to new generateMarginSchemeInvoice() PDF method |
|
| 36109 |
9 h 44 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 |
1 d 1 h |
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 |
1 d 2 h |
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 |
1 d 2 h |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ |
Add REJECTED status to PurchaseReturnStatus enum for DN rejection flow |
|
| 36105 |
1 d 3 h |
amit |
/trunk/profitmandi-dao/src/main/resources/ |
Remove SQL migration files from version control |
|
| 36104 |
1 d 3 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Add DN rejection and item denial endpoints for purchase return flow |
|
| 36103 |
1 d 3 h |
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 |
1 d 4 h |
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. |
|