Merge pull request 'Add stock management (#14)' (#1) from stock_management into master

#14

action.php

@@ -363,4 +363,64 @@ switch ($VARS['action']) {
         session_destroy();
         header('Location: index.php?logout=1');
         die("Logged out.");
+    case "addstock":
+        $insert = true;
+
+        if (empty($VARS['stock'])) {
+            $VARS['stock'] = 1;
+        } else if (!is_numeric($VARS['stock'])) {
+            returnToSender('field_nan');
+        }
+
+        $user = $_SESSION['uid'];
+
+        $data = [
+            'itemid' => $VARS['itemid'],
+            'stock' => $VARS['stock'],
+            'text1' => $VARS['text1'],
+            'userid' => $user
+        ];
+
+        $database->insert('stock', $data);
+
+        $currentqty = $database->get('items', 'qty', ['itemid' => $VARS['itemid']]);
+        $newqty = $currentqty + $VARS['stock'];
+
+        $data = [
+            'qty' => $newqty
+        ];
+
+        $database->update('items', $data, ['itemid' => $VARS['itemid']]);
+
+        returnToSender("stock_added");
+    case "removestock":
+        $insert = true;
+
+        if (empty($VARS['stock'])) {
+            $VARS['stock'] = -1;
+        } else if (!is_numeric($VARS['stock'])) {
+            returnToSender('field_nan');
+        }
+
+        $user = $_SESSION['uid'];
+
+        $data = [
+            'itemid' => $VARS['itemid'],
+            'stock' => -$VARS['stock'],
+            'text1' => $VARS['text1'],
+            'userid' => $user
+        ];
+
+        $database->insert('stock', $data);
+
+        $currentqty = $database->get('items', 'qty', ['itemid' => $VARS['itemid']]);
+        $newqty = $currentqty - $VARS['stock'];
+
+        $data = [
+            'qty' => $newqty
+        ];
+
+        $database->update('items', $data, ['itemid' => $VARS['itemid']]);
+
+        returnToSender("stock_removed");
 }

database.sql

@@ -1,5 +1,5 @@
 -- MySQL Script generated by MySQL Workbench
--- Sat 22 Sep 2018 02:40:11 AM MDT
+-- Wed 11 Mar 2020 10:06:41 EET
 -- Model: New Model    Version: 1.0
 -- MySQL Workbench Forward Engineering
 
@@ -55,14 +55,14 @@ CREATE TABLE IF NOT EXISTS `items` (
   `price` DECIMAL(10,2) NULL,
   PRIMARY KEY (`itemid`),
   INDEX `fk_items_categories_idx` (`catid` ASC),
-  INDEX `fk_items_locations1_idx` (`locid` ASC),
+  INDEX `fk_items_locations_idx` (`locid` ASC),
   UNIQUE INDEX `itemid_UNIQUE` (`itemid` ASC),
   CONSTRAINT `fk_items_categories`
     FOREIGN KEY (`catid`)
     REFERENCES `categories` (`catid`)
     ON DELETE NO ACTION
     ON UPDATE NO ACTION,
-  CONSTRAINT `fk_items_locations1`
+  CONSTRAINT `fk_items_locations`
     FOREIGN KEY (`locid`)
     REFERENCES `locations` (`locid`)
     ON DELETE NO ACTION
@@ -89,12 +89,12 @@ CREATE TABLE IF NOT EXISTS `permissions` (
   `itemid` INT NOT NULL,
   `canedit` TINYINT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`userid`, `itemid`),
-  INDEX `fk_permissions_items1_idx` (`itemid` ASC),
+  INDEX `fk_permissions_items_idx` (`itemid` ASC),
-  CONSTRAINT `fk_permissions_items1`
+  CONSTRAINT `fk_permissions_items`
     FOREIGN KEY (`itemid`)
     REFERENCES `items` (`itemid`)
-    ON DELETE NO ACTION
+    ON DELETE CASCADE
-    ON UPDATE NO ACTION)
+    ON UPDATE CASCADE)
 ENGINE = InnoDB;
 
 
@@ -120,12 +120,33 @@ CREATE TABLE IF NOT EXISTS `images` (
   `primary` TINYINT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`imageid`, `itemid`),
   UNIQUE INDEX `imageid_UNIQUE` (`imageid` ASC),
-  INDEX `fk_images_items1_idx` (`itemid` ASC),
+  INDEX `fk_images_items_idx` (`itemid` ASC),
-  CONSTRAINT `fk_images_items1`
+  CONSTRAINT `fk_images_items`
     FOREIGN KEY (`itemid`)
     REFERENCES `items` (`itemid`)
-    ON DELETE NO ACTION
+    ON DELETE CASCADE
-    ON UPDATE NO ACTION)
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `stock`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `stock` (
+  `stockid` INT NOT NULL AUTO_INCREMENT,
+  `itemid` INT NOT NULL,
+  `stock` INT NOT NULL,
+  `text1` TEXT(500) NOT NULL,
+  `userid` INT NOT NULL,
+  `timestamp` TIMESTAMP NOT NULL,
+  PRIMARY KEY (`stockid`, `itemid`),
+  UNIQUE INDEX `stockid_UNIQUE` (`stockid` ASC),
+  INDEX `fk_stock_items_idx` (`itemid` ASC),
+  CONSTRAINT `fk_stock_items`
+    FOREIGN KEY (`itemid`)
+    REFERENCES `items` (`itemid`)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
 ENGINE = InnoDB;
 
 

langs/en/actions.json

@@ -4,5 +4,7 @@
     "save": "Save",
     "delete": "Delete",
     "view": "View",
-    "show all items": "Show All Items"
+    "show all items": "Show All Items",
+    "addstock": "Add",
+    "removestock": "Remove"
 }

langs/en/core.json

@@ -6,7 +6,6 @@
     "login server error": "The login server returned an error: {arg}",
     "login server user data error": "The login server refused to provide account information.  Try again or contact technical support.",
     "captcha error": "There was a problem with the CAPTCHA (robot test).  Try again.",
-    "no access permission": "You do not have permission to access this system.",
     "no permission": "You do not have permission to access this system.",
     "no edit permission": "You do not have permission to modify records."
 }

langs/en/items.json

@@ -9,5 +9,8 @@
     "cloning item": "Copying {oitem} <i class=\"fa fa-angle-right\"></i> {nitem}",
     "itemid": "Item ID",
     "id": "ID",
-    "Edit Item": "Edit Item"
+    "Edit Item": "Edit Item",
+    "stockid": "Stock ID",
+    "adding stock": "Adding stock for {item}",
+    "removing stock": "Removing stock from {item}"
 }

langs/en/labels.json

@@ -7,10 +7,10 @@
     "code 1": "Code 1",
     "code 2": "Code 2",
     "qty": "Qty",
-    "want": "Need",
+    "want": "Min",
-    "assigned to": "Assigned To",
+    "assigned to": "Assigned to",
     "quantity": "Quantity",
-    "minwant": "Minimum On Hand",
+    "minwant": "Minimum on hand",
     "item count": "Item count",
     "Item cost": "Item cost",
     "Sale price": "Sale price",
@@ -18,5 +18,9 @@
     "Notes": "Notes",
     "Comments": "Comments",
     "Cost": "Cost",
-    "Price": "Price"
+    "Price": "Price",
+    "date": "Date",
+    "amount": "Stock amount",
+    "description": "Description",
+    "changed by": "Changed by"
 }

langs/en/messages.json

@@ -17,5 +17,7 @@
     "only showing understocked": "Only showing understocked items.",
     "missing name": "You need to enter a name.",
     "use the dropdowns": "Whoops, you need to use the category and location autocomplete boxes.",
-    "make categories and locations": "Please create at least one category and location before adding an item."
+    "make categories and locations": "Please create at least one category and location before adding an item.",
+    "stock added": "Stock added.",
+    "stock removed": "Stock removed."
 }

langs/en/reports.json

@@ -5,5 +5,6 @@
     "choose an option": "Choose an option",
     "csv file": "CSV text file",
     "ods file": "ODS spreadsheet",
-    "html file": "HTML web page"
+    "html file": "HTML web page",
+    "Stock": "Stock movements"
 }

langs/messages.php

@@ -96,5 +96,13 @@ define("MESSAGES", [
     "upload_success" => [
         "string" => "Image uploaded.",
         "type" => "success"
+    ],
+    "stock_added" => [
+        "string" => "stock added",
+        "type" => "success"
+    ],
+    "stock_removed" => [
+        "string" => "stock removed",
+        "type" => "success"
     ]
 ]);

lib/getitemtable.php

@@ -32,25 +32,25 @@ if ($VARS['order'][0]['dir'] == 'asc') {
     $sortby = "ASC";
 }
 switch ($VARS['order'][0]['column']) {
-    case 2:
+    case 1:
         $order = ["name" => $sortby];
         break;
-    case 3:
+    case 2:
         $order = ["catname" => $sortby];
         break;
-    case 4:
+    case 3:
         $order = ["locname" => $sortby];
         break;
-    case 5:
+    case 4:
         $order = ["code1" => $sortby];
         break;
-    case 6:
+    case 5:
         $order = ["code2" => $sortby];
         break;
-    case 7:
+    case 6:
         $order = ["qty" => $sortby];
         break;
-    case 8:
+    case 7:
         $order = ["want" => $sortby];
         break;
     // Note: We're not going to sort by assigned user.  It's too hard.  Maybe later.
@@ -118,8 +118,17 @@ for ($i = 0; $i < count($items); $i++) {
     $user = new User($_SESSION['uid']);
     if ($user->hasPermission("INV_EDIT")) {
         $items[$i]["editbtn"] = '<a class="btn btn-primary" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '"><i class="fas fa-edit"></i> ' . $Strings->get("edit", false) . '</a>';
+        if ($SETTINGS['stock_management']) {
+            $items[$i]["addstockbtn"] = '<a class="btn btn-success" href="app.php?page=addstock&id=' . $items[$i]['itemid'] . '"><i class="fas fa-plus"></i> ' . $Strings->get("addstock", false) . '</a>';
+            $items[$i]["removestockbtn"] = '<a class="btn btn-danger" href="app.php?page=removestock&id=' . $items[$i]['itemid'] . '"><i class="fas fa-minus"></i> ' . $Strings->get("removestock", false) . '</a>';
+        } else {
+            $items[$i]["addstockbtn"] = '';
+            $items[$i]["removestockbtn"] = '';
+        }
     } else {
         $items[$i]["editbtn"] = '';
+        $items[$i]["addstockbtn"] = '';
+        $items[$i]["removestockbtn"] = '';
     }
     $items[$i]["viewbtn"] = '<a class="btn btn-info" href="app.php?page=item&id=' . $items[$i]['itemid'] . '"><i class="fas fa-eye"></i> ' . $Strings->get("view", false) . '</a>';
     if (is_null($items[$i]['userid'])) {

lib/reports.php

@@ -75,7 +75,7 @@ function getItemReport($filter = []): Report {
         $Strings->get("code 1", false),
         $Strings->get("code 2", false),
         $Strings->get("quantity", false),
-        $Strings->get("want", false),
+        $Strings->get("minwant", false),
         $Strings->get("Cost", false),
         $Strings->get("Price", false),
         $Strings->get("assigned to", false),
@@ -151,6 +151,49 @@ function getLocationReport(): Report {
     return $report;
 }
 
+function getStockReport($filter = []): Report {
+  global $database, $Strings;
+  $stock = $database->select(
+          "stock", [
+      "[>]items" => ["itemid"]
+          ], [
+      "stockid",
+      "itemid",
+      "name",
+      'timestamp',
+      'stock',
+      'stock.text1',
+      'stock.userid'
+  ]);
+  $report = new Report($Strings->get("Stock", false));
+  $report->setHeader([
+      $Strings->get("stockid", false),
+      $Strings->get("itemid", false),
+      $Strings->get("name", false),
+      $Strings->get("date", false),
+      $Strings->get("amount", false),
+      $Strings->get("description", false),
+      $Strings->get("changed by", false)
+  ]);
+  for ($i = 0; $i < count($stock); $i++) {
+      $user = "";
+      if (!is_null($stock[$i]["userid"])) {
+          $u = new User($stock[$i]["userid"]);
+          $user = $u->getName() . " (" . $u->getUsername() . ')';
+      }
+      $report->addDataRow([
+          $stock[$i]["stockid"],
+          $stock[$i]["itemid"],
+          $stock[$i]["name"],
+          $stock[$i]["timestamp"],
+          $stock[$i]["stock"],
+          $stock[$i]["text1"],
+          $user
+      ]);
+  }
+  return $report;
+}
+
 function getReport($type): Report {
         switch ($type) {
         case "item":
@@ -165,6 +208,9 @@ function getReport($type): Report {
         case "itemstock":
             return getItemReport(["AND" => ["qty[<]want", "want[>]" => 0]]);
             break;
+        case "stock":
+            return getStockReport();
+            break;
         default:
             return new Report("error", ["ERROR"], ["Invalid report type."]);
     }
@@ -173,4 +219,4 @@ function getReport($type): Report {
 function generateReport($type, $format) {
     $report = getReport($type);
     $report->output($format);
-}
+}

pages.php

@@ -24,19 +24,6 @@ define("PAGES", [
             "static/js/items.js"
         ],
     ],
-    "locations" => [
-        "title" => "Locations",
-        "navbar" => true,
-        "icon" => "fas fa-map-marker",
-        "styles" => [
-            "static/css/datatables.min.css",
-            "static/css/tables.css"
-        ],
-        "scripts" => [
-            "static/js/datatables.min.js",
-            "static/js/locations.js"
-        ],
-    ],
     "categories" => [
         "title" => "Categories",
         "navbar" => true,
@@ -50,6 +37,19 @@ define("PAGES", [
             "static/js/categories.js"
         ],
     ],
+    "locations" => [
+      "title" => "Locations",
+      "navbar" => true,
+      "icon" => "fas fa-map-marker",
+      "styles" => [
+        "static/css/datatables.min.css",
+        "static/css/tables.css"
+      ],
+      "scripts" => [
+        "static/js/datatables.min.js",
+        "static/js/locations.js"
+      ],
+    ],
     "item" => [
         "title" => "Item",
         "navbar" => false
@@ -99,5 +99,27 @@ define("PAGES", [
     ],
     "404" => [
         "title" => "404 error"
+    ],
+    "addstock" => [
+        "title" => "Add stock",
+        "navbar" => false,
+        "styles" => [
+            "static/css/easy-autocomplete.min.css"
+        ],
+        "scripts" => [
+            "static/js/jquery.easy-autocomplete.min.js",
+            "static/js/edititem.js"
+        ],
+    ],
+    "removestock" => [
+        "title" => "Remove stock",
+        "navbar" => false,
+        "styles" => [
+            "static/css/easy-autocomplete.min.css"
+        ],
+        "scripts" => [
+            "static/js/jquery.easy-autocomplete.min.js",
+            "static/js/edititem.js"
+        ],
     ]
 ]);

pages/addstock.php

@@ -0,0 +1,77 @@
+<?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+require_once __DIR__ . '/../required.php';
+
+redirectifnotloggedin();
+
+if ($database->count("locations") == 0 || $database->count("categories") == 0) {
+    header('Location: app.php?page=items&msg=noloccat');
+    die();
+}
+
+$itemdata = [
+    'text1' => '',
+    'qty' => ''];
+
+if (!empty($VARS['id'])) {
+    if ($database->has('items', ['itemid' => $VARS['id']])) {
+        $itemdata = $database->select(
+                    'items', [
+                    'name',
+                    'qty',
+                        ], [
+                    'itemid' => $VARS['id']
+                ])[0];
+    } else {
+        // item id is invalid, redirect to a page that won't cause an error when pressing Save
+        header('Location: app.php?page=addstock');
+        die();
+    }
+}
+?>
+
+<form role="form" action="action.php" method="POST">
+    <div class="card border-green">
+        <h3 class="card-header text-green">
+            <i class="fas fa-edit"></i> <?php $Strings->build("adding stock", ['item' => "<span id=\"name_title\">" . htmlspecialchars($itemdata['name']) . "</span>"]); ?>
+        </h3>
+        <div class="card-body">
+
+            <div class="row">
+                <div class="col-12 col-md-3">
+                    <div class="form-group">
+                        <label for="stock"><i class="fas fa-hashtag"></i> <?php $Strings->get('quantity'); ?></label>
+                        <input type="number" min="1" class="form-control" id="stock" name="stock" required="required" placeholder="<?php echo $itemdata['qty']; ?>" />
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-12 col-md-6">
+                    <div class="form-group">
+                        <label for="info1"><i class="fas fa-info"></i> <?php $Strings->get("Description"); ?></label>
+                        <textarea class="form-control" id="info1" name="text1" required="required"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <input type="hidden" name="itemid" value="<?php
+            echo htmlspecialchars($VARS['id']);
+        ?>" />
+        <input type="hidden" name="action" value="addstock" />
+        <?php
+        if (isset($_GET['source']) && $_GET['source'] === "item") {
+            echo '<input type="hidden" name="source" value="item" />';
+        } else {
+            echo '<input type="hidden" name="source" value="items" />';
+        }
+        ?>
+
+        <div class="card-footer d-flex">
+            <button type="submit" class="btn btn-success mr-1"><i class="fas fa-save"></i> <?php $Strings->get("save"); ?></button>
+        </div>
+    </div>
+</form>

pages/categories.php

@@ -14,9 +14,9 @@ redirectifnotloggedin();
     <thead>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-pallet hidden-sm"></i> <?php $Strings->get('category'); ?></th>
             <th data-priority="2"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('item count'); ?></th>
+            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -30,11 +30,11 @@ redirectifnotloggedin();
             ?>
             <tr>
                 <td></td>
-                <td>
-                    <a class="btn btn-primary btn-sm" href="app.php?page=editcat&id=<?php echo $cat['catid']; ?>"><i class="fas fa-edit"></i> <?php $Strings->get("edit"); ?></a>
-                </td>
                 <td><?php echo $cat['catname']; ?></td>
                 <td><?php echo $itemcount; ?></td>
+                <td>
+                  <a class="btn btn-primary btn-sm" href="app.php?page=editcat&id=<?php echo $cat['catid']; ?>"><i class="fas fa-edit"></i> <?php $Strings->get("edit"); ?></a>
+                </td>
             </tr>
             <?php
         }
@@ -43,9 +43,9 @@ redirectifnotloggedin();
     <tfoot>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-pallet hidden-sm"></i> <?php $Strings->get('category'); ?></th>
             <th data-priority="2"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('item count'); ?></th>
+            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
         </tr>
     </tfoot>
-</table>
+</table>

pages/edititem.php

@@ -164,7 +164,17 @@ if (!empty($VARS['id'])) {
                 <div class="col-12 col-md-3">
                     <div class="form-group">
                         <label for="qty"><i class="fas fa-hashtag"></i> <?php $Strings->get('quantity'); ?></label>
-                        <input type="number" class="form-control" id="qty" name="qty" placeholder="1" value="<?php echo $itemdata['qty']; ?>" />
+                        <?php
+                        if ($SETTINGS['stock_management'] && $editing && !$cloning) {
+                            ?>
+                            <input type="text" class="form-control" id="qty" name="qty" readonly value="<?php echo $itemdata['qty']; ?>" />
+                            <?php
+                        } else {
+                            ?>
+                            <input type="number" class="form-control" id="qty" name="qty" placeholder="1" value="<?php echo $itemdata['qty']; ?>" />
+                            <?php
+                        }
+                        ?>
                     </div>
                 </div>
                 <div class="col-12 col-md-3">
@@ -263,4 +273,4 @@ if (!empty($VARS['id'])) {
             ?>
         </div>
     </div>
-</form>
+</form>

pages/export.php

@@ -16,6 +16,13 @@ redirectifnotloggedin();
                     <div class="form-group">
                         <label for="type"><?php $Strings->get("report type"); ?></label>
                         <select name="type" class="form-control" required>
+                            <?php
+                            if ($SETTINGS['stock_management']) {
+                            ?>
+                                <option value="stock"><?php $Strings->get("Stock") ?></option>
+                                <?php
+                            }
+                            ?>
                             <option value="item"><?php $Strings->get("Items") ?></option>
                             <option value="category"><?php $Strings->get("Categories") ?></option>
                             <option value="location"><?php $Strings->get("Locations") ?></option>
@@ -46,4 +53,4 @@ redirectifnotloggedin();
             <button type="submit" class="btn btn-success ml-auto" id="genrptbtn"><i class="fas fa-download"></i> <?php $Strings->get("generate report"); ?></button>
         </div>
     </form>
-</div>
+</div>

pages/item.php

@@ -169,5 +169,49 @@ $item = $database->get(
             }
             ?>
         </div>
+        <?php
+        if ($SETTINGS['stock_management']) {
+        ?>
+            <hr />
+
+            <div class="row mt-4 mx-0">
+              <table id="stocktable" class="table table-bordered table-hover table-sm">
+                  <thead>
+                      <tr>
+                          <th data-priority="1"><i class="fas fa-fw fa-calendar d-none d-md-inline"></i> <?php $Strings->get('date'); ?></th>
+                          <th data-priority="2"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php $Strings->get('amount'); ?></th>
+                          <th data-priority="3"><i class="fas fa-fw fa-sticky-note d-none d-md-inline"></i> <?php $Strings->get('description'); ?></th>
+                          <th data-priority="4"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php $Strings->get('changed by'); ?></th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                      <?php
+                      $stockentries = $database->select('stock', [
+                          'timestamp',
+                          'stock',
+                          'text1',
+                          'userid'
+                      ], [
+                          'itemid' => $item['itemid']
+                      ]
+                      );
+                      foreach ($stockentries as $stockentry) {
+                          $user = new User($stockentry['userid'])
+                          ?>
+                          <tr>
+                              <td><?php echo $stockentry['timestamp']; ?></td>
+                              <td><?php echo $stockentry['stock']; ?></td>
+                              <td><?php echo $stockentry['text1']; ?></td>
+                              <td><?php echo $user->getName() . " (" .  $user->getUsername() . ")"; ?></td>
+                          </tr>
+                          <?php
+                      }
+                      ?>
+                  </tbody>
+              </table>
+            </div>
+            <?php
+        }
+        ?>
     </div>
-</div>
+</div>

pages/items.php

@@ -24,7 +24,6 @@ redirectifnotloggedin();
     <thead>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php $Strings->get('name'); ?></th>
             <th data-priority="7"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php $Strings->get('category'); ?></th>
             <th data-priority="4"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php $Strings->get('location'); ?></th>
@@ -33,6 +32,7 @@ redirectifnotloggedin();
             <th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php $Strings->get('qty'); ?></th>
             <th data-priority="6"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php $Strings->get('want'); ?></th>
             <th data-priority="8"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php $Strings->get('assigned to'); ?></th>
+            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -40,7 +40,6 @@ redirectifnotloggedin();
     <tfoot>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php $Strings->get('name'); ?></th>
             <th data-priority="7"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php $Strings->get('category'); ?></th>
             <th data-priority="4"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php $Strings->get('location'); ?></th>
@@ -49,6 +48,7 @@ redirectifnotloggedin();
             <th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php $Strings->get('qty'); ?></th>
             <th data-priority="6"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php $Strings->get('want'); ?></th>
             <th data-priority="8"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php $Strings->get('assigned to'); ?></th>
+            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
         </tr>
     </tfoot>
 </table>

pages/locations.php

@@ -15,10 +15,10 @@ redirectifnotloggedin();
     <thead>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-map-marker"></i> <?php $Strings->get('location'); ?></th>
             <th data-priority="2"><i class="fas fa-barcode"></i> <?php $Strings->get('code'); ?></th>
             <th data-priority="3"><i class="fas fa-hashtag"></i> <?php $Strings->get('item count'); ?></th>
+            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -33,12 +33,12 @@ redirectifnotloggedin();
             ?>
             <tr>
                 <td></td>
-                <td>
-                    <a class="btn btn-primary btn-sm" href="app.php?page=editloc&id=<?php echo $loc['locid']; ?>"><i class="fas fa-edit"></i> <?php $Strings->get("edit"); ?></a>
-                </td>
                 <td><?php echo $loc['locname']; ?></td>
                 <td><?php echo $loc['loccode']; ?></td>
                 <td><?php echo $itemcount; ?></td>
+                <td>
+                  <a class="btn btn-primary btn-sm" href="app.php?page=editloc&id=<?php echo $loc['locid']; ?>"><i class="fas fa-edit"></i> <?php $Strings->get("edit"); ?></a>
+                </td>
             </tr>
             <?php
         }
@@ -47,10 +47,10 @@ redirectifnotloggedin();
     <tfoot>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-map-marker"></i> <?php $Strings->get('location'); ?></th>
             <th data-priority="2"><i class="fas fa-barcode"></i> <?php $Strings->get('code'); ?></th>
             <th data-priority="3"><i class="fas fa-hashtag"></i> <?php $Strings->get('item count'); ?></th>
+            <th data-priority="1"><?php $Strings->get('actions'); ?></th>
         </tr>
     </tfoot>
-</table>
+</table>

pages/removestock.php

@@ -0,0 +1,77 @@
+<?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+require_once __DIR__ . '/../required.php';
+
+redirectifnotloggedin();
+
+if ($database->count("locations") == 0 || $database->count("categories") == 0) {
+    header('Location: app.php?page=items&msg=noloccat');
+    die();
+}
+
+$itemdata = [
+    'text1' => '',
+    'qty' => ''];
+
+if (!empty($VARS['id'])) {
+    if ($database->has('items', ['itemid' => $VARS['id']])) {
+        $itemdata = $database->select(
+                    'items', [
+                    'name',
+                    'qty',
+                        ], [
+                    'itemid' => $VARS['id']
+                ])[0];
+    } else {
+        // item id is invalid, redirect to a page that won't cause an error when pressing Save
+        header('Location: app.php?page=removestock');
+        die();
+    }
+}
+?>
+
+<form role="form" action="action.php" method="POST">
+    <div class="card border-green">
+        <h3 class="card-header text-green">
+            <i class="fas fa-edit"></i> <?php $Strings->build("removing stock", ['item' => "<span id=\"name_title\">" . htmlspecialchars($itemdata['name']) . "</span>"]); ?>
+        </h3>
+        <div class="card-body">
+
+            <div class="row">
+                <div class="col-12 col-md-3">
+                    <div class="form-group">
+                        <label for="stock"><i class="fas fa-hashtag"></i> <?php $Strings->get('quantity'); ?></label>
+                        <input type="number" min="1" class="form-control" id="stock" name="stock" required="required" placeholder="<?php echo $itemdata['qty']; ?>" />
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-12 col-md-6">
+                    <div class="form-group">
+                        <label for="info1"><i class="fas fa-info"></i> <?php $Strings->get("Description"); ?></label>
+                        <textarea class="form-control" id="info1" name="text1" required="required"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <input type="hidden" name="itemid" value="<?php
+            echo htmlspecialchars($VARS['id']);
+        ?>" />
+        <input type="hidden" name="action" value="removestock" />
+        <?php
+        if (isset($_GET['source']) && $_GET['source'] === "item") {
+            echo '<input type="hidden" name="source" value="item" />';
+        } else {
+            echo '<input type="hidden" name="source" value="items" />';
+        }
+        ?>
+
+        <div class="card-footer d-flex">
+            <button type="submit" class="btn btn-success mr-1"><i class="fas fa-save"></i> <?php $Strings->get("save"); ?></button>
+        </div>
+    </div>
+</form>

settings.template.php

@@ -56,5 +56,7 @@ $SETTINGS = [
     // Base URL for building links relative to the location of the app.
     // Only used when there's no good context for the path.
     // The default is almost definitely fine.
-    "url" => "."
+    "url" => ".",
+    // Enable stock management mode.
+    "stock_management" => false,
 ];

static/js/categories.js

@@ -24,11 +24,11 @@ $('#cattable').DataTable({
             orderable: false
         },
         {
-            targets: 1,
+            targets: 3,
             orderable: false
         }
     ],
     order: [
-        [2, 'asc']
+        [1, 'asc']
     ]
-});
+});

static/js/items.js

@@ -24,16 +24,16 @@ var itemtable = $('#itemtable').DataTable({
             orderable: false
         },
         {
-            targets: 1,
+            targets: 8,
             orderable: false
         },
         {
-            targets: 8,
+            targets: 9,
             orderable: false
         }
     ],
     order: [
-        [2, 'asc']
+        [1, 'asc']
     ],
     serverSide: true,
     ajax: {
@@ -49,7 +49,6 @@ var itemtable = $('#itemtable').DataTable({
             json.items.forEach(function (row) {
                 json.data.push([
                     "",
-                    "<span class='btn-group-vertical btn-group-sm'>" + row.viewbtn + " " + row.editbtn + "</span>",
                     row.name,
                     row.catname,
                     row.locname + " (" + row.loccode + ")",
@@ -57,7 +56,8 @@ var itemtable = $('#itemtable').DataTable({
                     row.code2,
                     row.qty,
                     row.want,
-                    row.username
+                    row.username,
+                    "<span class='btn-group btn-group-sm'>" + row.viewbtn + " " + row.editbtn + " " + row.addstockbtn + " " + row.removestockbtn + "</span>"
                 ]);
             });
             return JSON.stringify(json);
@@ -74,4 +74,4 @@ $(document).ready(function () {
         $(searchInput).trigger("input");
         $(searchInput).trigger("change");
     }
-});
+});

static/js/locations.js

@@ -24,11 +24,11 @@ $('#loctable').DataTable({
             orderable: false
         },
         {
-            targets: 1,
+            targets: 4,
             orderable: false
         }
     ],
     order: [
-        [2, 'asc']
+        [1, 'asc']
     ]
-});
+});