Merge edd9462b6a86

This commit is contained in:
Heng Sin Low 2013-03-06 17:59:50 +08:00
commit d9657671d5
1 changed files with 7 additions and 1 deletions

View File

@ -148,7 +148,7 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
} }
} }
else if (m_order.getFreightCostRule().equals(MOrder.FREIGHTCOSTRULE_Calculated)) else if (m_order.getFreightCostRule().equals(MOrder.FREIGHTCOSTRULE_Calculated))
{ {
if (freightLine == null) if (freightLine == null)
{ {
freightLine = new MOrderLine(m_order); freightLine = new MOrderLine(m_order);
@ -166,6 +166,12 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
freightLine.setQty(BigDecimal.ONE); freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(st.getPrice()); freightLine.setPrice(st.getPrice());
freightLine.saveEx(); freightLine.saveEx();
if (m_order.isPriviledgedRate() != p_IsPriviledgedRate)
{
m_order.setIsPriviledgedRate(p_IsPriviledgedRate);
m_order.saveEx();
}
} }
} }
else else