Merge remote-tracking branch 'origin/develop' into develop

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

@@ -119,6 +119,10 @@ public class OrderItems extends Controller {
 
                 }
             } else {
+                Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and sa_orderitemsid=" + sa_orderitemsid);
+                if(rows.isNotEmpty()){
+                    price1 =rows.get(0).getBigDecimal("price");
+                }
                 isInsert = false;
             }