Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r33276 -r33285 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 33276) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 33285) @@ -480,7 +480,10 @@ obj.put("manufacturer", diposableGoodBatch.getManufacturer()); obj.put("certification", certification); obj.put("tousseType", TousseItem.TYPE_DIPOSABLE_GOODS); - obj.put("invoicePlanSerialNumber", invoice.getInvoicePlan().getSerialNumber()); + obj.put("invoicePlanSerialNumber", ""); + if(invoice.getInvoicePlan() != null){ + obj.put("invoicePlanSerialNumber", invoice.getInvoicePlan().getSerialNumber()); + } jsonArray.add(obj); @@ -529,7 +532,10 @@ obj.put("certification", ""); obj.put("tousseType", tousseDefinition.getTousseType()); obj.put("urgentLevel", tousseInstance.getUrgentLevel()); - obj.put("invoicePlanSerialNumber", invoice.getInvoicePlan().getSerialNumber()); + obj.put("invoicePlanSerialNumber", ""); + if(invoice.getInvoicePlan() != null){ + obj.put("invoicePlanSerialNumber", invoice.getInvoicePlan().getSerialNumber()); + } jsonArray.add(obj); } } @@ -577,7 +583,10 @@ obj.put("manufacturer", ""); obj.put("certification", ""); obj.put("tousseType", ExpensiveGoods.TYPE_NAME); - obj.put("invoicePlanSerialNumber", invoice.getInvoicePlan().getSerialNumber()); + obj.put("invoicePlanSerialNumber", ""); + if(invoice.getInvoicePlan() != null){ + obj.put("invoicePlanSerialNumber", invoice.getInvoicePlan().getSerialNumber()); + } jsonArray.add(obj); }