resolved conflict in ChangeLog

This commit is contained in:
Fred Gleason
2016-04-26 16:44:35 -04:00
2 changed files with 4 additions and 1 deletions

View File

@@ -1090,7 +1090,7 @@ void MainWidget::RefreshList()
RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(),
schedcode,true)+" && "+type_filter;
}
sql+=" order by CART.NUMBER";
sql+=" group by CART.NUMBER order by CART.NUMBER";
if(lib_showmatches_box->isChecked()) {
sql+=QString().sprintf(" limit %d",RD_LIMITED_CART_SEARCH_QUANTITY);
}