mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 00:53:53 +02:00
resolved conflict in ChangeLog
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user