";
if ($canedit) {
echo "| ";
@@ -517,8 +517,8 @@ public static function install(Migration $migration) {
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8_unicode_ci DEFAULT '',
`number` varchar(255) COLLATE utf8_unicode_ci DEFAULT '',
- `billdate` datetime DEFAULT NULL,
- `validationdate` datetime DEFAULT NULL,
+ `billdate` timestamp NULL DEFAULT NULL,
+ `validationdate` timestamp NULL DEFAULT NULL,
`comment` text COLLATE utf8_unicode_ci,
`plugin_order_billstates_id` int(11) NOT NULL DEFAULT '0',
`value` decimal(20,6) NOT NULL DEFAULT '0.000000',
@@ -537,7 +537,7 @@ public static function install(Migration $migration) {
//Migrate bills
$bill = new PluginOrderBill();
$query = "SELECT * FROM `glpi_plugin_order_orders_suppliers`";
- foreach (getAllDatasFromTable('glpi_plugin_order_orders_suppliers') as $data) {
+ foreach (getAllDataFromTable('glpi_plugin_order_orders_suppliers') as $data) {
if (!is_null($data['num_bill'])
&& $data['num_bill'] != ''
&& !countElementsInTable('glpi_plugin_order_bills',
diff --git a/inc/link.class.php b/inc/link.class.php
index 2495f1eb4e..089523d3d0 100644
--- a/inc/link.class.php
+++ b/inc/link.class.php
@@ -149,6 +149,7 @@ public function showItemGenerationForm($params) {
if (Session::isMultiEntitiesMode()
&& count($_SESSION['glpiactiveentities']) > 1) {
+ $order_web_dir = Plugin::getWebDir('order');
echo " | ";
$rand = Entity::Dropdown([
'name' => "id[$i][entities_id]",
@@ -157,21 +158,21 @@ public function showItemGenerationForm($params) {
);
Ajax::updateItemOnSelectEvent("dropdown_id[$i][entities_id]$rand",
"show_location_by_entity_id_$i",
- $CFG_GLPI["root_doc"] . "/plugins/order/ajax/linkactions.php",
+ "$order_web_dir/ajax/linkactions.php",
['entities' => '__VALUE__',
'action' => 'show_location_by_entity',
'id' => $i
]);
Ajax::updateItemOnSelectEvent("dropdown_id[$i][entities_id]$rand",
"show_group_by_entity_id_$i",
- $CFG_GLPI["root_doc"] . "/plugins/order/ajax/linkactions.php",
+ "$order_web_dir/ajax/linkactions.php",
['entities' => '__VALUE__',
'action' => 'show_group_by_entity',
'id' => $i
]);
Ajax::updateItemOnSelectEvent("dropdown_id[$i][entities_id]$rand",
"show_state_by_entity_id_$i",
- $CFG_GLPI["root_doc"] . "/plugins/order/ajax/linkactions.php",
+ "$order_web_dir/ajax/linkactions.php",
['entities' => '__VALUE__',
'action' => 'show_state_by_entity',
'id' => $i
@@ -288,7 +289,7 @@ public function showOrderLink($plugin_order_orders_id) {
$result_ref = $this->queryRef($plugin_order_orders_id, 'glpi_plugin_order_references');
$numref = $DB->numrows($result_ref);
- while ($data_ref = $DB->fetch_array($result_ref)) {
+ while ($data_ref = $DB->fetchArray($result_ref)) {
$link = new self();
$link->showOrderLinkItem($numref, $data_ref, $canedit, $plugin_order_orders_id, $PluginOrderOrder,
'glpi_plugin_order_references');
@@ -296,7 +297,7 @@ public function showOrderLink($plugin_order_orders_id) {
$result_reffree = $this->queryRef($plugin_order_orders_id, 'glpi_plugin_order_referencefrees');
$numreffree = $DB->numrows($result_reffree);
- while ($data_reffree = $DB->fetch_array($result_reffree)) {
+ while ($data_reffree = $DB->fetchArray($result_reffree)) {
$link = new self();
$link->showOrderLinkItem($numreffree, $data_reffree, $canedit, $plugin_order_orders_id, $PluginOrderOrder,
'glpi_plugin_order_referencefrees');
@@ -364,7 +365,7 @@ public function showOrderLinkItem($numref, $data_ref, $canedit, $plugin_order_or
$result = $DB->query($query);
$num = $DB->numrows($result);
$all_data = [];
- while ($data = $DB->fetch_array($result)) {
+ while ($data = $DB->fetchArray($result)) {
$all_data[] = $data;
}
@@ -752,7 +753,7 @@ public function getReceptionItemName($items_id, $itemtype) {
}
$rand = Dropdown::showFromArray('generationActions', $actions);
Ajax::updateItemOnSelectEvent("dropdown_generationActions$rand", "show_generationActions$rand",
- $CFG_GLPI["root_doc"]."/plugins/order/ajax/linkactions.php",
+ Plugin::getWebDir('order')."/ajax/linkactions.php",
['action' => '__VALUE__',
'itemtype' => $itemtype,
'plugin_order_references_id' => $plugin_order_references_id,
@@ -1342,7 +1343,7 @@ public static function copyDocuments($itemtype, $items_id, $orders_id, $entity)
$item->getFromDB($items_id);
$is_recursive = 0;
- foreach (getAllDatasFromTable('glpi_documents_items',
+ foreach (getAllDataFromTable('glpi_documents_items',
['itemtype' => 'PluginOrderOrder',
'items_id' => $orders_id]) as $doc) {
@@ -1350,7 +1351,7 @@ public static function copyDocuments($itemtype, $items_id, $orders_id, $entity)
$document->getFromDB($doc['documents_id']);
if (($document->getEntityID() != $entity && !$document->fields['is_recursive'])
|| !in_array($entity, getSonsOf('glpi_entities', $document->getEntityID()))) {
- $found_docs = getAllDatasFromTable(
+ $found_docs = getAllDataFromTable(
'glpi_documents',
[
'entities_id' => $entity,
diff --git a/inc/menu.class.php b/inc/menu.class.php
index 9736e7ab3e..bf12696192 100644
--- a/inc/menu.class.php
+++ b/inc/menu.class.php
@@ -14,6 +14,7 @@ static function getMenuContent() {
$menu = [
'title' => self::getTypeName(2),
'page' => self::getSearchURL(false),
+ 'icon' => PluginOrderOrder::getIcon(),
];
if (PluginOrderConfig::canView()) {
$menu['links']['config'] = PluginOrderConfig::getFormURL(false);
@@ -23,6 +24,7 @@ static function getMenuContent() {
$menu['options']['order'] = [
'title' => PluginOrderOrder::getTypeName(2),
'page' => PluginOrderOrder::getSearchURL(false),
+ 'icon' => PluginOrderOrder::getIcon(),
];
if (PluginOrderOrder::canCreate()) {
$menu['options']['order']['links'] = [
diff --git a/inc/order.class.php b/inc/order.class.php
index efab5c00fa..6e17009b6c 100644
--- a/inc/order.class.php
+++ b/inc/order.class.php
@@ -714,7 +714,7 @@ public function post_addItem() {
// ADD Documents
$docitem = new Document_Item();
- $docs = getAllDatasFromTable(
+ $docs = getAllDataFromTable(
"glpi_documents_items",
[
'items_id' => $this->input["_oldID"],
@@ -1034,7 +1034,7 @@ public function showForm ($ID, $options = []) {
$values = [0 => Dropdown::EMPTY_VALUE];
if ($number) {
- while ($data = $DB->fetch_assoc($result)) {
+ while ($data = $DB->fetchAssoc($result)) {
$values[$data['id']] = formatUserName('', '', $data['name'], $data['firstname']);
}
}
@@ -1347,7 +1347,7 @@ public function dropdownSuppliers($myname, $value = 0, $entity_restrict = '') {
echo "\n";
$prev = -1;
- while ($data = $DB->fetch_array($result)) {
+ while ($data = $DB->fetchArray($result)) {
if ($data["entities_id"] != $prev) {
if ($prev >= 0) {
echo "";
@@ -1368,7 +1368,7 @@ public function dropdownSuppliers($myname, $value = 0, $entity_restrict = '') {
}
echo "";
Ajax::updateItemOnSelectEvent("suppliers_id", "show_contacts_id",
- $CFG_GLPI["root_doc"]."/plugins/order/ajax/dropdownSupplier.php",
+ Plugin::getWebDir('order')."/ajax/dropdownSupplier.php",
[
'suppliers_id' => '__VALUE__',
'entity_restrict' => $entity_restrict,
@@ -1400,7 +1400,7 @@ public function dropdownContacts($suppliers_id, $value = 0, $entity_restrict = '
if ($DB->numrows($result)) {
$prev = -1;
- while ($data = $DB->fetch_array($result)) {
+ while ($data = $DB->fetchArray($result)) {
if ($data["entities_id"] != $prev) {
if ($prev >= 0) {
echo "";
@@ -1598,7 +1598,7 @@ public function showValidationForm($orders_id) {
public function showGenerationForm($ID) {
global $CFG_GLPI;
- echo " |