Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop

This commit is contained in:
Michael RICOIS 2017-12-07 11:14:23 +01:00
commit c041a8a1b3

View File

@ -99,6 +99,7 @@ class AdminOrders extends AdminTab
//'mixed' => array('title' => $this->l('Mixed'), 'callback' => 'printMixedSale', 'orderby' => false, 'search' => false),
'id_pdf' => array('title' => $this->l('PDF'), 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false),
'id_country' => array('title' => $this->l('Pays'), 'callback' => 'printCountry', 'orderby' => false, 'type' => 'select', 'select' => $country_array, 'filter_key' => 'x!id_country', 'filter_type' => 'int', 'width' => 35,),
'appli' => array('title' => $this->l('Appli'), 'width' => 25, 'align' => 'center', 'type' => 'bool', 'filter_key' => 'appli', 'tmpTableFilter' => true, 'icon' => array(0 => 'disabled.gif', 1 => 'enabled.gif'), 'orderby' => false),
);
parent::__construct();