Index: branches/5.2.x/admin_templates/orders/orders_search_list.tpl =================================================================== --- branches/5.2.x/admin_templates/orders/orders_search_list.tpl +++ branches/5.2.x/admin_templates/orders/orders_search_list.tpl @@ -29,6 +29,7 @@ a_toolbar.AddButton( new ToolBarButton('export', '', function() { set_hidden_field('export_finish_t', 'in-commerce/orders/export/export_finish'); set_hidden_field('export_progress_t', 'in-commerce/orders/export/export_progress'); + set_hidden_field('grid', 'Search'); open_popup('ord.search', 'OnExport', 'in-commerce/orders/export/export'); } ) ); @@ -68,4 +69,4 @@ \ No newline at end of file + Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== --- branches/5.2.x/units/orders/orders_event_handler.php +++ branches/5.2.x/units/orders/orders_event_handler.php @@ -3752,24 +3752,8 @@ { parent::OnBeforeExportBegin($event); - $options = $event->getEventParam('options'); - - $items_list = $this->Application->recallObject($event->Prefix . '.' . $this->Application->RecallVar('export_oroginal_special'), $event->Prefix . '_List'); - /* @var $items_list kDBList */ - - $items_list->SetPerPage(-1); - - if ( $options['export_ids'] != '' ) { - $items_list->AddFilter('export_ids', $items_list->TableName . '.' . $items_list->IDField . ' IN (' . implode(',', $options['export_ids']) . ')'); - } - - $options['ForceCountSQL'] = $items_list->getCountSQL($items_list->GetSelectSQL(true, false)); - $options['ForceSelectSQL'] = $items_list->GetSelectSQL(); - - $event->setEventParam('options', $options); - + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->Prefix . '.export'); - /* @var $object kDBItem */ $object->SetField('Number', 999999); $object->SetField('SubNumber', 999);