Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/order_desc.ftl

@@ -405,6 +405,9 @@
                         for(var j=0;j<salesOrder.salesOrderItemList.length;j++ ){
                             itemNum ++;
                             var salesOrderItem = salesOrder.salesOrderItemList[j];
+                            if(!isEmpty(salesOrderItem.itemTotal)){
+                                salesOrderItem.itemTotal = 0;
+                            }
                             if(isAddOrderType == 1){
                                 var itemTotal = accDiv(salesOrderItem.itemTotal,100);
                                 var html = '';