--merge cat sessiones

2025-04-09 02:37:57 -07:00
parent 6bc8e4863e 5f99bce007
commit 53939b70fd
39 changed files with 3244 additions and 1227 deletions
--- a/Sistemas/CatSesiones.aspx
+++ b/Sistemas/CatSesiones.aspx
@@ -67,7 +67,11 @@
        <asp:ListItem Text="GlobalDTAC" Value="GlobalDTAC"></asp:ListItem> 
        <asp:ListItem Text="GlobalDTSATUsosCFDI" Value="GlobalDTSATUsosCFDI"></asp:ListItem> 
        <asp:ListItem Text="GlobalDTVtaCondicionesEntrega" Value="GlobalDTVtaCondicionesEntrega"></asp:ListItem> 
+<<<<<<< HEAD
          <asp:ListItem Text="GlobalDTTipoVenta" Value="GlobalDTTipoVenta"></asp:ListItem> 
+=======
+        <asp:ListItem Text="GlobalDTDIOTTipoOperacion" Value="GlobalDTDIOTTipoOperacion"></asp:ListItem> 
+>>>>>>> 5f99bce007430083b8e29bf39512f4aa4b51efae
       

    </asp:DropDownList>&nbsp;&nbsp;