Merge branch 'develop' into develop2

# Conflicts:
#	src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -157,6 +157,14 @@ public class promotionItems extends Controller {
                     if (itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("packageqty").compareTo(BigDecimal.ZERO) > 0) {
                         saleFactory.addParameter("orderminqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("packageqty"));
                     } else {
+                    if(itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderaddqty").compareTo(BigDecimal.ZERO)<=0){
+                        saleFactory.addParameter("orderaddqty", 1);
+                    }else{
+                        saleFactory.addParameter("orderaddqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderaddqty"));
+                    }
+                    if(itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderminqty").compareTo(BigDecimal.ZERO)<=0){
+                        saleFactory.addParameter("orderminqty", 1);
+                    }else{
                         saleFactory.addParameter("orderminqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderminqty"));
                     }