Subversion Repositories SmartDukaan

Rev

Rev 36958 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36958 Rev 37067
Line 2478... Line 2478...
2478
        pdfModel.setRetailer(customRetailer);
2478
        pdfModel.setRetailer(customRetailer);
2479
        pdfModel.setTotalAmount(customFofoOrderItem.getNetAmount());
2479
        pdfModel.setTotalAmount(customFofoOrderItem.getNetAmount());
2480
        pdfModel.setOrderItems(customerFofoOrderItems);
2480
        pdfModel.setOrderItems(customerFofoOrderItems);
2481
        pdfModel.setHasMarginSchemeItems(isMarginItem);
2481
        pdfModel.setHasMarginSchemeItems(isMarginItem);
2482
 
2482
 
-
 
2483
        // State codes (were unset, so the note printed "Code: null"). Partner = supplier, customer = buyer.
-
 
2484
        pdfModel.setPartnerAddressStateCode(
-
 
2485
                stateRepository.selectByName(customRetailer.getAddress().getState()).getCode());
-
 
2486
        if (customCustomer.getAddress() != null && customCustomer.getAddress().getState() != null
-
 
2487
                && !customCustomer.getAddress().getState().trim().isEmpty()) {
-
 
2488
            pdfModel.setCustomerAddressStateCode(
-
 
2489
                    stateRepository.selectByName(customCustomer.getAddress().getState()).getCode());
-
 
2490
        }
-
 
2491
 
2483
        CreditNotePdfModel creditNotePdfModel = new CreditNotePdfModel();
2492
        CreditNotePdfModel creditNotePdfModel = new CreditNotePdfModel();
2484
        creditNotePdfModel.setCreditNoteDate(FormattingUtils.formatDate(creditNote.getCreateTimestamp()));
2493
        creditNotePdfModel.setCreditNoteDate(FormattingUtils.formatDate(creditNote.getCreateTimestamp()));
2485
        creditNotePdfModel.setCreditNoteNumber(creditNote.getCreditNoteNumber());
2494
        creditNotePdfModel.setCreditNoteNumber(creditNote.getCreditNoteNumber());
2486
        creditNotePdfModel.setPdfModel(pdfModel);
2495
        creditNotePdfModel.setPdfModel(pdfModel);
2487
        return creditNotePdfModel;
2496
        return creditNotePdfModel;