Subversion Repositories SmartDukaan

Rev

Rev 19515 | Rev 19723 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 19515 Rev 19516
Line 312... Line 312...
312
312
313 
					dispatchAdviceTable.setSpacingAfter(10.0f);
 313 
					dispatchAdviceTable.setSpacingAfter(10.0f);
314 
					dispatchAdviceTable.setWidthPercentage(90.0f);
 314 
					dispatchAdviceTable.setWidthPercentage(90.0f);
315 
					document.add(dispatchAdviceTable);
 315 
					document.add(dispatchAdviceTable);
316 
					if("Bulk".equalsIgnoreCase(invoiceFormat)){
 316 
					if("Bulk".equalsIgnoreCase(invoiceFormat)){
317 
						if(ordersList.size()>3 || (order.getLogistics_provider_id()==7 && order.isLogisticsCod()) || (order.getLogistics_provider_id()==46 && order.isLogisticsCod())){
 317 
						if(ordersList.size()>3 || (order.getLogistics_provider_id()==7 && (order.isLogisticsCod() || (!order.isLogisticsCod() && ordersList.size()>1)))
- 
 
 318 
								|| (order.getLogistics_provider_id()==46 && (order.isLogisticsCod() || (!order.isLogisticsCod() && ordersList.size()>1)))){
318 
							document.newPage();
 319 
							document.newPage();
319 
						}
 320 
						}
320 
					}
 321 
					}
321
322
322 
					if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7) &&(ordersList.size()==1)) {
 323 
					if ((new Long(order.getSource()).intValue() == OrderSource.EBAY.getValue()) && (order.getLogistics_provider_id()>7) &&(ordersList.size()==1)) {