Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1253,8 +1253,10 @@ public class OrderItems extends Controller {
                     price =  itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice();
                 }
                 row.put("price", price);
+                row.put("price1", itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice());
             } else {
                 row.put("price", 0);
+                row.put("price1", 0);
             }
 
             row = customScheme.setScheme(row, "width");