Commit Graph

31 Commits

Author SHA1 Message Date
Jonathan d6df9ed38e #10639 new datepicker style and filters 2023-07-05 14:38:59 +02:00
Miguel Angel Rasteu 6a161a1af8 Merge branch 'develop' into 'ent-11474-inventario-all-no-se-muestra-en-metaconsola'
# Conflicts:
#   pandora_console/include/functions_inventory.php
2023-07-03 07:44:19 +00:00
Rafael Ameijeiras 9b1e413fcc Merge branch 'ent-11560-item-de-inventory-en-informes-funciona-mal-en-meta-y-nodo' into 'develop'
Ent 11560 item de inventory en informes funciona mal en meta y nodo

See merge request artica/pandorafms!6127
2023-06-27 11:21:52 +00:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
2023-06-22 13:24:47 +00:00
miguel angel rasteu 76346daf11 #11579 Fix inventory 2023-06-20 11:00:09 +02:00
miguel angel rasteu 40dfca0ea6 #11560 Fix reporting inventory 2023-06-16 11:19:56 +02:00
miguel angel rasteu 377b25f823 #11579 Fix inventory table 2023-06-15 10:22:05 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu 0ca464846d #11474 Fix metaconsole inventory 2023-06-07 11:23:12 +02:00
Rafael Ameijeiras ea24cc8f1b Merge branch 'ent-10851-problemas-con-fechas-en-el-inventario' into 'develop'
Ent 10851 problemas con fechas en el inventario

See merge request artica/pandorafms!5729
2023-05-31 11:15:05 +00:00
miguel angel rasteu 6d84353778 #10851 Fix id agent and delete hd 2023-05-30 14:09:32 +02:00
miguel angel rasteu cf843eba7a #10851 Fix order by agent foreach 2023-05-30 11:47:34 +02:00
miguel angel rasteu 0c180f7ed3 #11371 Fix inner join error and fix data array 2023-05-26 09:59:08 +02:00
miguel angel rasteu bd453ea1de #10851 Fix inventory date filter and last update query 2023-05-26 08:36:56 +02:00
miguel angel rasteu cccb03010c #10851 change date order to asc and fix sql query 2023-05-25 10:30:34 +02:00
miguel angel rasteu ef20ab00dd Update get_data_basic_info_sql to order by more filters 2023-05-11 11:10:13 +02:00
miguel angel rasteu 9da8e83633 Modified the timestamp according to input data. Added query with the timestamp of the filter. 2023-04-18 09:52:59 +02:00
Jonathan 7d9fb5c77a #10730 Regular expresion inventory reports 2023-04-13 10:42:37 +02:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
Calvo 764823c93f Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-04-03 10:25:58 +02:00
Calvo 307057f934 Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-03-30 15:29:55 +02:00
daniel 27e13c26c6 fixed styles 2023-03-30 11:40:32 +02:00
daniel 0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +02:00
Calvo e2297171cb Process inventory modules with correct xml and empty data 2023-03-10 15:14:43 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Pablo Aragon 64fabf28c5 9987 New inventory view - Pending Meta design 2023-01-26 10:06:27 +01:00
Pablo Aragon a50f50d99e 9987 Commit provisional 2023-01-24 09:33:47 +01:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00