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

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursement.java

@@ -178,17 +178,18 @@ public class tpartreimbursement extends Controller {
         Rows rows = querySQL.query();
 
 
-        QuerySQL querySQLdetail = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid", "sa_tpartreimbursementdetailid", "qty", "isverified");
+        QuerySQL querySQLdetail = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid", "sa_tpartreimbursementdetailid", "qty", "isverified","checkqty");
         querySQLdetail.setTableAlias("t1");
         querySQLdetail.addJoinTable(JOINTYPE.left, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid", "price");
         querySQLdetail.setWhere("t1.siteid", siteid);
         querySQLdetail.setWhere("t1.sa_tpartreimbursementid", rows.toArrayList("sa_tpartreimbursementid"));
         querySQLdetail.addQueryFields("amount", "ROUND(t2.price*t1.qty,2)");
+        querySQLdetail.addQueryFields("amount2", "ROUND(t2.price*t1.checkqty,2)");
         Rows rowsdetail = querySQLdetail.query();
         RowsMap rowsMap = rowsdetail.toRowsMap("sa_tpartreimbursementid");
         for (Row row : rows) {
             row.put("totalamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount"));
-            row.put("offamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).toRowsMap("isverified").get("1").sum("amount"));
+            row.put("offamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount2"));
         }
         return getSucReturnObject().setData(rows).toString();
     }