Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

This commit is contained in:
Jerome Nadaud
2013-09-16 15:33:04 +02:00
10 changed files with 24 additions and 31 deletions
@@ -75,13 +75,6 @@ class AdminOrdersControllerCore extends AdminController
'align' => 'center',
'type' => 'bool',
'tmpTableFilter' => true,
'icon' => array(
0 => 'blank.gif',
1 => array(
'src' => 'note.png',
'alt' => $this->l('First customer order'),
)
),
'orderby' => false
),
'customer' => array(