From 1f9d6ee9405dcd205965a30025d7f2f527872453 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Tue, 29 Jan 2019 18:07:30 -0600
Subject: [PATCH] solo falta actualizacion de base de datos toner

---
 .idea/workspace.xml                           | 371 ++++++++++--------
 sitio/admin/busqueda_p.php                    |   7 +-
 sitio/admin/busqueda_t.php                    |   2 +-
 ...{actualizacion.php => actualizacion_p.php} |   1 -
 sitio/admin/solicitud/spapel.php              |   7 +-
 sitio/admin/solicitud/stoner.php              |   7 +
 .../usuario/{busqueda.php => busqueda_p.php}  |   8 +-
 sitio/usuario/busqueda_t.php                  |  53 +++
 .../usuario/js/{busqueda.js => busqueda_p.js} |  11 +-
 sitio/usuario/js/busqueda_t.js                |  28 ++
 ...{actualizacion.php => actualizacion_p.php} |   2 +-
 sitio/usuario/solicitud/spapel.php            |   9 +-
 sitio/usuario/solicitud/stoner.php            |   7 +
 sitio/usuario/usuario.php                     |  14 +-
 14 files changed, 334 insertions(+), 193 deletions(-)
 rename sitio/admin/solicitud/{actualizacion.php => actualizacion_p.php} (99%)
 create mode 100644 sitio/admin/solicitud/stoner.php
 rename sitio/usuario/{busqueda.php => busqueda_p.php} (91%)
 create mode 100644 sitio/usuario/busqueda_t.php
 rename sitio/usuario/js/{busqueda.js => busqueda_p.js} (74%)
 create mode 100644 sitio/usuario/js/busqueda_t.js
 rename sitio/usuario/solicitud/{actualizacion.php => actualizacion_p.php} (98%)
 create mode 100644 sitio/usuario/solicitud/stoner.php

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b53ecdb..338acc9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sitio/usuario/js/busqueda_t.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sitio/admin/busqueda_p.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_p.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/usuario/busqueda.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/busqueda_p.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/js/busqueda_p.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion_p.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sitio/usuario/usuario.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/usuario.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -32,20 +45,40 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="85" column="18" lean-forward="true" selection-start-line="85" selection-start-column="18" selection-end-line="85" selection-end-column="18" />
+            <state>
+              <caret line="95" column="27" selection-start-line="95" selection-start-column="27" selection-end-line="95" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_p.php">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="9" column="44" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
-              <folding>
-                <element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="205">
+              <caret line="40" column="3" selection-start-line="40" selection-start-column="3" selection-end-line="40" selection-end-column="3" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_t.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="456">
+              <caret line="31" column="45" selection-start-line="31" selection-start-column="45" selection-end-line="31" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/conexion.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="66">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
@@ -53,26 +86,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="616">
-              <caret line="28" column="2" lean-forward="true" selection-start-line="28" selection-start-column="2" selection-end-line="28" selection-end-column="2" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/conexion.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
+            <state relative-caret-position="858">
+              <caret line="39" column="82" selection-start-line="39" selection-start-column="82" selection-end-line="39" selection-end-column="82" />
             </state>
           </provider>
         </entry>
@@ -123,24 +138,29 @@
         <option value="$PROJECT_DIR$/sitio/admin/spapel.php" />
         <option value="$PROJECT_DIR$/login.php" />
         <option value="$PROJECT_DIR$/sitio/usuario/alta.php" />
-        <option value="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" />
-        <option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
-        <option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
-        <option value="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php" />
         <option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php" />
         <option value="$PROJECT_DIR$/sitio/usuario/busqueda.php" />
-        <option value="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" />
         <option value="$PROJECT_DIR$/footer.php" />
         <option value="$PROJECT_DIR$/mysql/procedures.sql" />
         <option value="$PROJECT_DIR$/sitio/admin/php/busqueda.php" />
         <option value="$PROJECT_DIR$/sitio/admin/js/busqueda.js" />
         <option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
         <option value="$PROJECT_DIR$/sitio/admin/admin.php" />
-        <option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
         <option value="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" />
         <option value="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" />
-        <option value="$PROJECT_DIR$/conexion.php" />
+        <option value="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" />
+        <option value="$PROJECT_DIR$/sitio/usuario/busqueda_p.php" />
+        <option value="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php" />
+        <option value="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" />
         <option value="$PROJECT_DIR$/sitio/admin/busqueda_p.php" />
+        <option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
+        <option value="$PROJECT_DIR$/sitio/usuario/js/busqueda_p.js" />
+        <option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
+        <option value="$PROJECT_DIR$/sitio/usuario/js/busqueda_t.js" />
+        <option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php" />
+        <option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
+        <option value="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" />
+        <option value="$PROJECT_DIR$/conexion.php" />
       </list>
     </option>
   </component>
@@ -151,10 +171,10 @@
     <auto-save>true</auto-save>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1297" />
-    <option name="y" value="-16" />
-    <option name="width" value="1278" />
-    <option name="height" value="743" />
+    <option name="x" value="1443" />
+    <option name="y" value="-23" />
+    <option name="width" value="1248" />
+    <option name="height" value="1044" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -173,6 +193,32 @@
               <item name="Inventario" type="462c0819:PsiDirectoryNode" />
               <item name="sitio" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Inventario" type="462c0819:PsiDirectoryNode" />
+              <item name="sitio" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Inventario" type="462c0819:PsiDirectoryNode" />
+              <item name="sitio" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="solicitud" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Inventario" type="462c0819:PsiDirectoryNode" />
+              <item name="sitio" type="462c0819:PsiDirectoryNode" />
+              <item name="usuario" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Inventario" type="462c0819:PsiDirectoryNode" />
+              <item name="sitio" type="462c0819:PsiDirectoryNode" />
+              <item name="usuario" type="462c0819:PsiDirectoryNode" />
+              <item name="solicitud" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -189,6 +235,9 @@
     <property name="settings.editor.selected.configurable" value="SQL Dialects" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\xampp\htdocs\Inventario\sitio\usuario" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\xampp\htdocs\Inventario\sitio\admin" />
       <recent name="C:\xampp\htdocs\Inventario\sitio\admin\php" />
@@ -196,9 +245,6 @@
       <recent name="C:\xampp\htdocs\Inventario\sitio\admin\js" />
       <recent name="C:\xampp\htdocs\inventario" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\xampp\htdocs\Inventario\sitio\usuario" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -239,19 +285,22 @@
       <workItem from="1548112972692" duration="10036000" />
       <workItem from="1548189496599" duration="4023000" />
       <workItem from="1548276662999" duration="16891000" />
-      <workItem from="1548350597375" duration="17117000" />
+      <workItem from="1548350597375" duration="17969000" />
+      <workItem from="1548442486112" duration="10568000" />
+      <workItem from="1548805530548" duration="295000" />
+      <workItem from="1548805926584" duration="523000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="151197000" />
+    <option name="totallyTimeSpent" value="163435000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Favorites" order="0" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.16262136" />
+      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.17071198" />
       <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="0" weight="0.3295325" />
       <window_info anchor="bottom" id="Database Changes" order="1" show_stripe_button="false" />
@@ -294,13 +343,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../../base/node_modules/sshpk/lib/formats/openssh-cert.js" />
-    <entry file="file://$PROJECT_DIR$/destroy.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="10" column="34" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/estilos.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1012">
@@ -325,56 +367,7 @@
     <entry file="file://$PROJECT_DIR$/sitio/usuario/js/secciones.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/usuario/js/busqueda.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/spapel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
-          <folding>
-            <element signature="n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#div#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#select#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#div#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#select#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#div#2;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sitio/usuario/alta.php" />
-    <entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="969">
-          <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="588">
-          <caret line="35" column="4" lean-forward="true" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="35" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/header.php">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -403,39 +396,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1261">
-          <caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
-          <folding>
-            <element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#4;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#5;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#3;n#tr#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mysql/procedures.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sitio/admin/js/secciones.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
@@ -443,50 +403,133 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
+    <entry file="file://$PROJECT_DIR$/destroy.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+        <state relative-caret-position="110">
+          <caret line="10" column="34" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="28" column="2" lean-forward="true" selection-start-line="28" selection-start-column="2" selection-end-line="28" selection-end-column="2" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/stoner.php">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion_p.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="85" column="18" lean-forward="true" selection-start-line="85" selection-start-column="18" selection-end-line="85" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/conexion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
+        <state relative-caret-position="353">
+          <caret line="48" selection-start-line="48" selection-end-line="48" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_p.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="9" column="44" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
+        <state relative-caret-position="463">
+          <caret line="38" column="17" lean-forward="true" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="17" />
           <folding>
-            <element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="75" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/spapel.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1275">
+          <caret line="79" column="4" selection-start-line="79" selection-start-column="4" selection-end-line="79" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_p.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="39" column="5" lean-forward="true" selection-start-line="39" selection-start-column="5" selection-end-line="39" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/js/busqueda_t.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="594">
+          <caret line="27" column="3" lean-forward="true" selection-start-line="27" selection-start-column="3" selection-end-line="27" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="40" lean-forward="true" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="529">
+          <caret line="89" column="32" selection-start-line="89" selection-start-column="32" selection-end-line="89" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/js/busqueda_p.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="23" column="27" selection-start-line="23" selection-start-column="27" selection-end-line="23" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="33" column="19" lean-forward="true" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="95" column="27" selection-start-line="95" selection-start-column="27" selection-end-line="95" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="858">
+          <caret line="39" column="82" selection-start-line="39" selection-start-column="82" selection-end-line="39" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="205">
+          <caret line="40" column="3" selection-start-line="40" selection-start-column="3" selection-end-line="40" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mysql/procedures.sql">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_t.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="31" column="45" selection-start-line="31" selection-start-column="45" selection-end-line="31" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conexion.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/sitio/admin/busqueda_p.php b/sitio/admin/busqueda_p.php
index bf87f48..7d9b433 100644
--- a/sitio/admin/busqueda_p.php
+++ b/sitio/admin/busqueda_p.php
@@ -7,13 +7,12 @@ require "../../conexion.php";
 
 
     $salida = "";
-    $query = "CALL sp_despliega_papel('');";
+    $query = "CALL st_despliega_papel('');";
     if(isset($_POST['consulta'])){
         $q = $mysqli->real_escape_string($_POST['consulta']);
-        $query = "CALL sp_despliega_papel('%$q%');";
+        $query = "CALL st_despliega_papel('%$q%');";
     }
     $resultado = $mysqli->query($query);
-
     if($resultado->num_rows > 0){
             $salida.="<table class='tabla_datos table'>
                             <thead class='table-primary'>
@@ -35,7 +34,7 @@ require "../../conexion.php";
                               <td style=\"text-align:center;\">".$fila['marca']."</td>
                               <td style=\"text-align:center;\">".$fila['descripcion']."</td>
                               <td style=\"text-align:center;\">".$fila['existencia']."</td>
-                              <td style=\"text-align:center;\"> <a href='solicitud/spapel.php?id=".$fila['id_papel']."'>Solicitar</a></td>
+                              <td style=\"text-align:center;\"> <a href='solicitud/spapel.php?id=".$fila['concepto']."'>Solicitar</a></td>
                          <tr>";
                 }
 
diff --git a/sitio/admin/busqueda_t.php b/sitio/admin/busqueda_t.php
index 6e8d5fb..e4f493b 100644
--- a/sitio/admin/busqueda_t.php
+++ b/sitio/admin/busqueda_t.php
@@ -37,7 +37,7 @@ if($resultado->num_rows > 0){
                               <td style=\"text-align:center;\">".$fila['color']."</td>
                               <td style=\"text-align:center;\">".$fila['modelo']."</td>
                               <td style=\"text-align:center;\">".$fila['clave']."</td>
-                              <td style=\"text-align:center;\">".$fila['cantidad']."</td>
+                              <td style=\"text-align:center;\">".$fila['existencia']."</td>
                               <td style=\"text-align:center;\"> <a href='solicitud/stoner.php?id=".$fila['id_impresora_inventario']."'>Solicitar</a></td>
                               
                          <tr>";
diff --git a/sitio/admin/solicitud/actualizacion.php b/sitio/admin/solicitud/actualizacion_p.php
similarity index 99%
rename from sitio/admin/solicitud/actualizacion.php
rename to sitio/admin/solicitud/actualizacion_p.php
index f0e1c20..009ed82 100644
--- a/sitio/admin/solicitud/actualizacion.php
+++ b/sitio/admin/solicitud/actualizacion_p.php
@@ -30,7 +30,6 @@
 
     $q = "INSERT INTO papel_salida(id_papel_salida,fecha_salida,cantidad,periodo,fecha_registro,cat_id_papel, cat_id_usuario)
               VALUES( NULL, '${fecha_usuario}', {$cantidad}, '{$periodo}', '{$fecha_movimiento}', {$id_papel}, {$id_usuario})";
-    echo $q;
     $insert = $mysqli->prepare($q);
     $insert->execute();
     $insert->close();
diff --git a/sitio/admin/solicitud/spapel.php b/sitio/admin/solicitud/spapel.php
index da7c4fe..b9bfe19 100644
--- a/sitio/admin/solicitud/spapel.php
+++ b/sitio/admin/solicitud/spapel.php
@@ -74,11 +74,10 @@ include("../../../conexion.php");
 <?php
     date_default_timezone_set('America/Mexico_City');
     $fecha = date("Y-m-d H:i:s");
-    $id=$_REQUEST['id'];
-    $query = "SELECT * FROM cat_papel WHERE id_papel ='$id'";
+    $concepto=$_REQUEST['id'];
+    $query = "CALL st_despliega_papel('$concepto')";
     $resultado = $mysqli->query($query) or die($mysqli->error);
     $row = $resultado->fetch_assoc() ;
-    //print_r($row);
 
 ?>
 <div class="wrap">
@@ -106,7 +105,7 @@ include("../../../conexion.php");
     </table>
     <br>
 
-    <form action="actualizacion.php" method="POST">
+    <form action="actualizacion_p.php" method="POST">
     <div class="input-group mb-3" style="width: 20%; ">
         <div class="input-group-prepend">
             <label class="input-group-text" for="inputGroupSelect01">Periodo</label>
diff --git a/sitio/admin/solicitud/stoner.php b/sitio/admin/solicitud/stoner.php
new file mode 100644
index 0000000..38688b9
--- /dev/null
+++ b/sitio/admin/solicitud/stoner.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Gabriel Fuentes
+ * Date: 24/01/2019
+ * Time: 07:44 PM
+ */
\ No newline at end of file
diff --git a/sitio/usuario/busqueda.php b/sitio/usuario/busqueda_p.php
similarity index 91%
rename from sitio/usuario/busqueda.php
rename to sitio/usuario/busqueda_p.php
index 648988f..7abbd3f 100644
--- a/sitio/usuario/busqueda.php
+++ b/sitio/usuario/busqueda_p.php
@@ -7,13 +7,13 @@ if($mysqli->connect_error){
 
 
 $salida = "";
-$query = "CALL sp_despliega_papel;";
+$query = "CALL st_despliega_papel('');";
 if(isset($_POST['consulta'])){
     $q = $mysqli->real_escape_string($_POST['consulta']);
-    $query = "CALL sp_busqueda('%$q%');";
+    $query = "CALL st_despliega_papel('%$q%');";
 }
-
 $resultado = $mysqli->query($query);
+
 if($resultado->num_rows > 0){
     $salida.="<table class='tabla_datos table'>
                             <thead class='table-primary'>
@@ -35,7 +35,7 @@ if($resultado->num_rows > 0){
                               <td style=\"text-align:center;\">".$fila['marca']."</td>
                               <td style=\"text-align:center;\">".$fila['descripcion']."</td>
                               <td style=\"text-align:center;\">".$fila['existencia']."</td>
-                              <td style=\"text-align:center;\"> <a href='solicitud/spapel.php?id=".$fila['id_papel']."'>Solicitar</a></td>
+                              <td style=\"text-align:center;\"> <a href='solicitud/spapel.php?id=".$fila['concepto']."'>Solicitar</a></td>
                          <tr>";
     }
 
diff --git a/sitio/usuario/busqueda_t.php b/sitio/usuario/busqueda_t.php
new file mode 100644
index 0000000..1ea0798
--- /dev/null
+++ b/sitio/usuario/busqueda_t.php
@@ -0,0 +1,53 @@
+<?php
+session_start();
+require "../../conexion.php";
+if($mysqli->connect_error){
+    die("Conexión fallida: ".$mysqli->connect_error);
+}
+
+
+$salida = "";
+$query = "CALL st_muestra_toner('');";
+if(isset($_POST['consulta'])){
+    $q = $mysqli->real_escape_string($_POST['consulta']);
+    $query = "CALL st_muestra_toner('%$q%');";
+}
+
+$resultado  = $mysqli->query($query);
+
+if($resultado->num_rows > 0){
+    $salida.="<table class='tabla_datos table'>
+                            <thead class='table-primary'>
+                                <tr>
+                                    <td style=\"text-align:center;\">Impresora</td>
+                                    <td style=\"text-align:center;\">Inventario</td>
+                                    <td style=\"text-align:center;\">Color</td>
+                                    <td style=\"text-align:center;\">Modelo</td>
+                                    <td style=\"text-align:center;\">Clave</td>
+                                    <td style=\"text-align:center;\">Existencia</td>
+                                    <td style=\"text-align:center;\">Operacion</td>
+                                </tr>
+                            </thead>
+                            </tbody>";
+    while($fila = $resultado->fetch_assoc()){
+        $salida.="<tr>
+                              <td>".$fila['impresora']."</td>
+                              <td style=\"text-align:center;\">".$fila['inventario']."</td>
+                              <td style=\"text-align:center;\">".$fila['color']."</td>
+                              <td style=\"text-align:center;\">".$fila['modelo']."</td>
+                              <td style=\"text-align:center;\">".$fila['clave']."</td>
+                              <td style=\"text-align:center;\">".$fila['existencia']."</td>
+                              <td style=\"text-align:center;\"> <a href='solicitud/stoner.php?id=".$fila['id_impresora_inventario']."'>Solicitar</a></td>
+                              
+                         <tr>";
+    }
+
+    $salida.="</tbody></table>";
+
+}
+else{
+    $salida.= "No hay datos que coincidan con tu busqueda";
+}
+echo $salida;
+$mysqli->close();
+?>
\ No newline at end of file
diff --git a/sitio/usuario/js/busqueda.js b/sitio/usuario/js/busqueda_p.js
similarity index 74%
rename from sitio/usuario/js/busqueda.js
rename to sitio/usuario/js/busqueda_p.js
index 3b55972..e1ecfbc 100644
--- a/sitio/usuario/js/busqueda.js
+++ b/sitio/usuario/js/busqueda_p.js
@@ -1,7 +1,5 @@
-$(buscar_datos());
-console.log("corre");
-
-function buscar_datos(consulta){
+$(buscar_datos_p());
+function buscar_datos_p(consulta){
     $.ajax({
         url: 'busqueda_p.php',
         type: 'POST',
@@ -22,8 +20,9 @@ function buscar_datos(consulta){
 $(document).on('keyup','#caja_busqueda', function(){
     var valor = $(this).val();
     if (valor != "") {
-        buscar_datos(valor);
+        buscar_datos_p(valor);
+        console.log(valor);
     }else{
-        buscar_datos();
+        buscar_datos_p();
     }
 });
\ No newline at end of file
diff --git a/sitio/usuario/js/busqueda_t.js b/sitio/usuario/js/busqueda_t.js
new file mode 100644
index 0000000..8404394
--- /dev/null
+++ b/sitio/usuario/js/busqueda_t.js
@@ -0,0 +1,28 @@
+$(buscar_datos());
+
+function buscar_datos(consulta){
+    $.ajax({
+        url: 'busqueda_t.php',
+        type: 'POST',
+        dataType: 'html',
+        data: {consulta: consulta},
+    })
+        .done(function (respuesta) {
+            $('#datos_t').html(respuesta);
+
+        })
+
+        .fail(function () {
+            console.log("error");
+        })
+
+}
+
+$(document).on('keyup','#caja_busqueda_t', function(){
+    var valor = $(this).val();
+    if (valor != "") {
+        buscar_datos(valor);
+    }else{
+        buscar_datos();
+    }
+});
\ No newline at end of file
diff --git a/sitio/usuario/solicitud/actualizacion.php b/sitio/usuario/solicitud/actualizacion_p.php
similarity index 98%
rename from sitio/usuario/solicitud/actualizacion.php
rename to sitio/usuario/solicitud/actualizacion_p.php
index 491c407..a1afc18 100644
--- a/sitio/usuario/solicitud/actualizacion.php
+++ b/sitio/usuario/solicitud/actualizacion_p.php
@@ -46,7 +46,7 @@
     $update->execute();
     $update->close();
 
-//header("Location: ../usuario.php");
+header("Location: ../usuario.php");
 
 
 /*
diff --git a/sitio/usuario/solicitud/spapel.php b/sitio/usuario/solicitud/spapel.php
index f05170f..c8cb12c 100644
--- a/sitio/usuario/solicitud/spapel.php
+++ b/sitio/usuario/solicitud/spapel.php
@@ -52,7 +52,7 @@ include("../../../conexion.php");
             <ul class="navbar-nav mr-auto">
 
                 <li class="nav-item dropdown my-2 mr-3">
-                    <a class="nav-link-white" href="../admin.php" role="button" >
+                    <a class="nav-link-white" href="../usuario.php" role="button" >
                         Stock
                     </a>
                 </li>
@@ -70,11 +70,10 @@ include("../../../conexion.php");
 <?php
 date_default_timezone_set('America/Mexico_City');
 $fecha = date("Y-m-d H:i:s");
-$id=$_REQUEST['id'];
-$query = "SELECT * FROM cat_papel WHERE id_papel ='$id'";
+$concepto=$_REQUEST['id'];
+$query = "CALL st_despliega_papel('$concepto')";
 $resultado = $mysqli->query($query) or die($mysqli->error);
 $row = $resultado->fetch_assoc() ;
-//print_r($row);
 ?>
 <div class="wrap">
     <h1 style="margin-left:40%; margin-bottom: 5%;">Solicitud</h1>
@@ -101,7 +100,7 @@ $row = $resultado->fetch_assoc() ;
     </table>
     <br>
 
-    <form action="actualizacion.php" method="POST">
+    <form action="actualizacion_p.php" method="POST">
         <div class="input-group mb-3" style="width: 20%; ">
             <div class="input-group-prepend">
                 <label class="input-group-text" for="inputGroupSelect01">Periodo</label>
diff --git a/sitio/usuario/solicitud/stoner.php b/sitio/usuario/solicitud/stoner.php
new file mode 100644
index 0000000..5a79eb3
--- /dev/null
+++ b/sitio/usuario/solicitud/stoner.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Gabriel Fuentes
+ * Date: 29/01/2019
+ * Time: 06:00 PM
+ */
\ No newline at end of file
diff --git a/sitio/usuario/usuario.php b/sitio/usuario/usuario.php
index 93dcf24..2ef34d6 100644
--- a/sitio/usuario/usuario.php
+++ b/sitio/usuario/usuario.php
@@ -82,11 +82,18 @@
 
 
             <article id="tab2">
-                <h1>Nosotros</h1>
+                <div class="form-1-2">
+                    <input placeholder="Buscar..." style="width: 30%;" class="form-control" type="text" name="caja_busqueda_t" id="caja_busqueda_t">
+                </div>
+                <br>
+
+                <div id="datos_t">
+                </div>
+
             </article>
 
 
-            <article id="tab3">x
+            <article id="tab3">
                 <h1>Servicios</h1>
             </article>
 
@@ -120,7 +127,8 @@
     <script src="../../js/jquery-3.3.1.min.js"></script>
     <script src="../../js/main.js"></script>
     <script src="js/secciones.js"></script>
-    <script src="js/busqueda.js"></script>
+    <script src="js/busqueda_p.js"></script>
+    <script src="js/busqueda_t.js"></script>
 
 </body>
 </html>
\ No newline at end of file